- started update to 2.20

- updated enigmail to 1.5.2
- removed dead gnome2 bcond

diff --git a/enigmail-moz.build.patch b/enigmail-moz.build.patch
new file mode 100644 (file)
index 0000000..60ab0c8
--- /dev/null
+++ b/enigmail-moz.build.patch
@@ -0,0 +1,73 @@
+diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/build.orig/Makefile.in iceape-2.20/comm-release/mailnews/extensions/enigmail/build/Makefile.in
+--- iceape-2.20/comm-release/mailnews/extensions/enigmail/build.orig/Makefile.in       2013-01-20 18:08:40.000000000 +0100
++++ iceape-2.20/comm-release/mailnews/extensions/enigmail/build/Makefile.in    2013-08-08 21:06:45.870424762 +0200
+@@ -35,8 +35,6 @@
+ 
+ # Makefile for build directory
+ 
+-DIRS =
+-
+ # Specify these as parameters to the make command
+ XPI_MODULE    = enigmime
+ XPI_MODULE_VERS = 1.5
+diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/Makefile.in iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/Makefile.in
+--- iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/Makefile.in 2013-01-20 18:08:40.000000000 +0100
++++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/Makefile.in      2013-08-08 21:08:25.191537344 +0200
+@@ -41,10 +41,4 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
+-DIRS            = modules
+-
+-ifneq ($(OS_ARCH),WINNT)
+-  DIRS += src
+-endif
+-
+ include $(topsrcdir)/config/rules.mk
+diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/moz.build iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/moz.build
+--- iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc.orig/moz.build   1970-01-01 01:00:00.000000000 +0100
++++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ipc/moz.build        2013-08-08 21:07:45.667761563 +0200
+@@ -0,0 +1,1 @@
++DIRS += ['modules', 'src']
+diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/Makefile.in.orig iceape-2.20/comm-release/mailnews/extensions/enigmail/Makefile.in
+--- iceape-2.20/comm-release/mailnews/extensions/enigmail/Makefile.in.orig     2013-01-20 18:08:40.000000000 +0100
++++ iceape-2.20/comm-release/mailnews/extensions/enigmail/Makefile.in  2013-08-08 21:11:17.083457182 +0200
+@@ -51,14 +51,8 @@
+ 
+ GECKO18 = $(shell test $(MOZILLA_MAJOR_VERSION) -lt 19 && echo 1)
+ 
+-DIRS = ipc public
+-
+-ifeq ($(GECKO18),1)
+-  DIRS += src build
+-endif
+-
+-DIRS += ui package lang
+-
++STANDALONE_MAKEFILE := 1
++
+ include $(topsrcdir)/config/config.mk
+ 
+ include $(topsrcdir)/config/rules.mk
+diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build.orig iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build
+--- iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build.orig       1970-01-01 01:00:00.000000000 +0100
++++ iceape-2.20/comm-release/mailnews/extensions/enigmail/moz.build    2013-08-08 21:11:28.480250891 +0200
+@@ -0,0 +1,1 @@
++DIRS += ['ipc', 'public', 'ui', 'package', 'lang']
+diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/Makefile.in iceape-2.20/comm-release/mailnews/extensions/enigmail/ui/Makefile.in
+--- iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/Makefile.in  2013-01-20 18:08:40.000000000 +0100
++++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ui/Makefile.in       2013-08-08 21:10:36.089666637 +0200
+@@ -41,8 +41,6 @@
+ VPATH      = @srcdir@
+ srcdir     = @srcdir@
+ 
+-DIRS = content
+-
+ MYJARFILE = enigmail.jar
+ 
+ include $(DEPTH)/config/autoconf.mk
+diff -urN iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/moz.build iceape-2.20/comm-release/mailnews/extensions/enigmail/ui/moz.build
+--- iceape-2.20/comm-release/mailnews/extensions/enigmail/ui.orig/moz.build    1970-01-01 01:00:00.000000000 +0100
++++ iceape-2.20/comm-release/mailnews/extensions/enigmail/ui/moz.build 2013-08-08 21:10:29.579593990 +0200
+@@ -0,0 +1 @@
++DIRS += ['content']

