Date: Sat, 29 Sep 2012 16:19:28 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r1045 - in trunk/www: firefox-esr/files firefox-nightly/files firefox/files libxul/files seamonkey/files Message-ID: <201209291619.q8TGJS3W091391@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Sep 29 16:19:28 2012 New Revision: 1045 Log: actually install gio extension Added: trunk/www/firefox-nightly/files/patch-bug713802 Modified: trunk/www/firefox-esr/files/patch-bug713802 trunk/www/firefox/files/patch-bug713802 trunk/www/libxul/files/patch-bug713802 trunk/www/seamonkey/files/patch-bug713802 Modified: trunk/www/firefox-esr/files/patch-bug713802 ============================================================================== --- trunk/www/firefox-esr/files/patch-bug713802 Sat Sep 29 16:19:18 2012 (r1044) +++ trunk/www/firefox-esr/files/patch-bug713802 Sat Sep 29 16:19:28 2012 (r1045) @@ -25,6 +25,19 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. +--- browser/installer/package-manifest.in~ ++++ browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif diff --git configure.in configure.in index 87a9391..2118651 100644 --- configure.in Added: trunk/www/firefox-nightly/files/patch-bug713802 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/www/firefox-nightly/files/patch-bug713802 Sat Sep 29 16:19:28 2012 (r1045) @@ -0,0 +1,13 @@ +--- browser/installer/package-manifest.in~ ++++ browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif Modified: trunk/www/firefox/files/patch-bug713802 ============================================================================== --- trunk/www/firefox/files/patch-bug713802 Sat Sep 29 16:19:18 2012 (r1044) +++ trunk/www/firefox/files/patch-bug713802 Sat Sep 29 16:19:28 2012 (r1045) @@ -25,6 +25,19 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. +--- browser/installer/package-manifest.in~ ++++ browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif diff --git configure.in configure.in index 87a9391..2118651 100644 --- configure.in Modified: trunk/www/libxul/files/patch-bug713802 ============================================================================== --- trunk/www/libxul/files/patch-bug713802 Sat Sep 29 16:19:18 2012 (r1044) +++ trunk/www/libxul/files/patch-bug713802 Sat Sep 29 16:19:28 2012 (r1045) @@ -25,6 +25,19 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. +--- browser/installer/package-manifest.in~ ++++ browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif diff --git configure.in configure.in index 87a9391..2118651 100644 --- configure.in Modified: trunk/www/seamonkey/files/patch-bug713802 ============================================================================== --- trunk/www/seamonkey/files/patch-bug713802 Sat Sep 29 16:19:18 2012 (r1044) +++ trunk/www/seamonkey/files/patch-bug713802 Sat Sep 29 16:19:28 2012 (r1045) @@ -25,6 +25,19 @@ # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh # Changing MOZ_*BRANDING_DIRECTORY requires a clobber to ensure correct results, # because branding dependencies are broken. +--- mozilla/browser/installer/package-manifest.in~ ++++ mozilla/browser/installer/package-manifest.in +@@ -679,6 +679,10 @@ bin/libfreebl_32int64_3.so + + ; [Extensions] + ; ++#ifdef MOZ_ENABLE_GIO ++bin/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif ++ + #ifdef MOZ_ENABLE_GNOMEVFS + bin/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif diff --git mozilla/configure.in mozilla/configure.in index 87a9391..2118651 100644 --- mozilla/configure.in @@ -96,6 +109,18 @@ MOZ_UPDATER=1 # This should usually be the same as the value MAR_CHANNEL_ID. # If more than one ID is needed, then you should use a comma separated list +--- suite/installer/package-manifest.in~ ++++ suite/installer/package-manifest.in +@@ -265,6 +265,9 @@ + @BINPATH@/components/necko_wifi.xpt + #endif + @BINPATH@/components/necko_wyciwyg.xpt ++#ifdef MOZ_ENABLE_GIO ++@BINPATH@/components/@DLL_PREFIX@nkgio@DLL_SUFFIX@ ++#endif + #ifdef MOZ_ENABLE_GNOMEVFS + @BINPATH@/components/@DLL_PREFIX@nkgnomevfs@DLL_SUFFIX@ + #endif commit d884d75 Author: Karl Tomlinson <karlt+@karlt.net>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201209291619.q8TGJS3W091391>