diff options
-rw-r--r-- | extra/xulrunner/Pkgfile | 10 | ||||
-rw-r--r-- | extra/xulrunner/mozconfig | 35 | ||||
-rw-r--r-- | extra/xulrunner/mozilla-pkgconfig.patch | 70 | ||||
-rw-r--r-- | extra/xulrunner/mozilla-ps-pdf-simplify-operators.patch | 42 | ||||
-rw-r--r-- | extra/xulrunner/xulrunner-png14.patch | 11 | ||||
-rw-r--r-- | extra/xulrunner/xulrunner-version.patch | 13 | ||||
-rw-r--r-- | extra/xulrunner/xulrunner.diff | 101 | ||||
-rw-r--r-- | gnome/evolution-data-server/configure-01.patch | 38 | ||||
-rw-r--r-- | gnome/gir-repository/Pkgfile | 2 | ||||
-rw-r--r-- | gnome/gir-repository/gir-repository-0.6.5-dbus-glib-2.patch | 92 | ||||
-rwxr-xr-x | gnome/sound-juicer/Pkgfile | 2 | ||||
-rw-r--r-- | gnome/sound-juicer/sound-juicer-gcc-4.5-01.patch | 11 |
12 files changed, 7 insertions, 420 deletions
diff --git a/extra/xulrunner/Pkgfile b/extra/xulrunner/Pkgfile index d1d239623..0fe131f7a 100644 --- a/extra/xulrunner/Pkgfile +++ b/extra/xulrunner/Pkgfile @@ -8,11 +8,11 @@ name=xulrunner version=1.9.2.10 release=1 source=(http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.10/source/firefox-3.6.10.source.tar.bz2 \ - mozconfig - mozilla-pkgconfig.patch - mozilla-ps-pdf-simplify-operators.patch - xulrunner-version.patch - xulrunner-png14.patch) + http://nutyx.meticul.eu/files/patchs/$name/mozconfig \ + http://nutyx.meticul.eu/files/patchs/$name/mozilla-pkgconfig.patch \ + http://nutyx.meticul.eu/files/patchs/$name/mozilla-ps-pdf-simplify-operators.patch \ + http://nutyx.meticul.eu/files/patchs/$name/xulrunner-version.patch \ + http://nutyx.meticul.eu/files/patchs/$name/xulrunner-png14.patch ) build() { unset MAKEFLAGS diff --git a/extra/xulrunner/mozconfig b/extra/xulrunner/mozconfig deleted file mode 100644 index e52659ee0..000000000 --- a/extra/xulrunner/mozconfig +++ /dev/null @@ -1,35 +0,0 @@ -. $topsrcdir/xulrunner/config/mozconfig -ac_add_options --prefix=/usr -ac_add_options --libdir=/usr/lib -ac_add_options --with-system-nspr -ac_add_options --with-system-nss -ac_add_options --with-system-jpeg -ac_add_options --with-system-zlib -ac_add_options --with-system-bz2 -ac_add_options --with-system-png -ac_add_options --with-system-libevent -ac_add_options --enable-system-hunspell -#disabled: mozilla is broken with recent versions of sqlite -#ac_add_options --enable-system-sqlite -ac_add_options --enable-system-cairo -ac_add_options --with-pthreads -ac_add_options --enable-strip -ac_add_options --disable-tests -ac_add_options --disable-mochitest -ac_add_options --disable-installer -ac_add_options --disable-debug -ac_add_options --enable-optimize -ac_add_options --enable-default-toolkit=cairo-gtk2 -ac_add_options --enable-pango -ac_add_options --enable-svg -ac_add_options --enable-canvas -ac_add_options --disable-javaxpcom -ac_add_options --disable-crashreporter -ac_add_options --enable-safe-browsing -ac_add_options --enable-startup-notification -ac_add_options --enable-extensions=default - -export BUILD_OFFICIAL=1 -export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 diff --git a/extra/xulrunner/mozilla-pkgconfig.patch b/extra/xulrunner/mozilla-pkgconfig.patch deleted file mode 100644 index a42d2a3e6..000000000 --- a/extra/xulrunner/mozilla-pkgconfig.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/libxul-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/libxul-embedding.pc.in 2010-01-21 22:27:17.000000000 +0200 -@@ -6,5 +6,6 @@ - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% -+Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue - Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS% -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in mozilla-1.9.2/xulrunner/installer/libxul.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/libxul.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/libxul.pc.in 2010-01-21 22:27:56.000000000 +0200 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - idldir=%idldir% - -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/Makefile.in mozilla-1.9.2/xulrunner/installer/Makefile.in ---- mozilla-1.9.2.orig/xulrunner/installer/Makefile.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/Makefile.in 2010-01-21 22:25:04.000000000 +0200 -@@ -121,6 +121,7 @@ - -e "s|%includedir%|$(includedir)|" \ - -e "s|%idldir%|$(idldir)|" \ - -e "s|%sdkdir%|$(sdkdir)|" \ -+ -e "s|%libdir%|$(installdir)|" \ - -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \ - -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \ - -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \ -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 2010-01-21 22:28:15.000000000 +0200 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-gtkmozembed.pc.in 2010-01-21 22:28:27.000000000 +0200 -@@ -1,5 +1,6 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-js.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-js.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-js.pc.in 2010-01-21 22:29:30.000000000 +0200 -@@ -7,4 +7,4 @@ - Version: %MOZILLA_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% - Libs: -L${sdkdir}/lib -lmozjs --Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE -+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE -diff -Nur mozilla-1.9.2.orig/xulrunner/installer/mozilla-plugin.pc.in mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in ---- mozilla-1.9.2.orig/xulrunner/installer/mozilla-plugin.pc.in 2010-01-21 05:31:27.000000000 +0200 -+++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in 2010-01-21 22:29:58.000000000 +0200 -@@ -5,5 +5,5 @@ - Name: Mozilla Plug-In API - Description: Mozilla Plug-In API - Version: %MOZILLA_VERSION% --Cflags: -I${includedir}/stable -DXP_UNIX %ojidef% -+Cflags: -I${includedir} -DXP_UNIX %ojidef% - diff --git a/extra/xulrunner/mozilla-ps-pdf-simplify-operators.patch b/extra/xulrunner/mozilla-ps-pdf-simplify-operators.patch deleted file mode 100644 index cab134158..000000000 --- a/extra/xulrunner/mozilla-ps-pdf-simplify-operators.patch +++ /dev/null @@ -1,42 +0,0 @@ -https://bugzilla.mozilla.org/show_bug.cgi?id=435313 - -Index: mozilla/gfx/thebes/public/gfxPDFSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPDFSurface.h ---- mozilla/gfx/thebes/public/gfxPDFSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPDFSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr<nsIOutputStream> mStream; -Index: mozilla/gfx/thebes/public/gfxPSSurface.h -=================================================================== -RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v -retrieving revision 1.13 -diff -d -u -p -r1.13 gfxPSSurface.h ---- mozilla/gfx/thebes/public/gfxPSSurface.h 19 Mar 2008 20:51:42 -0000 1.13 -+++ mozilla/gfx/thebes/public/gfxPSSurface.h 23 May 2008 00:50:31 -0000 -@@ -63,7 +63,11 @@ public: - // this is in points! - const gfxSize& GetSize() const { return mSize; } - -- virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; } -+ virtual PRInt32 GetDefaultContextFlags() const -+ { -+ return gfxContext::FLAG_SIMPLIFY_OPERATORS | -+ gfxContext::FLAG_DISABLE_SNAPPING; -+ } - - private: - nsCOMPtr<nsIOutputStream> mStream; diff --git a/extra/xulrunner/xulrunner-png14.patch b/extra/xulrunner/xulrunner-png14.patch deleted file mode 100644 index f512416ad..000000000 --- a/extra/xulrunner/xulrunner-png14.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig 2010-01-17 00:15:53.979744638 +0100 -+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp 2010-01-17 00:16:07.855993411 +0100 -@@ -135,7 +135,7 @@ - - // initialize - mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -+ NULL, - ErrorCallback, - ErrorCallback); - if (! mPNG) diff --git a/extra/xulrunner/xulrunner-version.patch b/extra/xulrunner/xulrunner-version.patch deleted file mode 100644 index 418b7c758..000000000 --- a/extra/xulrunner/xulrunner-version.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up mozilla/toolkit/mozapps/update/src/updater/module.ver mozilla/toolkit/mozapps/update/src/updater/module -diff -up mozilla/xulrunner/installer/Makefile.in.ver mozilla/xulrunner/installer/Makefile.in ---- mozilla/xulrunner/installer/Makefile.in.ver 2007-12-14 09:51:34.000000000 +0100 -+++ mozilla/xulrunner/installer/Makefile.in 2007-12-14 09:52:03.000000000 +0100 -@@ -44,6 +44,8 @@ VPATH = @srcdir@ - - include $(DEPTH)/config/autoconf.mk - -+MOZ_APP_VERSION="1.9.2" -+ - NO_PKG_FILES = \ - xulrunner-config \ - regchrome* \ diff --git a/extra/xulrunner/xulrunner.diff b/extra/xulrunner/xulrunner.diff deleted file mode 100644 index f961dd7c5..000000000 --- a/extra/xulrunner/xulrunner.diff +++ /dev/null @@ -1,101 +0,0 @@ ---- - xulrunner/installer/Makefile.in | 15 ++++++++++++--- - xulrunner/installer/libxul-embedding-unstable.pc.in | 2 +- - xulrunner/installer/libxul-embedding.pc.in | 2 +- - xulrunner/installer/mozilla-nss.pc.in | 6 +++--- - 4 files changed, 17 insertions(+), 8 deletions(-) - -Index: mozilla/xulrunner/installer/Makefile.in -=================================================================== ---- mozilla.orig/xulrunner/installer/Makefile.in -+++ mozilla/xulrunner/installer/Makefile.in -@@ -91,29 +91,38 @@ - mozilla-plugin.pc \ - mozilla-gtkmozembed.pc \ - mozilla-gtkmozembed-embedding.pc \ - $(NULL) - - ifdef MOZ_NATIVE_NSPR - NSPR_NAME=nspr - NSPR_VERSION=$(shell $(NSPR_CONFIG) --version) -+FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags) -+FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs) - else --pkg_config_files += mozilla-nspr.pc - NSPR_NAME=mozilla-nspr - FULL_NSPR_CFLAGS=-I\$${includedir}/stable - FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nspr-config --libs)) - NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version) - endif -+pkg_config_files += mozilla-nspr.pc - - $(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS)) - --ifndef MOZ_NATIVE_NSS --pkg_config_files += mozilla-nss.pc -+ifdef MOZ_NATIVE_NSS -+NSPR_VERSION=$(shell $(NSS_CONFIG) --version) -+FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags) -+FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs) -+else -+NSS_VERSION=$(shell $(DEPTH)/nsprpub/config/nss-config --version) -+FULL_NSS_CFLAGS=-I\$${includedir}/stable -+FULL_NSS_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nss-config --libs)) - endif -+pkg_config_files += mozilla-nss.pc - - ifdef MOZ_OJI - OJIDEF=-DOJI - else - OJIDEF= - endif - - %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) -Index: mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in -=================================================================== ---- mozilla.orig/xulrunner/installer/libxul-embedding-unstable.pc.in -+++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in -@@ -3,9 +3,9 @@ - includedir=%includedir% - idldir=%idldir% - includetype=unstable - - Name: libxul-embedding-unstable - Description: Static library for version-independent embedding of the Mozilla runtime (unstable API) - Version: %MOZILLA_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue --Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% -+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% %FULL_NSPR_CFLAGS% -Index: mozilla/xulrunner/installer/libxul-embedding.pc.in -=================================================================== ---- mozilla.orig/xulrunner/installer/libxul-embedding.pc.in -+++ mozilla/xulrunner/installer/libxul-embedding.pc.in -@@ -7,9 +7,9 @@ - # Note: the default pkg-config cflags will only list include directories - # that contain stable (frozen or safe for linking) header files. To include - # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable - - Name: libxul-embedding - Description: Static library for version-independent embedding of the Mozilla runtime - Version: %MOZILLA_VERSION% - Libs: -L${sdkdir}/lib -lxpcomglue --Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% -+Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS% %FULL_NSPR_CFLAGS% -Index: mozilla/xulrunner/installer/mozilla-nss.pc.in -=================================================================== ---- mozilla.orig/xulrunner/installer/mozilla-nss.pc.in -+++ mozilla/xulrunner/installer/mozilla-nss.pc.in -@@ -1,10 +1,10 @@ - prefix=%prefix% - sdkdir=%sdkdir% - includedir=%includedir% - - Name: NSS - Description: Mozilla Network Security Services --Version: %MOZILLA_VERSION% -+Version: %NSS_VERSION% - Requires: %NSPR_NAME% >= %NSPR_VERSION% --Libs: -L${sdkdir}/lib -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3 --Cflags: -I${includedir}/stable -+Libs: %FULL_NSS_LIBS% -+Cflags: %FULL_NSS_CFLAGS% diff --git a/gnome/evolution-data-server/configure-01.patch b/gnome/evolution-data-server/configure-01.patch deleted file mode 100644 index 5c2d773bf..000000000 --- a/gnome/evolution-data-server/configure-01.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- configure.ori 2009-10-13 22:08:15.000000000 +0200 -+++ configure 2009-10-13 22:06:33.000000000 +0200 -@@ -17801,7 +17801,7 @@ - - if test "x${with_nspr_libs}" != "x"; then - LIBS="$nsprlibs" -- LDFLAGS="$LDFLAGS -L$with_nspr_libs" -+ LDFLAGS="$LDFLAGS $with_nspr_libs" - else - LIBS="$nsprlibs" - LDFLAGS="$LDFLAGS" -@@ -17870,7 +17870,7 @@ - $as_echo "$moz_nspr_libs" >&6; } - if test "x$moz_nspr_libs" != "xno"; then - have_nspr_libs="yes" -- MANUAL_NSPR_LIBS="-L$with_nspr_libs $nsprlibs" -+ MANUAL_NSPR_LIBS="$with_nspr_libs $nsprlibs" - else - MANUAL_NSPR_CLFAGS="" - fi -@@ -18093,7 +18093,7 @@ - else - - LIBS_save="$LIBS" -- LDFLAGS="$LDFLAGS -L$with_nspr_libs $nsprlibs -L$with_nss_libs $nsslibs" -+ LDFLAGS="$LDFLAGS $with_nspr_libs $nsprlibs $with_nss_libs $nsslibs" - LIBS="$nsslibs $nsprlibs" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ -@@ -18235,7 +18235,7 @@ - - msg_smime="yes (Mozilla NSS)" - fi -- MANUAL_NSS_LIBS="-L$with_nss_libs $nsslibs" -+ MANUAL_NSS_LIBS="$with_nss_libs $nsslibs" - else - MANUAL_NSS_CFLAGS="" - MANUAL_NSPR_CFLAGS="" diff --git a/gnome/gir-repository/Pkgfile b/gnome/gir-repository/Pkgfile index 44ab2d175..67938a500 100644 --- a/gnome/gir-repository/Pkgfile +++ b/gnome/gir-repository/Pkgfile @@ -10,7 +10,7 @@ name=gir-repository version=0.6.5 release=3 source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2 \ - gir-repository-0.6.5-dbus-glib-2.patch) + http://nutyx.meticul.eu/files/patchs/gir-repository-0.6.5-dbus-glib-2.patch) build() { cd $name-$version diff --git a/gnome/gir-repository/gir-repository-0.6.5-dbus-glib-2.patch b/gnome/gir-repository/gir-repository-0.6.5-dbus-glib-2.patch deleted file mode 100644 index 941a1652a..000000000 --- a/gnome/gir-repository/gir-repository-0.6.5-dbus-glib-2.patch +++ /dev/null @@ -1,92 +0,0 @@ -Submitted By: Wayne Blaszczyk -Date: 2010-06-07 -Initial Package Version: 0.6.5 -Origin: http://git.gnome.org/browse/gir-repository/log/ -Upstream Status: commited -Description: Fixed various DBusGLib-1.0.gir issues. - -diff -Naur gir-repository-0.6.5/gir/DBusGLib-1.0.gir gir-repository-0.6.5-patched/gir/DBusGLib-1.0.gir ---- gir-repository-0.6.5/gir/DBusGLib-1.0.gir 2009-07-10 03:31:54.000000000 +1000 -+++ gir-repository-0.6.5-patched/gir/DBusGLib-1.0.gir 2010-06-07 19:17:14.000000000 +1000 -@@ -2,8 +2,9 @@ - <repository version="1.0" - xmlns="http://www.gtk.org/introspection/core/1.0" - xmlns:c="http://www.gtk.org/introspection/c/1.0" -- xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> -- <include name="GObject"/> -+ xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> -+ <include name="GObject" version="2.0"/> -+ <package name="dbus-glib-1"/> - <namespace name="DBusGLib" version="1.0" shared-library="dbus-glib-1"> - <record name="Connection" c:type="DBusGConnection"/> - <record name="MethodInvocation" c:type="DBusGMethodInvocation"/> -@@ -11,16 +12,14 @@ - glib:type-name="DBusGProxy" glib:get-type="dbus_g_proxy_get_type"> - </class> - <record name="ProxyClass" c:type="DBusGProxyClass"/> -- -- <function name="connection_open" c:identifier="dbus_g_connection_open" -- throws="1"> -+ <function name="connection_open" c:identifier="dbus_g_connection_open" throws="1"> - <return-value transfer-ownership="full"> - <type name="Connection" c:type="DBusGConnection*"/> - </return-value> - <parameters> -- <parameter name="address"> -- <type name="utf8" c:type="char*"/> -- </parameter> -+ <parameter name="address" transfer-ownership="none"> -+ <type name="utf8" c:type="char*"/> -+ </parameter> - </parameters> - </function> - </namespace> -diff -Naur gir-repository-0.6.5/gir/Makefile.am gir-repository-0.6.5-patched/gir/Makefile.am ---- gir-repository-0.6.5/gir/Makefile.am 2009-08-29 11:42:39.000000000 +1000 -+++ gir-repository-0.6.5-patched/gir/Makefile.am 2010-06-07 19:17:14.000000000 +1000 -@@ -12,8 +12,7 @@ - endif - EXTRA_DIST += $(AVAHI_GIRSOURCES) - --MISSIONCONTROL_GIRSOURCES = DBusGLib-1.0.gir \ -- TelepathyGLib.gir \ -+MISSIONCONTROL_GIRSOURCES = TelepathyGLib.gir \ - LibTelepathy.gir - if BUILD_MISSIONCONTROL - CUSTOM_GIRSOURCES += $(MISSIONCONTROL_GIRSOURCES) -@@ -29,6 +28,8 @@ - EXTRA_DIST += $(srcdir)/dbus.c $(srcdir)/dbus.h - - if BUILD_DBUS -+CUSTOM_GIRSOURCES += DBusGLib-1.0.gir -+ - DBus-1.0.gir: libgirepo-DBus-custom.la - $(INTROSPECTION_SCANNER) -v --namespace DBus --nsversion=1.0 \ - --add-include-path=$(srcdir) --add-include-path=. \ -diff -Naur gir-repository-0.6.5/gir/Makefile.in gir-repository-0.6.5-patched/gir/Makefile.in ---- gir-repository-0.6.5/gir/Makefile.in 2009-09-10 05:31:46.000000000 +1000 -+++ gir-repository-0.6.5-patched/gir/Makefile.in 2010-06-07 20:02:51.000000000 +1000 -@@ -37,6 +37,7 @@ - host_triplet = @host@ - @BUILD_AVAHI_TRUE@am__append_1 = $(AVAHI_GIRSOURCES) - @BUILD_MISSIONCONTROL_TRUE@am__append_2 = $(MISSIONCONTROL_GIRSOURCES) -+@BUILD_DBUS_TRUE@am__append_41 = DBusGLib-1.0.gir - @BUILD_DBUS_TRUE@am__append_3 = DBus-1.0.gir - @BUILD_DBUS_TRUE@am__append_4 = libgirepo-DBus-custom.la - @BUILD_GCONF_TRUE@am__append_5 = GConf-2.0.gir -@@ -396,12 +397,12 @@ - $(am__append_33) $(am__append_34) $(am__append_35) \ - $(am__append_36) $(am__append_37) $(am__append_38) \ - $(am__append_39) $(am__append_40) --CUSTOM_GIRSOURCES = $(am__append_1) $(am__append_2) $(am__append_17) -+CUSTOM_GIRSOURCES = $(am__append_1) $(am__append_2) $(am__append_17) \ -+ $(am__append_41) - XPATH_TESTS = $(am__append_14) $(am__append_18) $(am__append_24) - COMMON_CUSTOM_LDFLAGS = -avoid-version -rdynamic - AVAHI_GIRSOURCES = AvahiCore-0.6.gir --MISSIONCONTROL_GIRSOURCES = DBusGLib-1.0.gir \ -- TelepathyGLib.gir \ -+MISSIONCONTROL_GIRSOURCES = TelepathyGLib.gir \ - LibTelepathy.gir - - libgirepo_DBus_custom_la_CPPFLAGS = $(DBUS_CFLAGS) diff --git a/gnome/sound-juicer/Pkgfile b/gnome/sound-juicer/Pkgfile index 259e40d4d..d9328f525 100755 --- a/gnome/sound-juicer/Pkgfile +++ b/gnome/sound-juicer/Pkgfile @@ -8,7 +8,7 @@ name=sound-juicer version=2.28.2 release=1 source=(http://ftp.gnome.org/pub/gnome/sources/$name/${version%.*}/$name-$version.tar.bz2\ - sound-juicer-gcc-4.5-01.patch) + http://nutyx.meticul.eu/files/patchs/$name/sound-juicer-gcc-4.5-01.patch) build() { cd $name-$version diff --git a/gnome/sound-juicer/sound-juicer-gcc-4.5-01.patch b/gnome/sound-juicer/sound-juicer-gcc-4.5-01.patch deleted file mode 100644 index 2fbe3e72e..000000000 --- a/gnome/sound-juicer/sound-juicer-gcc-4.5-01.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- sound-juicer-2.28.2/src/sj-play.c.original 2010-06-29 21:52:58.000000000 +0000 -+++ sound-juicer-2.28.2/src/sj-play.c 2010-06-29 21:49:09.000000000 +0000 -@@ -96,7 +96,7 @@ - * Pause - */ - static void --pause (void) -+sj_pause (void) - { - gst_element_set_state (pipeline, GST_STATE_PAUSED); - } |