diff --git a/gyp-slashism.patch b/gyp-slashism.patch
index 4c2f0ff039fdaa190cb2d488d5586a7fe1c9a4ea..51000118b008bd8637d1851a1a1d075a064acad3 100644 (file)
--- a/gyp-slashism.patch
+++ b/gyp-slashism.patch
@@ -34,15 +34,6 @@
      if self.WriteTargetMakefile(output_file, rel_path, qualified_target, spec, build_file, subdepth):
          # If WriteTargetMakefile returns True, then this is a useful target
        dirs.append(rel_path)
-@@ -376,7 +382,7 @@
-     WriteMakefile(output_file, data, build_file, depth, top,
-                   # we set srcdir up one directory, since the subdir
-                   # doesn't actually exist in the source directory
--                  swapslashes(os.path.join(top, self.relative_srcdir, os.path.split(rel_path)[0])),
-+                  swapslashes(append_relative(append_relative(top, self.relative_srcdir), os.path.split(rel_path)[0])),
-                   self.relative_srcdir,
-                   self.common_mk_path)
-     return True
 @@ -399,7 +405,7 @@
    # The relative path from objdir to gyp_file_dir
    srcdir = gyp.common.RelativePath(gyp_file_dir, objdir)

diff --git a/iceape.spec b/iceape.spec
index e7d7b9ae03a124a8768a8a10d9766b9a12b0a7a6..fcbea391d46ba957c7f3447623ac12809b4b9fa2 100644 (file)
--- a/iceape.spec
+++ b/iceape.spec
@@ -1,22 +1,16 @@
 #
 # Conditional build:
 %bcond_without enigmail        # don't build enigmail - GPG/PGP support
-%bcond_without gnomeui         # disable gnomeui support
-%bcond_without gnome           # disable gnomeui (alias)
 %bcond_without ldap            # disable e-mail address lookups in LDAP directories
 %bcond_without lightning       # disable Sunbird/Lightning calendar
 %bcond_with    xulrunner       # build with system xulrunner
 %bcond_with    tests           # enable tests (whatever they check)
 %bcond_without kerberos        # disable krb5 support
 
-%if %{without gnome}
-%undefine      with_gnomeui
-%endif
-
 %define                enigmail_ver    1.5.1
 %define                nspr_ver        4.9.3
 %define                nss_ver         3.14.3
-%define                xulrunner_ver   18.0.2
+%define                xulrunner_ver   23.0
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -28,16 +22,16 @@ Summary(es.UTF-8):  Navegador de Internet Iceape
 Summary(pl.UTF-8):     Iceape - przeglądarka WWW
 Summary(pt_BR.UTF-8):  Navegador Iceape
 Name:          iceape
-Version:       2.17.1
-Release:       1
+Version:       2.20
+Release:       0.1
 License:       MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:         X11/Applications/Networking
 Source0:       http://ftp.mozilla.org/pub/mozilla.org/seamonkey/releases/%{version}/source/seamonkey-%{version}.source.tar.bz2
-# Source0-md5: a95013068da38fe3f8db30e0ebe6f2f5
+# Source0-md5: 04b961790658233b7dafb5222b251bf5
 Source1:       http://www.mozilla-enigmail.org/download/source/enigmail-%{enigmail_ver}.tar.gz
 # Source1-md5: 3e71f84ed2c11471282412ebe4f5eb2d
 Source2:       %{name}-branding.tar.bz2
-# Source2-md5: 0bc28b4382aa8a961f8f7b2ba66d8f89
+# Source2-md5: 3feee544ef515f1dbf19b14479916784
 Source3:       %{name}-rm_nonfree.sh
 Source4:       %{name}.desktop
 Source5:       %{name}-composer.desktop
