[packages/epiphany] Remove outdated patches
megabajt
megabajt at pld-linux.org
Wed Oct 10 14:42:30 CEST 2012
commit b0fe95493df0d4a71b924a9b21eb234dd92594b9
Author: Marcin Banasiak <marcin.banasiak at gmail.com>
Date: Wed Oct 10 14:41:51 2012 +0200
Remove outdated patches
epiphany-agent.patch | 16 -----------
epiphany-build_date.patch | 27 ------------------
epiphany-configure.patch | 17 ------------
epiphany-libxul.patch | 53 ------------------------------------
epiphany-lt.patch | 12 --------
epiphany-ti-agent.patch | 15 ----------
epiphany-xulrunner-plugins-dir.patch | 11 --------
7 files changed, 151 deletions(-)
---
diff --git a/epiphany-agent.patch b/epiphany-agent.patch
deleted file mode 100644
index e765b9f..0000000
--- a/epiphany-agent.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur epiphany-2.18.2.orig/embed/mozilla/mozilla-embed-single.cpp epiphany-2.18.2/embed/mozilla/mozilla-embed-single.cpp
---- epiphany-2.18.2.orig/embed/mozilla/mozilla-embed-single.cpp 2007-03-29 00:32:56.000000000 +0200
-+++ epiphany-2.18.2/embed/mozilla/mozilla-embed-single.cpp 2007-06-12 09:15:23.000000000 +0200
-@@ -272,9 +272,9 @@
-
- pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" UA_VERSION);
-
-- /* Unset old prefs, otherwise they end up in the user agent string too */
-- pref->ClearUserPref ("general.useragent.vendor");
-- pref->ClearUserPref ("general.useragent.vendorSub");
-+ pref->SetCharPref ("general.useragent.vendor", "PLD");
-+ pref->SetCharPref ("general.useragent.vendorSub", "3.0");
-+ pref->SetCharPref ("general.useragent.vendorComment", "Th");
-
- /* Don't open ftp uris with an external handler if one is setup */
- pref->SetBoolPref ("network.protocol-handler.external.ftp", PR_FALSE);
diff --git a/epiphany-build_date.patch b/epiphany-build_date.patch
deleted file mode 100644
index 3babf73..0000000
--- a/epiphany-build_date.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur epiphany-2.22.3.orig/configure.ac epiphany-2.22.3/configure.ac
---- epiphany-2.22.3.orig/configure.ac 2008-06-30 19:58:18.000000000 +0200
-+++ epiphany-2.22.3/configure.ac 2008-07-31 12:01:17.000000000 +0200
-@@ -20,7 +20,6 @@
- m4_define([epiphany_version_micro],[3])
- m4_define([epiphany_version_extra],[])
- m4_define([epiphany_version],[epiphany_version_major.epiphany_version_minor.epiphany_version_micro()epiphany_version_extra])
--m4_define([epiphany_build_id],[20080528]) # The date of the 2.22.2 release
-
- # This can be either "trunk" or "branches/gnome-x-y"
- m4_define([epiphany_branch],["branches/gnome-2-22"])
-@@ -34,6 +33,7 @@
- AC_DEFINE_UNQUOTED([EPHY_HOST_CPU],["$host_cpu"],[The host CPU type])
- AC_DEFINE_UNQUOTED([EPHY_HOST_VENDOR],["$host_vendor"],[The host vendor])
- AC_DEFINE_UNQUOTED([EPHY_HOST_OS],["$host_os"],[The host OS])
-+AC_DEFINE_UNQUOTED([EPHY_BUILD_ID],["$(TZ=UTC0 date +'%Y%m%d')"],[The build date])
-
- GNOME_COMMON_INIT
-
-@@ -55,7 +55,6 @@
- AC_SUBST([EPIPHANY_MINOR_VERSION], [epiphany_version_minor])
- AC_SUBST([EPIPHANY_MICRO_VERSION], [epiphany_version_micro])
-
--AC_DEFINE([EPHY_BUILD_ID],["epiphany_build_id"],[The build date])
-
- AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip tar-ustar])
-
diff --git a/epiphany-configure.patch b/epiphany-configure.patch
deleted file mode 100644
index 3bb243a..0000000
--- a/epiphany-configure.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -aurN epiphany-1.9.6.orig/configure.ac epiphany-1.9.6/configure.ac
---- epiphany-1.9.6.orig/configure.ac 2006-01-30 22:30:55.000000000 +0100
-+++ epiphany-1.9.6/configure.ac 2006-02-01 18:11:03.231476000 +0100
-@@ -450,11 +430,11 @@
- AC_MSG_RESULT([$PYGTK_DEFSDIR])
-
- AC_MSG_CHECKING([for pygtk codegen])
-- PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.py"
-+ PYGTK_CODEGEN="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/codegen.pyc"
- AC_MSG_RESULT([$PYGTK_CODEGEN])
-
- AC_MSG_CHECKING([for pygtk h2def])
-- PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.py"
-+ PYGTK_H2DEF="$PYTHON `$PKG_CONFIG --variable=codegendir pygtk-2.0`/h2def.pyc"
- AC_MSG_RESULT([$PYGTK_H2DEF])
-
- AC_SUBST([PYGTK_DEFSDIR])
diff --git a/epiphany-libxul.patch b/epiphany-libxul.patch
deleted file mode 100644
index 4b5dfb5..0000000
--- a/epiphany-libxul.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -urN epiphany-2.24.1/embed/mozilla/Makefile.am epiphany-2.24.1.new/embed/mozilla/Makefile.am
---- epiphany-2.24.1/embed/mozilla/Makefile.am 2008-06-30 20:01:36.000000000 +0200
-+++ epiphany-2.24.1.new/embed/mozilla/Makefile.am 2008-10-23 14:49:51.000000000 +0200
-@@ -120,6 +120,7 @@
- cookie \
- docshell \
- dom \
-+ downloads \
- exthandler \
- fastfind \
- helperAppDlg \
-@@ -127,9 +128,11 @@
- gfx \
- gtkembedmoz \
- history \
-+ intl \
- js \
- layout \
- locale \
-+ loginmgr \
- mimetype \
- necko \
- nkcache \
-@@ -141,6 +144,7 @@
- string \
- sidebar \
- spellchecker \
-+ toolkitcomps \
- uriloader \
- uconv \
- wallet \
-@@ -150,7 +154,8 @@
- windowwatcher \
- xmlextras \
- xpcom \
-- xpconnect
-+ xpconnect \
-+ xulapp
-
- libephymozillaembed_la_CPPFLAGS = \
- -I$(top_srcdir)/lib \
-diff -urN epiphany-2.24.1/m4/gecko.m4 epiphany-2.24.1.new/m4/gecko.m4
---- epiphany-2.24.1/m4/gecko.m4 2008-03-28 16:02:48.000000000 +0100
-+++ epiphany-2.24.1.new/m4/gecko.m4 2008-10-23 14:49:14.000000000 +0200
-@@ -116,7 +116,7 @@
- _GECKO_PREFIX="`$PKG_CONFIG --variable=prefix ${gecko_cv_gecko}-xpcom`"
- _GECKO_NSPR=no # XXX asac: this is currently a blind guess and should be a AC test
- else
-- _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`/unstable"
-+ _GECKO_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir ${gecko_cv_gecko}`"
- _GECKO_CFLAGS="`$PKG_CONFIG --cflags ${gecko_cv_gecko}` `$PKG_CONFIG --cflags ${gecko_cv_gecko}-unstable`"
- _GECKO_LIBDIR="`$PKG_CONFIG --variable=sdkdir ${gecko_cv_gecko}`/bin"
- _GECKO_HOME=$with_gecko_home
diff --git a/epiphany-lt.patch b/epiphany-lt.patch
deleted file mode 100644
index 633ba79..0000000
--- a/epiphany-lt.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN epiphany-2.22.2/configure.ac epiphany-2.22.2.new/configure.ac
---- epiphany-2.22.2/configure.ac 2008-06-01 16:45:18.000000000 +0200
-+++ epiphany-2.22.2.new/configure.ac 2008-06-01 16:48:10.000000000 +0200
-@@ -66,6 +66,8 @@
-
- AC_LIBTOOL_DLOPEN
- AC_PROG_LIBTOOL
-+dnl when using libtool 2.x create libtool early, because it's used in configure
-+m4_ifdef([LT_OUTPUT], [LT_OUTPUT])
-
- AC_ISC_POSIX
- AC_PROG_CC
diff --git a/epiphany-ti-agent.patch b/epiphany-ti-agent.patch
deleted file mode 100644
index a2d1dc2..0000000
--- a/epiphany-ti-agent.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur epiphany-2.18.2.orig/embed/mozilla/mozilla-embed-single.cpp epiphany-2.18.2/embed/mozilla/mozilla-embed-single.cpp
---- epiphany-2.18.2.orig/embed/mozilla/mozilla-embed-single.cpp 2007-03-29 00:32:56.000000000 +0200
-+++ epiphany-2.18.2/embed/mozilla/mozilla-embed-single.cpp 2007-06-12 09:15:23.000000000 +0200
-@@ -272,9 +272,8 @@
-
- pref->SetCharPref ("general.useragent.extra.epiphany", "Epiphany/" UA_VERSION);
-
-- /* Unset old prefs, otherwise they end up in the user agent string too */
-- pref->ClearUserPref ("general.useragent.vendor");
-- pref->ClearUserPref ("general.useragent.vendorSub");
-+ pref->SetCharPref ("general.useragent.vendor", "PLD");
-+ pref->SetCharPref ("general.useragent.vendorSub", "Titanium");
-
- /* Don't open ftp uris with an external handler if one is setup */
- pref->SetBoolPref ("network.protocol-handler.external.ftp", PR_FALSE);
diff --git a/epiphany-xulrunner-plugins-dir.patch b/epiphany-xulrunner-plugins-dir.patch
deleted file mode 100644
index 8a2df62..0000000
--- a/epiphany-xulrunner-plugins-dir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- epiphany-2.24.1/embed/mozilla/Makefile.am.orig 2008-11-22 16:30:51.000000000 +0000
-+++ epiphany-2.24.1/embed/mozilla/Makefile.am 2008-11-22 16:31:01.000000000 +0000
-@@ -166,7 +166,7 @@
- -DPLUGINDIR=\"$(libdir)/epiphany/$(EPIPHANY_MAJOR)/plugins\" \
- -DMOZILLA_HOME=\"$(GECKO_HOME)\" \
- -DMOZILLA_PREFIX=\"$(GECKO_PREFIX)\" \
-- -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/mozilla/plugins\" \
-+ -DMOZILLA_NATIVE_PLUGINSDIR=\"$(libdir)/xulrunner/plugins\" \
- -DUA_VERSION=\"$(EPIPHANY_UA_VERSION)\" \
- -DALLOW_PRIVATE_API \
- $(AM_CPPFLAGS)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/epiphany.git/commitdiff/b0fe95493df0d4a71b924a9b21eb234dd92594b9
More information about the pld-cvs-commit
mailing list