From c3f41f14797cb2f0340a60237f5daeb3a1fcdc05 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Jan 2013 17:00:09 -0500 Subject: libre/icecat: tidy up, rename files PKGBUILD-only: * do the build in "mozilla-release", to match firefox PKGBUILD and file changes: * mv {,bug-}xulrunner-copy-stub.patch * rm cairo.patch # was unapplied * mv {icecat,firefox}-install-dir.patch * mv {icecat,firefox}.install * rm gcc47.patch # was unapplied * rm icecat-safe.desktop # no longer offered for firefox * add shared-libs.patch from firefox, this was done by a sed script * --- libre/icecat/firefox-install-dir.patch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 libre/icecat/firefox-install-dir.patch (limited to 'libre/icecat/firefox-install-dir.patch') diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch new file mode 100644 index 000000000..7a72b9c9d --- /dev/null +++ b/libre/icecat/firefox-install-dir.patch @@ -0,0 +1,30 @@ +diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk +--- a/config/baseconfig.mk ++++ b/config/baseconfig.mk +@@ -1,9 +1,9 @@ + INCLUDED_AUTOCONF_MK = 1 + +-includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++includedir := $(includedir)/$(MOZ_APP_NAME) ++idldir = $(datadir)/idl/$(MOZ_APP_NAME) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + DIST = $(DEPTH)/dist + + # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't +diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk +--- a/js/src/config/baseconfig.mk ++++ b/js/src/config/baseconfig.mk +@@ -1,7 +1,7 @@ + INCLUDED_AUTOCONF_MK = 1 + +-installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) +-sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) ++installdir = $(libdir)/$(MOZ_APP_NAME) ++sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel + + ifneq (,$(filter /%,$(TOP_DIST))) + DIST = $(TOP_DIST) -- cgit v1.2.3 From 7ffb3a2380d08711d92b9d1735117a07839b4844 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 12 Jan 2013 17:04:47 -0500 Subject: libre/icecat: sync files with versions from firefox and upstream * firefox-install-dir.patch: use version from firefox package * icecat.desktop: merge with version from firefox package * mozconfig: merge with versions from icecat upstream and firefox package --- libre/icecat/PKGBUILD | 6 ++-- libre/icecat/firefox-install-dir.patch | 12 +++---- libre/icecat/icecat.desktop | 58 ++++++++++++++++++++++++++++------ libre/icecat/mozconfig | 21 ++++-------- 4 files changed, 64 insertions(+), 33 deletions(-) (limited to 'libre/icecat/firefox-install-dir.patch') diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD index e82263c30..eccf8b89b 100644 --- a/libre/icecat/PKGBUILD +++ b/libre/icecat/PKGBUILD @@ -92,9 +92,9 @@ md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e' '3009b176cc5f9b1e416b1bf7c45b064b' 'f4cffe48e84283026da634424f4bbee6' 'e4cd438a0b2a42dfb14bc7716e901e5f' - 'd35394f58d9893609a352cd4c82731dc' - 'e81ad01dbc16ba28bf92ba4b7c309ca7' - '64826fcf48816b13090042eefddbaa58' + 'd71509923cfede3e634756fee899e492' + 'daa249d183fcf09942ff30db1b279f1e' + '150ac0fb3ac7b2114c8e8851a9e0516c' '0d053487907de4376d67d8f499c5502b' '52e52f840a49eb1d14be1c0065b03a93') diff --git a/libre/icecat/firefox-install-dir.patch b/libre/icecat/firefox-install-dir.patch index 7a72b9c9d..9c115f0eb 100644 --- a/libre/icecat/firefox-install-dir.patch +++ b/libre/icecat/firefox-install-dir.patch @@ -1,6 +1,6 @@ -diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk ---- a/config/baseconfig.mk -+++ b/config/baseconfig.mk +diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk +--- mozilla-release.orig/config/baseconfig.mk 2012-10-09 07:34:41.762092280 +0000 ++++ mozilla-release/config/baseconfig.mk 2012-10-09 07:40:53.052771576 +0000 @@ -1,9 +1,9 @@ INCLUDED_AUTOCONF_MK = 1 @@ -15,9 +15,9 @@ diff -Nur a/config/baseconfig.mk b/config/baseconfig.mk DIST = $(DEPTH)/dist # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't -diff -Nur a/js/src/config/baseconfig.mk b/js/src/config/baseconfig.mk ---- a/js/src/config/baseconfig.mk -+++ b/js/src/config/baseconfig.mk +diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk +--- mozilla-release.orig/js/src/config/baseconfig.mk 2012-10-09 07:34:58.411973276 +0000 ++++ mozilla-release/js/src/config/baseconfig.mk 2012-10-09 07:39:55.143186168 +0000 @@ -1,7 +1,7 @@ INCLUDED_AUTOCONF_MK = 1 diff --git a/libre/icecat/icecat.desktop b/libre/icecat/icecat.desktop index 8a7cad93d..668d5104f 100644 --- a/libre/icecat/icecat.desktop +++ b/libre/icecat/icecat.desktop @@ -1,11 +1,5 @@ [Desktop Entry] -Encoding=UTF-8 -Exec=/usr/bin/icecat %u -Icon=icecat -Type=Application -Terminal=false -MultipleArgs=false -Name=GNU IceCat +Name=IceCat GenericName=Web Browser GenericName[af]=Web Blaaier GenericName[ar]=متصفح ويب @@ -73,6 +67,50 @@ GenericName[xh]=Umkhangeli zincwadi we Web GenericName[zh_CN]=网页浏览器 GenericName[zh_TW]=網頁瀏覽器 GenericName[zu]=Umcingi we-Web -MimeType=text/html -StartupNotify=false -Categories=Application;Network; +Comment=Browse the World Wide Web +Comment[ar]=تصفح الشبكة العنكبوتية العالمية +Comment[ast]=Restola pela Rede +Comment[bn]=ইন্টারনেট ব্রাউজ করুন +Comment[ca]=Navegueu per la web +Comment[cs]=Prohlížení stránek World Wide Webu +Comment[da]=Surf på internettet +Comment[de]=Im Internet surfen +Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web) +Comment[es]=Navegue por la web +Comment[et]=Lehitse veebi +Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید +Comment[fi]=Selaa Internetin WWW-sivuja +Comment[fr]=Naviguer sur le Web +Comment[gl]=Navegar pola rede +Comment[he]=גלישה ברחבי האינטרנט +Comment[hr]=Pretražite web +Comment[hu]=A világháló böngészése +Comment[it]=Esplora il web +Comment[ja]=ウェブを閲覧します +Comment[ko]=웹을 돌아 다닙니다 +Comment[ku]=Li torê bigere +Comment[lt]=Naršykite internete +Comment[nb]=Surf på nettet +Comment[nl]=Verken het internet +Comment[nn]=Surf på nettet +Comment[no]=Surf på nettet +Comment[pl]=Przeglądanie stron WWW +Comment[pt]=Navegue na Internet +Comment[pt_BR]=Navegue na Internet +Comment[ro]=Navigați pe Internet +Comment[ru]=Доступ в Интернет +Comment[sk]=Prehliadanie internetu +Comment[sl]=Brskajte po spletu +Comment[sv]=Surfa på webben +Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ +Comment[uk]=Перегляд сторінок Інтернету +Comment[vi]=Để duyệt các trang web +Comment[zh_CN]=浏览互联网 +Comment[zh_TW]=瀏覽網際網路 +Exec=/usr/lib/icecat/icecat %u +Icon=icecat +Terminal=false +Type=Application +MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; +StartupNotify=true +Categories=Network;WebBrowser; diff --git a/libre/icecat/mozconfig b/libre/icecat/mozconfig index 934ea9f0d..c5cea7185 100644 --- a/libre/icecat/mozconfig +++ b/libre/icecat/mozconfig @@ -20,35 +20,28 @@ ac_add_options --with-system-zlib ac_add_options --disable-crashreporter ac_add_options --disable-gnomevfs ac_add_options --disable-installer -ac_add_options --disable-mochitest ac_add_options --disable-safe-browsing ac_add_options --disable-tests ac_add_options --disable-updater ac_add_options --enable-gio +#ac_add_options --enable-gstreamer ac_add_options --enable-startup-notification # Vendor settings -# Optimization -ac_add_options --enable-optimize +ac_add_options --enable-optimize="-pipe -O3" ac_add_options --libdir=/usr/lib ac_add_options --prefix=/usr -export BUILD_OFFICIAL=1 +# Needed to enable breakpad in application.ini export MOZILLA_OFFICIAL=1 -mk_add_options BUILD_OFFICIAL=1 -mk_add_options MOZILLA_OFFICIAL=1 - -# Platform settings -#ac_add_options --build=i586-pc-linux-gnu -#ac_add_options --host=i586-pc-linux-gnu -#export USE_SHORT_LIBNAME=1 -#mk_add_options USE_SHORT_LIBNAME=1 # Application settings ac_add_options --disable-official-branding +# since with-user-appdir with .gnuzilla doesn't do the trick, +# use app-basename instead +ac_add_options --with-app-basename=icecat ac_add_options --with-branding=browser/branding/unofficial ac_add_options --with-distribution-id=org.gnu.gnuzilla -ac_add_options --with-user-appdir=.gnuzilla -# Icecat +ac_add_options --with-user-appdir=.mozilla export MOZ_PHOENIX=1 mk_add_options MOZ_PHOENIX=1 -- cgit v1.2.3