@@ -56,6 +50,8 @@ Patch6:               system-cairo.patch
 Patch7:                system-virtualenv.patch
 Patch8:                gyp-slashism.patch
 Patch9:                %{name}-system-xulrunner.patch
+Patch10:       enigmail-moz.build.patch
+Patch11:       packaging.patch
 URL:           http://www.pld-linux.org/Packages/Iceape
 BuildRequires: GConf2-devel >= 1.2.1
 BuildRequires: OpenGL-devel
@@ -74,9 +70,6 @@ BuildRequires:        libdnet-devel
 BuildRequires: libevent-devel >= 1.4.7
 # standalone libffi 3.0.9 or gcc's from 4.5(?)+
 BuildRequires: libffi-devel >= 6:3.0.9
-%{?with_gnomeui:BuildRequires:  libgnome-devel >= 2.0}
-%{?with_gnomeui:BuildRequires:  libgnome-keyring-devel}
-%{?with_gnomeui:BuildRequires:  libgnomeui-devel >= 2.2.0}
 BuildRequires: libiw-devel
 # requires libjpeg-turbo implementing at least libjpeg 6b API
 BuildRequires: libjpeg-devel >= 6b
@@ -271,13 +264,15 @@ tar -jxf %{SOURCE2}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
+#patch3 -p1
+#patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p2
+%patch10 -p2
+%patch11 -p2
 
 %build
 cd comm-release
@@ -340,11 +335,7 @@ ac_add_options --enable-tests
 ac_add_options --disable-tests
 %endif
 ac_add_options --enable-gio
-%if %{with gnomeui}
-ac_add_options --enable-gnomeui
-%else
 ac_add_options --disable-gnomeui
-%endif
 ac_add_options --disable-gnomevfs
 %if %{with ldap}
 ac_add_options --enable-ldap
@@ -434,7 +425,9 @@ install -d \
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
 
 cd %{objdir}
+cwd=`pwd`
 %{__make} -C suite/installer stage-package \
+       LD_LIBRARY_PATH=$cwd/mozilla/dist/lib \
        DESTDIR=$RPM_BUILD_ROOT \
        installdir=%{_libdir}/%{name} \
        PKG_SKIP_STRIP=1
@@ -546,13 +539,13 @@ cp -p %{topdir}/comm-release/mailnews/extensions/enigmail/package/chrome.manifes
 
 # never package these. always remove
 # nss
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{freebl3,nss3,nssckbi,nssdbm3,nssutil3,smime3,softokn3,ssl3}.*
 # nspr
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{nspr4,plc4,plds4}.so
 # mozldap
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib{ldap,ldif,prldap,ssldap}60.so
 # testpilot quiz
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/distribution/extensions/tbtestpilot@labs.mozilla.com.xpi
 
 %clean
 rm -rf $RPM_BUILD_ROOT

