[packages/chromium-browser/DEVEL] rename system-libs to system-nspr, as it's what it contains now

glen glen at pld-linux.org
Fri Jan 4 22:44:58 CET 2013


commit 70258ccd3c02fbf48296c8fbde9326cd1968785b
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri Jan 4 01:40:50 2013 +0200

    rename system-libs to system-nspr, as it's what it contains now
    
    seems the patch is no longer needed, as applying it breaks nacl build
    also updated the patch from fedora (spot repo)

 chromium-browser.spec |  4 ++--
 system-libs.patch     | 56 ---------------------------------------------------
 system-nspr.patch     | 33 ++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 58 deletions(-)
---
diff --git a/chromium-browser.spec b/chromium-browser.spec
index dec8864..f4b4bc5 100644
--- a/chromium-browser.spec
+++ b/chromium-browser.spec
@@ -81,8 +81,8 @@ Source6:	update-source.sh
 Source7:	clean-source.sh
 Source8:	get-source.sh
 Source9:	master_preferences.json
-#Patch10:		system-libs.patch
 Patch1:		plugin-searchdirs.patch
+#Patch2:		system-nspr.patch
 Patch3:		disable_dlog_and_dcheck_in_release_builds.patch
 Patch4:		path-libpdf.patch
 Patch5:		options-support.patch
@@ -243,7 +243,6 @@ sed -e 's/@BUILD_DIST@/PLD %{pld_version}/g' \
 %{__sed} -e 's, at localedir@,%{_libdir}/%{name},' %{SOURCE5} > find-lang.sh
 ln -s %{SOURCE7} src
 
-#%patch10 -p1
 %patch1 -p1
 %patch3 -p1
 %patch4 -p1
@@ -253,6 +252,7 @@ ln -s %{SOURCE7} src
 %patch15 -p1
 cd src
 %patch9 -p0
+#%patch2 -p1
 %{!?with_libjpegturbo:%patch11 -p0}
 %patch16 -p1
 %patch19 -p1
diff --git a/system-libs.patch b/system-libs.patch
deleted file mode 100644
index 0111b70..0000000
--- a/system-libs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- chromium-20090827svn24640/src/base/pr_time_unittest.cc.system-code	2009-08-27 15:21:27.000000000 -0400
-+++ chromium-20090827svn24640/src/base/pr_time_unittest.cc	2009-08-27 16:05:17.000000000 -0400
-@@ -5,7 +5,7 @@
- #include <time.h>
- 
- #include "base/compiler_specific.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <nspr/prtime.h>
- #include "base/time.h"
- #include "testing/gtest/include/gtest/gtest.h"
- 
---- chromium-20090827svn24640/src/base/time.cc.system-code	2009-08-27 15:21:28.000000000 -0400
-+++ chromium-20090827svn24640/src/base/time.cc	2009-08-27 16:05:17.000000000 -0400
-@@ -5,7 +5,7 @@
- #include "base/time.h"
- #include "base/string_util.h"
- #include "base/sys_string_conversions.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <nspr/prtime.h>
- 
- #include "base/logging.h"
- 
---- chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/plugins/npapi/plugin_lib_posix.cc~	2010-01-07 23:19:11.000000000 +0200
-+++ chromium-browser-5.0.312.0~svn20100201r37680/src/webkit/plugins/npapi/plugin_lib_posix.cc	2010-02-02 09:16:08.740140511 +0200
-@@ -13,7 +13,7 @@
- 
- // These headers must be included in this order to make the declaration gods
- // happy.
--#include "base/third_party/nspr/prcpucfg_linux.h"
-+#include <nspr/prcpucfg.h>
- 
- namespace webkit {
- 
---- chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc~	2010-07-21 05:01:25.000000000 +0300
-+++ chromium-browser-6.0.474.0~svn20100722r53294/src/chrome/browser/metrics/metrics_log.cc	2010-07-22 13:58:51.340525649 +0300
-@@ -16,7 +16,7 @@
- #include "base/scoped_ptr.h"
- #include "base/string_util.h"
- #include "base/sys_info.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <nspr/prtime.h>
- #include "base/time.h"
- #include "base/utf_string_conversions.h"
- #include "chrome/browser/autocomplete/autocomplete.h"
---- a/src/chrome/common/metrics/metrics_log_base.cc~	2012-02-09 03:36:29.000000000 +0100
-+++ b/src/chrome/common/metrics/metrics_log_base.cc	2012-02-12 16:17:46.992725484 +0100
-@@ -10,7 +10,7 @@
- #include "base/perftimer.h"
- #include "base/string_number_conversions.h"
- #include "base/sys_info.h"
--#include "base/third_party/nspr/prtime.h"
-+#include <nspr/prtime.h>
- #include "base/utf_string_conversions.h"
- #include "chrome/common/logging_chrome.h"
- #include "libxml/xmlwriter.h"
-
diff --git a/system-nspr.patch b/system-nspr.patch
new file mode 100644
index 0000000..d116ce2
--- /dev/null
+++ b/system-nspr.patch
@@ -0,0 +1,33 @@
+--- chromium-23.0.1271.95/base/pr_time_unittest.cc.system-code	2012-11-27 21:01:53.000000000 -0500
++++ chromium-23.0.1271.95/base/pr_time_unittest.cc	2012-12-12 15:22:19.695293771 -0500
+@@ -5,7 +5,7 @@
+ #include <time.h>
+ 
+ #include "base/compiler_specific.h"
+-#include "base/third_party/nspr/prtime.h"
++#include <prtime.h>
+ #include "base/time.h"
+ #include "testing/gtest/include/gtest/gtest.h"
+ 
+--- chromium-23.0.1271.95/chrome/browser/metrics/metrics_log.cc.system-code	2012-11-27 21:02:10.000000000 -0500
++++ chromium-23.0.1271.95/chrome/browser/metrics/metrics_log.cc	2012-12-12 15:22:19.699293773 -0500
+@@ -16,7 +16,7 @@
+ #include "base/string_number_conversions.h"
+ #include "base/string_util.h"
+ #include "base/sys_info.h"
+-#include "base/third_party/nspr/prtime.h"
++#include <prtime.h>
+ #include "base/time.h"
+ #include "base/tracked_objects.h"
+ #include "base/utf_string_conversions.h"
+--- chromium-23.0.1271.95/chrome/common/metrics/metrics_log_base.cc.system-code	2012-11-27 21:02:37.000000000 -0500
++++ chromium-23.0.1271.95/chrome/common/metrics/metrics_log_base.cc	2012-12-12 15:22:19.706293777 -0500
+@@ -11,7 +11,7 @@
+ #include "base/string_number_conversions.h"
+ #include "base/sys_byteorder.h"
+ #include "base/sys_info.h"
+-#include "base/third_party/nspr/prtime.h"
++#include <prtime.h>
+ #include "base/utf_string_conversions.h"
+ #include "chrome/common/chrome_version_info.h"
+ #include "chrome/common/logging_chrome.h"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/4884fc995902450f6cd5512b71e22d5566e4448d



More information about the pld-cvs-commit mailing list