diff --git a/packaging.patch b/packaging.patch
new file mode 100644 (file)
index 0000000..1bdd503
--- /dev/null
+++ b/packaging.patch
@@ -0,0 +1,117 @@
+--- iceape-2.20/comm-release/suite/installer/removed-files.in.orig     2013-08-15 17:04:13.800677008 +0200
++++ iceape-2.20/comm-release/suite/installer/removed-files.in  2013-08-15 17:08:14.499464514 +0200
+@@ -192,9 +192,6 @@
+ D3DCompiler_42.dll
+ d3dx9_42.dll
+ d3dx9_43.dll
+-#ifdef UNIX_BUT_NOT_MAC
+-components/nsFilePicker.js
+-#endif
+ #ifndef MOZ_CRASHREPORTER
+ #ifdef XP_MACOSX
+ crashreporter.app/
+@@ -617,34 +614,9 @@
+   chrome/gloda.jar
+   chrome/nonlocalized.manifest
+   chrome/localized.manifest
+-  components/addonManager.js
+   components/Aitc.js
+-  components/AlarmsManager.js
+-  components/amContentHandler.js
+-  components/amWebInstallListener.js
+-  components/BrowserElementParent.js
+-  components/ColorAnalyzer.js
+-  components/ConsoleAPI.js
+-  components/ContactManager.js
+-  components/contentAreaDropListener.js
+-  components/contentSecurityPolicy.js
+-  components/crypto-SDR.js
+-  components/FeedConverter.js
+-  components/FeedProcessor.js
+-  components/FeedWriter.js
+-  components/glautocomp.js
+   components/GPSDGeolocationProvider.js
+-  components/jsconsole-clhandler.js
+-  components/jsmimeemitter.js
+-  components/mdn-service.js
+-  components/msgAsyncPrompter.js
+-  components/NetworkGeolocationProvider.js
+   components/NotificationsComponents.manifest
+-  components/newsblog.js
+-  components/nsAbAutoCompleteMyDomain.js
+-  components/nsAbAutoCompleteSearch.js
+-  components/nsAbLDAPAttributeMap.js
+-  components/nsAbout.js
+   components/nsAboutCertError.js
+   components/nsAboutData.js
+   components/nsAboutFeeds.js
+@@ -653,69 +625,10 @@
+   components/nsAboutSessionRestore.js
+   components/nsAboutSyncTabs.js
+   components/nsBadCertHandler.js
+-  components/nsBlocklistService.js
+-  components/nsBrowserContentHandler.js
+-  components/nsComposerCmdLineHandler.js
+-  components/nsContentDispatchChooser.js
+-  components/nsContentPrefService.js
+-  components/nsDefaultCLH.js
+-  components/nsDOMIdentity.js
+-  #ifdef UNIX_BUT_NOT_MAC
+-    components/nsFilePicker.js
+-  #endif
+-  components/nsFormAutoComplete.js
+-  components/nsFormHistory.js
+-  components/nsHandlerService.js
+-  components/nsHelperAppDlg.js
+-  components/nsIDService.js
+-  components/nsINIProcessor.js
+-  components/nsInputListAutoComplete.js
+-  components/nsLDAPProtocolHandler.js
+-  components/nsLivemarkService.js
+-  components/nsLoginInfo.js
+-  components/nsLoginManager.js
+-  components/nsLoginManagerPrompter.js
+-  components/nsMailNewsCommandLineHandler.js
+-  components/nsMsgTraitService.js
+-  components/nsPlacesAutoComplete.js
+   components/nsPlacesDBFlush.js
+-  components/nsPlacesExpiration.js
+-  components/nsPrompter.js
+-  components/nsSearchService.js
+-  components/nsSearchSuggestions.js
+-  components/nsSessionStartup.js
+-  components/nsSessionStore.js
+-  components/nsSetDefault.js
+-  components/nsSidebar.js
+-  components/nsSMTPProtocolHandler.js
+-  components/nsSuiteDownloadManagerUI.js
+-  components/nsSuiteGlue.js
+-  components/nsTaggingService.js
+   components/nsTryToClose.js
+-  components/nsTypeAheadFind.js
+   components/nsUpdateService.js
+   components/nsUpdateServiceStub.js
+-  components/nsUpdateTimerManager.js
+-  #ifdef MOZ_URL_CLASSIFIER
+-    components/nsUrlClassifierHashCompleter.js
+-    components/nsUrlClassifierLib.js
+-    components/nsUrlClassifierListManager.js
+-  #endif
+-  components/nsURLFormatter.js
+-  components/nsWebHandlerApp.js
+-  components/offlineStartup.js
+-  components/PlacesCategoriesStarter.js
+-  components/SettingsManager.js
+-  components/SiteSpecificUserAgent.js
+-  components/smileApplication.js
+-  components/smime-service.js
+-  components/storage-Legacy.js
+-  components/storage-mozStorage.js
+-  components/TCPSocket.js
+-  components/txEXSLTRegExFunctions.js
+-  components/Weave.js
+-  components/Webapps.js
+-  components/WebContentConverter.js
+   components/browser.xpt
+   components/binary.manifest
+   components/interfaces.manifest

diff --git a/system-virtualenv.patch b/system-virtualenv.patch
index a9721093c05bb516db43ad5c31bf7aa287c0b5c7..a2d150ff8ac26a4d3defa301da506f462b755971 100644 (file)
--- a/system-virtualenv.patch
+++ b/system-virtualenv.patch
@@ -1,48 +1,12 @@
---- xulrunner-19.0/configure.in~       2013-02-20 12:29:36.493788864 +0100
-+++ xulrunner-19.0/configure.in        2013-02-20 12:46:55.030421705 +0100
-@@ -132,8 +132,7 @@
- dnl This verifies our Python version is sane and ensures the Python
- dnl virtualenv is present and up to date. It sanitizes the environment
- dnl for us, so we don't need to clean anything out.
--$PYTHON $_topsrcdir/mozilla/build/virtualenv/populate_virtualenv.py \
--    $_topsrcdir/mozilla $MOZ_BUILD_ROOT/_virtualenv || exit 1
-+PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
- 
- dnl Create a virtualenv where we can install local Python packages
- case "$host_os" in
---- xulrunner-19.0/configure~  2013-02-20 12:39:40.270435866 +0100
-+++ xulrunner-19.0/configure   2013-02-20 12:39:58.623768601 +0100
-@@ -1336,8 +1336,7 @@
- fi
- 
- echo "$ac_t""Creating Python environment" 1>&6
--$PYTHON $_topsrcdir/mozilla/build/virtualenv/populate_virtualenv.py \
--    $_topsrcdir/mozilla $MOZ_BUILD_ROOT/_virtualenv || exit 1
-+PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
- 
- case "$host_os" in
- mingw*)
---- xulrunner-19.0/mozilla/configure.in~       2013-02-20 12:29:36.493788864 +0100
-+++ xulrunner-19.0/mozilla/configure.in        2013-02-20 12:46:55.030421705 +0100
-@@ -132,8 +132,7 @@
- dnl This verifies our Python version is sane and ensures the Python
- dnl virtualenv is present and up to date. It sanitizes the environment
- dnl for us, so we don't need to clean anything out.
--$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
--    $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
-+PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
- 
- dnl Create a virtualenv where we can install local Python packages
- case "$host_os" in
---- xulrunner-19.0/mozilla/configure~  2013-02-20 12:39:40.270435866 +0100
-+++ xulrunner-19.0/mozilla/configure   2013-02-20 12:39:58.623768601 +0100
-@@ -1336,8 +1336,7 @@
- fi
- 
- echo "$ac_t""Creating Python environment" 1>&6
--$PYTHON $_topsrcdir/build/virtualenv/populate_virtualenv.py \
--    $_topsrcdir $MOZ_BUILD_ROOT/_virtualenv || exit 1
-+PYTHONDONTWRITEBYTECODE= /usr/bin/virtualenv $MOZ_BUILD_ROOT/_virtualenv || exit 1
- 
- case "$host_os" in
- mingw*)
+--- xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py~    2013-05-11 21:19:23.000000000 +0200
++++ xulrunner-21.0/mozilla/build/virtualenv/populate_virtualenv.py     2013-05-14 22:51:32.136719267 +0200
+@@ -37,8 +37,7 @@
+     @property
+     def virtualenv_script_path(self):
+         """Path to virtualenv's own populator script."""
+-        return os.path.join(self.topsrcdir, 'python', 'virtualenv',
+-            'virtualenv.py')
++        return '/usr/bin/virtualenv'
+ 
+     @property
+     def python_path(self):