[arch-commits] Commit in kompozer/repos/community-x86_64 (24 files)

Balló György bgyorgy at archlinux.org
Fri Mar 29 21:21:25 UTC 2019


    Date: Friday, March 29, 2019 @ 21:21:24
  Author: bgyorgy
Revision: 446100

archrelease: copy trunk to community-x86_64

Added:
  kompozer/repos/community-x86_64/NS_IMETHOD_i686.patch
    (from rev 446099, kompozer/trunk/NS_IMETHOD_i686.patch)
  kompozer/repos/community-x86_64/PKGBUILD
    (from rev 446099, kompozer/trunk/PKGBUILD)
  kompozer/repos/community-x86_64/any_kernel_26_plus.patch
    (from rev 446099, kompozer/trunk/any_kernel_26_plus.patch)
  kompozer/repos/community-x86_64/external-nss-for-shlibsign.patch
    (from rev 446099, kompozer/trunk/external-nss-for-shlibsign.patch)
  kompozer/repos/community-x86_64/freetype-pango.patch
    (from rev 446099, kompozer/trunk/freetype-pango.patch)
  kompozer/repos/community-x86_64/freetype-xft.patch
    (from rev 446099, kompozer/trunk/freetype-xft.patch)
  kompozer/repos/community-x86_64/gcc46_default_ctors.patch
    (from rev 446099, kompozer/trunk/gcc46_default_ctors.patch)
  kompozer/repos/community-x86_64/kompozer-libpng14.patch
    (from rev 446099, kompozer/trunk/kompozer-libpng14.patch)
  kompozer/repos/community-x86_64/kompozer-libpng15.patch
    (from rev 446099, kompozer/trunk/kompozer-libpng15.patch)
  kompozer/repos/community-x86_64/kompozer.desktop
    (from rev 446099, kompozer/trunk/kompozer.desktop)
  kompozer/repos/community-x86_64/kompozer_gcc_4.7.patch
    (from rev 446099, kompozer/trunk/kompozer_gcc_4.7.patch)
  kompozer/repos/community-x86_64/mozconfig.patch
    (from rev 446099, kompozer/trunk/mozconfig.patch)
Deleted:
  kompozer/repos/community-x86_64/NS_IMETHOD_i686.patch
  kompozer/repos/community-x86_64/PKGBUILD
  kompozer/repos/community-x86_64/any_kernel_26_plus.patch
  kompozer/repos/community-x86_64/external-nss-for-shlibsign.patch
  kompozer/repos/community-x86_64/freetype-pango.patch
  kompozer/repos/community-x86_64/freetype-xft.patch
  kompozer/repos/community-x86_64/gcc46_default_ctors.patch
  kompozer/repos/community-x86_64/kompozer-libpng14.patch
  kompozer/repos/community-x86_64/kompozer-libpng15.patch
  kompozer/repos/community-x86_64/kompozer.desktop
  kompozer/repos/community-x86_64/kompozer_gcc_4.7.patch
  kompozer/repos/community-x86_64/mozconfig.patch

----------------------------------+
 NS_IMETHOD_i686.patch            |   22 +-
 PKGBUILD                         |  182 +++++++++++------------
 any_kernel_26_plus.patch         |   62 ++++----
 external-nss-for-shlibsign.patch |   24 +--
 freetype-pango.patch             |   22 +-
 freetype-xft.patch               |   26 +--
 gcc46_default_ctors.patch        |   44 ++---
 kompozer-libpng14.patch          |   34 ++--
 kompozer-libpng15.patch          |  128 ++++++++--------
 kompozer.desktop                 |   22 +-
 kompozer_gcc_4.7.patch           |  214 +++++++++++++--------------
 mozconfig.patch                  |  284 ++++++++++++++++++-------------------
 12 files changed, 532 insertions(+), 532 deletions(-)

Deleted: NS_IMETHOD_i686.patch
===================================================================
--- NS_IMETHOD_i686.patch	2019-03-29 21:21:15 UTC (rev 446099)
+++ NS_IMETHOD_i686.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,11 +0,0 @@
---- xpcom/base/nscore.h	2009-05-02 17:43:48.000000000 +0100
-+++ xpcom/base/nscore.h	2012-08-10 23:08:07.168628118 +0100
-@@ -182,7 +182,7 @@
- #define NS_IMPORT_(type) NS_EXTERNAL_VIS_(type)
- #define NS_EXPORT NS_EXTERNAL_VIS
- #define NS_EXPORT_(type) NS_EXTERNAL_VIS_(type)
--#define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type NS_DEFCALL
-+#define NS_IMETHOD_(type) virtual type
- #define NS_IMETHODIMP_(type) type
- #define NS_METHOD_(type) type
- #define NS_CALLBACK_(_type, _name) _type (* _name)

Copied: kompozer/repos/community-x86_64/NS_IMETHOD_i686.patch (from rev 446099, kompozer/trunk/NS_IMETHOD_i686.patch)
===================================================================
--- NS_IMETHOD_i686.patch	                        (rev 0)
+++ NS_IMETHOD_i686.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,11 @@
+--- xpcom/base/nscore.h	2009-05-02 17:43:48.000000000 +0100
++++ xpcom/base/nscore.h	2012-08-10 23:08:07.168628118 +0100
+@@ -182,7 +182,7 @@
+ #define NS_IMPORT_(type) NS_EXTERNAL_VIS_(type)
+ #define NS_EXPORT NS_EXTERNAL_VIS
+ #define NS_EXPORT_(type) NS_EXTERNAL_VIS_(type)
+-#define NS_IMETHOD_(type) virtual IMETHOD_VISIBILITY type NS_DEFCALL
++#define NS_IMETHOD_(type) virtual type
+ #define NS_IMETHODIMP_(type) type
+ #define NS_METHOD_(type) type
+ #define NS_CALLBACK_(_type, _name) _type (* _name)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-29 21:21:15 UTC (rev 446099)
+++ PKGBUILD	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,91 +0,0 @@
-# $Id$
-# Maintainer: Muflone http://www.muflone.com/contacts/english/
-# Contributor: peace4all <markspost at rocketmail dot com>
-# Contributor: ingamedeo <ingamedeo at gmail dot com>
-
-# thanks to tadzio, and techlive for the investigation
-# work and fix included as the NS_IMETHOD_i686.patch
-
-# Sorry for not honouring makepkg.conf (!buildflags)
-# but the source doesn't compile with makepkg's default C/CXXFLAGS
-
-pkgname=kompozer
-pkgver=0.8b3
-pkgrel=19
-pkgdesc="A Dreamweaver style WYSIWYG web editor; Nvu unofficial bug-fix release"
-arch=('x86_64' 'i686')
-license=('GPL')
-url="http://www.kompozer.net"
-depends=('gtk2' 'nss' 'libxt' 'libidl2')
-makedepends=('zip' 'pangox-compat')
-options=('!buildflags')
-source=("https://downloads.sourceforge.net/kompozer/${pkgname}-${pkgver}-src.tar.bz2" 
-        'kompozer.desktop' 
-        'mozconfig.patch' 
-        'kompozer-libpng15.patch' 
-        'kompozer-libpng14.patch' 
-        'gcc46_default_ctors.patch' 
-        'kompozer_gcc_4.7.patch' 
-        'any_kernel_26_plus.patch'
-        'NS_IMETHOD_i686.patch'
-        'freetype-pango.patch'
-        'freetype-xft.patch'
-        'external-nss-for-shlibsign.patch'
-        "bug_698592_cxx11_user_defined_literals.patch"::"https://bug698592.bmoattachments.org/attachment.cgi?id=573137")
-sha256sums=('9dfef34e5941ce1e68e2f952c9783b281a74be226dad3ab1a2b1b8c99df5c5e3'
-            '9c051098389cfe8cb0f2fa296022e9160417af7601d0f2543d22823ee3f230d9'
-            '46ee83e2875129bab821ce5965ddb923683c9745b718f3c8689e9758c45df4b7'
-            'bbab99625647ca678c3b399551c945647117f817f238905c9c0babe1db941773'
-            '7319c26c9c16e3817377815d5cc9b2f490a49c5a51a5d3bee0f496a2931c64c1'
-            'cefc169f14a02591d335cf4763e057284a3350edb2e4474fad0e92c5273e25fb'
-            '099bd752d08dd3ec8fd7157ba994b547efd625a40d7d11376451f0e673b681f5'
-            '2d24c5a2580c967e96b8d4cf41d71bd972b9652f0e41b71b5c4fa179a5954265'
-            '9e378e7b176374f35c4c00ec777b9c16461a8692e6164abd05ebc1513c6be942'
-            'f46aef175bb6361dfca6bb0ccc9fba6c3a89a1a125e695bb1ae4bf3859d267ff'
-            'd8f2f13c749a20cc9a2f2fd471dc747fe264bf9384ea96b94d2f9d9cca37099d'
-            'f1b4a0855be4883f4a6a8f309bf8c97a17815f11109141b1880c055bc8c96962'
-            'dcea4088ba120baad6df9d7a7b3fefe9d3ff76e9ed12f56e28b9381087029d81')
-
-prepare() {
-  cd "${srcdir}/mozilla"
-  patch -Np0 -i "${srcdir}/mozconfig.patch"
-  patch -Np0 -i "${srcdir}/kompozer-libpng14.patch"
-  patch -Np0 -i "${srcdir}/kompozer-libpng15.patch"
-  patch -Np0 -i "${srcdir}/gcc46_default_ctors.patch"
-  patch -Np0 -i "${srcdir}/kompozer_gcc_4.7.patch"
-  patch -Np0 -i "${srcdir}/any_kernel_26_plus.patch"
-  patch -Np0 -i "${srcdir}/NS_IMETHOD_i686.patch"
-  # Patches for moving from freetype to freetype2 packages
-  patch -Np2 -i "${srcdir}/freetype-pango.patch"
-  patch -Np2 -i "${srcdir}/freetype-xft.patch"
-  # Patch to exclude the integrated nss library to sign
-  # the binary libraries (currently broken for i686)
-  patch -Np1 -i "${srcdir}/external-nss-for-shlibsign.patch"
-  # Patch for C++11
-  patch -Np0 security/nss-fips/lib/pk11wrap/secmodt.h \
-    "${srcdir}/bug_698592_cxx11_user_defined_literals.patch"
-  patch -Np0 security/nss/lib/pk11wrap/secmodt.h \
-    "${srcdir}/bug_698592_cxx11_user_defined_literals.patch"
-}
-
-build() {
-  cd "${srcdir}/mozilla"
-  ./configure
-  make
-}
-
-package() {
-  cd "${srcdir}/mozilla"
-
-  make DESTDIR="${pkgdir}" install
-  # Remove nspr.m4 because it's now provided by nspr package
-  rm "${pkgdir}/usr/share/aclocal/nspr.m4"
-  rmdir "${pkgdir}/usr/share/aclocal"
-
-  install -m755 -dD "${pkgdir}/usr/share/applications/"
-  install -m644  "${srcdir}/kompozer.desktop" "${pkgdir}/usr/share/applications/"
-
-  install -d -m755 "${pkgdir}/usr/share/pixmaps/"
-  ln -s "/usr/lib/kompozer/icons/mozicon256.png" "${pkgdir}/usr/share/pixmaps/kompozer.png"
-  ln -s "/usr/lib/kompozer/icons/mozicon50.xpm" "${pkgdir}/usr/share/pixmaps/kompozer.xpm"
-}

Copied: kompozer/repos/community-x86_64/PKGBUILD (from rev 446099, kompozer/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,91 @@
+# Maintainer: Muflone http://www.muflone.com/contacts/english/
+# Contributor: peace4all <markspost at rocketmail dot com>
+# Contributor: ingamedeo <ingamedeo at gmail dot com>
+
+# thanks to tadzio, and techlive for the investigation
+# work and fix included as the NS_IMETHOD_i686.patch
+
+# Sorry for not honouring makepkg.conf (!buildflags)
+# but the source doesn't compile with makepkg's default C/CXXFLAGS
+
+pkgname=kompozer
+pkgver=0.8b3
+pkgrel=20
+pkgdesc="A Dreamweaver style WYSIWYG web editor; Nvu unofficial bug-fix release"
+arch=('x86_64')
+license=('GPL')
+url="http://kompozer.sourceforge.net/"
+depends=('gtk2' 'nss' 'libxt' 'libidl2')
+makedepends=('zip' 'pangox-compat')
+options=('!buildflags')
+source=("https://downloads.sourceforge.net/kompozer/${pkgname}-${pkgver}-src.tar.bz2" 
+        'kompozer.desktop' 
+        'mozconfig.patch' 
+        'kompozer-libpng15.patch' 
+        'kompozer-libpng14.patch' 
+        'gcc46_default_ctors.patch' 
+        'kompozer_gcc_4.7.patch' 
+        'any_kernel_26_plus.patch'
+        'NS_IMETHOD_i686.patch'
+        'freetype-pango.patch'
+        'freetype-xft.patch'
+        'external-nss-for-shlibsign.patch'
+        "bug_698592_cxx11_user_defined_literals.patch"::"https://bug698592.bmoattachments.org/attachment.cgi?id=573137")
+sha256sums=('9dfef34e5941ce1e68e2f952c9783b281a74be226dad3ab1a2b1b8c99df5c5e3'
+            '9c051098389cfe8cb0f2fa296022e9160417af7601d0f2543d22823ee3f230d9'
+            '46ee83e2875129bab821ce5965ddb923683c9745b718f3c8689e9758c45df4b7'
+            'bbab99625647ca678c3b399551c945647117f817f238905c9c0babe1db941773'
+            '7319c26c9c16e3817377815d5cc9b2f490a49c5a51a5d3bee0f496a2931c64c1'
+            'cefc169f14a02591d335cf4763e057284a3350edb2e4474fad0e92c5273e25fb'
+            '099bd752d08dd3ec8fd7157ba994b547efd625a40d7d11376451f0e673b681f5'
+            '2d24c5a2580c967e96b8d4cf41d71bd972b9652f0e41b71b5c4fa179a5954265'
+            '9e378e7b176374f35c4c00ec777b9c16461a8692e6164abd05ebc1513c6be942'
+            'f46aef175bb6361dfca6bb0ccc9fba6c3a89a1a125e695bb1ae4bf3859d267ff'
+            'd8f2f13c749a20cc9a2f2fd471dc747fe264bf9384ea96b94d2f9d9cca37099d'
+            'f1b4a0855be4883f4a6a8f309bf8c97a17815f11109141b1880c055bc8c96962'
+            'dcea4088ba120baad6df9d7a7b3fefe9d3ff76e9ed12f56e28b9381087029d81')
+
+prepare() {
+  cd "${srcdir}/mozilla"
+  patch -Np0 -i "${srcdir}/mozconfig.patch"
+  patch -Np0 -i "${srcdir}/kompozer-libpng14.patch"
+  patch -Np0 -i "${srcdir}/kompozer-libpng15.patch"
+  patch -Np0 -i "${srcdir}/gcc46_default_ctors.patch"
+  patch -Np0 -i "${srcdir}/kompozer_gcc_4.7.patch"
+  patch -Np0 -i "${srcdir}/any_kernel_26_plus.patch"
+  patch -Np0 -i "${srcdir}/NS_IMETHOD_i686.patch"
+  # Patches for moving from freetype to freetype2 packages
+  patch -Np2 -i "${srcdir}/freetype-pango.patch"
+  patch -Np2 -i "${srcdir}/freetype-xft.patch"
+  # Patch to exclude the integrated nss library to sign
+  # the binary libraries (currently broken for i686)
+  patch -Np1 -i "${srcdir}/external-nss-for-shlibsign.patch"
+  # Patch for C++11
+  patch -Np0 security/nss-fips/lib/pk11wrap/secmodt.h \
+    "${srcdir}/bug_698592_cxx11_user_defined_literals.patch"
+  patch -Np0 security/nss/lib/pk11wrap/secmodt.h \
+    "${srcdir}/bug_698592_cxx11_user_defined_literals.patch"
+}
+
+build() {
+  cd "${srcdir}/mozilla"
+  export LDFLAGS="$LDFLAGS -lfreetype"
+  ./configure
+  make
+}
+
+package() {
+  cd "${srcdir}/mozilla"
+
+  make DESTDIR="${pkgdir}" install
+  # Remove nspr.m4 because it's now provided by nspr package
+  rm "${pkgdir}/usr/share/aclocal/nspr.m4"
+  rmdir "${pkgdir}/usr/share/aclocal"
+
+  install -m755 -dD "${pkgdir}/usr/share/applications/"
+  install -m644  "${srcdir}/kompozer.desktop" "${pkgdir}/usr/share/applications/"
+
+  install -d -m755 "${pkgdir}/usr/share/pixmaps/"
+  ln -s "/usr/lib/kompozer/icons/mozicon256.png" "${pkgdir}/usr/share/pixmaps/kompozer.png"
+  ln -s "/usr/lib/kompozer/icons/mozicon50.xpm" "${pkgdir}/usr/share/pixmaps/kompozer.xpm"
+}

Deleted: any_kernel_26_plus.patch
===================================================================
--- any_kernel_26_plus.patch	2019-03-29 21:21:15 UTC (rev 446099)
+++ any_kernel_26_plus.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,31 +0,0 @@
---- security/coreconf/config.mk	2009-05-02 17:42:18.000000000 +0100
-+++ security/coreconf/config.mk	2012-05-22 00:08:39.000000000 +0100
-@@ -63,7 +63,7 @@
- #######################################################################
- 
- TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
--              OpenVMS AIX
-+              OpenVMS AIX Linux
- 
- ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
- include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
---- security/coreconf/Linux.mk	2009-05-02 17:42:18.000000000 +0100
-+++ security/coreconf/Linux.mk	2012-05-22 00:36:03.533374797 +0100
-@@ -176,3 +176,17 @@
- # Always set CPU_TAG on Linux, OpenVMS, WINCE.
- #
- CPU_TAG = _$(CPU_ARCH)
-+
-+#
-+#Try to compile with any kernel version 2.6 and above.
-+#
-+DSO_LDOPTS      += -Wl,-z,defs
-+
-+OS_REL_CFLAGS   += -DLINUX2_1
-+MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
-+
-+ifdef MAPFILE
-+	MKSHLIB += -Wl,--version-script,$(MAPFILE)
-+endif
-+PROCESS_MAP_FILE = grep -v ';-' $< | \
-+        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@

Copied: kompozer/repos/community-x86_64/any_kernel_26_plus.patch (from rev 446099, kompozer/trunk/any_kernel_26_plus.patch)
===================================================================
--- any_kernel_26_plus.patch	                        (rev 0)
+++ any_kernel_26_plus.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,31 @@
+--- security/coreconf/config.mk	2009-05-02 17:42:18.000000000 +0100
++++ security/coreconf/config.mk	2012-05-22 00:08:39.000000000 +0100
+@@ -63,7 +63,7 @@
+ #######################################################################
+ 
+ TARGET_OSES = FreeBSD BSD_OS NetBSD OpenUNIX OS2 QNX Darwin BeOS OpenBSD \
+-              OpenVMS AIX
++              OpenVMS AIX Linux
+ 
+ ifeq (,$(filter-out $(TARGET_OSES),$(OS_TARGET)))
+ include $(CORE_DEPTH)/coreconf/$(OS_TARGET).mk
+--- security/coreconf/Linux.mk	2009-05-02 17:42:18.000000000 +0100
++++ security/coreconf/Linux.mk	2012-05-22 00:36:03.533374797 +0100
+@@ -176,3 +176,17 @@
+ # Always set CPU_TAG on Linux, OpenVMS, WINCE.
+ #
+ CPU_TAG = _$(CPU_ARCH)
++
++#
++#Try to compile with any kernel version 2.6 and above.
++#
++DSO_LDOPTS      += -Wl,-z,defs
++
++OS_REL_CFLAGS   += -DLINUX2_1
++MKSHLIB         = $(CC) $(DSO_LDOPTS) -Wl,-soname -Wl,$(@:$(OBJDIR)/%.so=%.so)
++
++ifdef MAPFILE
++	MKSHLIB += -Wl,--version-script,$(MAPFILE)
++endif
++PROCESS_MAP_FILE = grep -v ';-' $< | \
++        sed -e 's,;+,,' -e 's; DATA ;;' -e 's,;;,,' -e 's,;.*,;,' > $@

Deleted: external-nss-for-shlibsign.patch
===================================================================
--- external-nss-for-shlibsign.patch	2019-03-29 21:21:15 UTC (rev 446099)
+++ external-nss-for-shlibsign.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,12 +0,0 @@
-diff -Naur mozilla.orig/security/nss/cmd/shlibsign/sign.sh mozilla/security/nss/cmd/shlibsign/sign.sh
---- mozilla.orig/security/nss/cmd/shlibsign/sign.sh	2009-05-02 18:41:54.000000000 +0200
-+++ mozilla/security/nss/cmd/shlibsign/sign.sh	2015-06-19 17:46:53.079361603 +0200
-@@ -45,7 +45,7 @@
-     SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
-     export SHLIB_PATH
-     LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
--    export LD_LIBRARY_PATH
-+    #export LD_LIBRARY_PATH
-     DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
-     export DYLD_LIBRARY_PATH
-     LIBRARY_PATH=${1}/lib:${4}:$LIBRARY_PATH

Copied: kompozer/repos/community-x86_64/external-nss-for-shlibsign.patch (from rev 446099, kompozer/trunk/external-nss-for-shlibsign.patch)
===================================================================
--- external-nss-for-shlibsign.patch	                        (rev 0)
+++ external-nss-for-shlibsign.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,12 @@
+diff -Naur mozilla.orig/security/nss/cmd/shlibsign/sign.sh mozilla/security/nss/cmd/shlibsign/sign.sh
+--- mozilla.orig/security/nss/cmd/shlibsign/sign.sh	2009-05-02 18:41:54.000000000 +0200
++++ mozilla/security/nss/cmd/shlibsign/sign.sh	2015-06-19 17:46:53.079361603 +0200
+@@ -45,7 +45,7 @@
+     SHLIB_PATH=${1}/lib:${4}:$SHLIB_PATH
+     export SHLIB_PATH
+     LD_LIBRARY_PATH=${1}/lib:${4}:$LD_LIBRARY_PATH
+-    export LD_LIBRARY_PATH
++    #export LD_LIBRARY_PATH
+     DYLD_LIBRARY_PATH=${1}/lib:${4}:$DYLD_LIBRARY_PATH
+     export DYLD_LIBRARY_PATH
+     LIBRARY_PATH=${1}/lib:${4}:$LIBRARY_PATH

Deleted: freetype-pango.patch
===================================================================
--- freetype-pango.patch	2019-03-29 21:21:15 UTC (rev 446099)
+++ freetype-pango.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,11 +0,0 @@
---- src/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.orig	2009-05-02 18:42:41.000000000 +0200
-+++ src/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2013-12-05 17:42:14.091938000 +0100
-@@ -58,7 +58,7 @@
- #include <fontconfig/fontconfig.h>
- #include <gdk/gdk.h>
- #include <gdk/gdkx.h>
--#include <freetype/tttables.h>
-+#include <freetype2/freetype/tttables.h>
- 
- #include "mozilla-decoder.h"
- 

Copied: kompozer/repos/community-x86_64/freetype-pango.patch (from rev 446099, kompozer/trunk/freetype-pango.patch)
===================================================================
--- freetype-pango.patch	                        (rev 0)
+++ freetype-pango.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,11 @@
+--- src/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp.orig	2009-05-02 18:42:41.000000000 +0200
++++ src/mozilla/gfx/src/gtk/nsFontMetricsPango.cpp	2013-12-05 17:42:14.091938000 +0100
+@@ -58,7 +58,7 @@
+ #include <fontconfig/fontconfig.h>
+ #include <gdk/gdk.h>
+ #include <gdk/gdkx.h>
+-#include <freetype/tttables.h>
++#include <freetype2/freetype/tttables.h>
+ 
+ #include "mozilla-decoder.h"
+ 

Deleted: freetype-xft.patch
===================================================================
--- freetype-xft.patch	2019-03-29 21:21:15 UTC (rev 446099)
+++ freetype-xft.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,13 +0,0 @@
---- src/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.orig	2009-05-02 18:42:41.000000000 +0200
-+++ src/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2013-12-05 17:41:02.125268000 +0100
-@@ -67,8 +67,8 @@
- #include "nsFontConfigUtils.h"
- 
- #include <gdk/gdkx.h>
--#include <freetype/tttables.h>
--#include <freetype/freetype.h>
-+#include <freetype2/freetype/tttables.h>
-+#include <freetype2/freetype/freetype.h>
- 
- #define FORCE_PR_LOG
- #include "prlog.h"

Copied: kompozer/repos/community-x86_64/freetype-xft.patch (from rev 446099, kompozer/trunk/freetype-xft.patch)
===================================================================
--- freetype-xft.patch	                        (rev 0)
+++ freetype-xft.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,13 @@
+--- src/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp.orig	2009-05-02 18:42:41.000000000 +0200
++++ src/mozilla/gfx/src/gtk/nsFontMetricsXft.cpp	2013-12-05 17:41:02.125268000 +0100
+@@ -67,8 +67,8 @@
+ #include "nsFontConfigUtils.h"
+ 
+ #include <gdk/gdkx.h>
+-#include <freetype/tttables.h>
+-#include <freetype/freetype.h>
++#include <freetype2/freetype/tttables.h>
++#include <freetype2/freetype/freetype.h>
+ 
+ #define FORCE_PR_LOG
+ #include "prlog.h"

Deleted: gcc46_default_ctors.patch
===================================================================
--- gcc46_default_ctors.patch	2019-03-29 21:21:15 UTC (rev 446099)
+++ gcc46_default_ctors.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,22 +0,0 @@
---- intl/unicharutil/util/nsUnicharUtils.h	2011-05-10 17:02:12.472642196 +0200
-+++ intl/unicharutil/util/nsUnicharUtils.h	2011-05-10 17:02:50.656034735 +0200
-@@ -64,6 +64,9 @@
-     : public nsStringComparator
-   {
-     public:
-+      nsCaseInsensitiveStringComparator()
-+      {
-+      }
-       virtual int operator()( const PRUnichar*, const PRUnichar*, PRUint32 aLength ) const;
-       virtual int operator()( PRUnichar, PRUnichar ) const;
-   };
---- toolkit/xre/nsAppRunner.cpp	                2011-05-10 17:26:05.853608464 +0200
-+++ toolkit/xre/nsAppRunner.cpp	                2011-05-10 17:26:15.079221177 +0200
-@@ -491,6 +491,7 @@
-                      
- {
- public:
-+  nsXULAppInfo() {}
-   NS_DECL_ISUPPORTS_INHERITED
-   NS_DECL_NSIXULAPPINFO
-   NS_DECL_NSIXULRUNTIME

Copied: kompozer/repos/community-x86_64/gcc46_default_ctors.patch (from rev 446099, kompozer/trunk/gcc46_default_ctors.patch)
===================================================================
--- gcc46_default_ctors.patch	                        (rev 0)
+++ gcc46_default_ctors.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,22 @@
+--- intl/unicharutil/util/nsUnicharUtils.h	2011-05-10 17:02:12.472642196 +0200
++++ intl/unicharutil/util/nsUnicharUtils.h	2011-05-10 17:02:50.656034735 +0200
+@@ -64,6 +64,9 @@
+     : public nsStringComparator
+   {
+     public:
++      nsCaseInsensitiveStringComparator()
++      {
++      }
+       virtual int operator()( const PRUnichar*, const PRUnichar*, PRUint32 aLength ) const;
+       virtual int operator()( PRUnichar, PRUnichar ) const;
+   };
+--- toolkit/xre/nsAppRunner.cpp	                2011-05-10 17:26:05.853608464 +0200
++++ toolkit/xre/nsAppRunner.cpp	                2011-05-10 17:26:15.079221177 +0200
+@@ -491,6 +491,7 @@
+                      
+ {
+ public:
++  nsXULAppInfo() {}
+   NS_DECL_ISUPPORTS_INHERITED
+   NS_DECL_NSIXULAPPINFO
+   NS_DECL_NSIXULRUNTIME

Deleted: kompozer-libpng14.patch
===================================================================
--- kompozer-libpng14.patch	2019-03-29 21:21:15 UTC (rev 446099)
+++ kompozer-libpng14.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,17 +0,0 @@
-diff -Naur mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp{-,}
---- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp-	2010-06-10 19:34:09.000000000 -0700
-+++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-06-10 19:35:13.000000000 -0700
-@@ -111,9 +111,9 @@
- 
-   // initialize
-   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
--                                                png_voidp_NULL,
--                                                png_error_ptr_NULL,
--                                                png_error_ptr_NULL);
-+                                                NULL,
-+                                                NULL,
-+                                                NULL);
-   if (! png_ptr)
-     return NS_ERROR_OUT_OF_MEMORY;
-   png_info* info_ptr = png_create_info_struct(png_ptr);
-

Copied: kompozer/repos/community-x86_64/kompozer-libpng14.patch (from rev 446099, kompozer/trunk/kompozer-libpng14.patch)
===================================================================
--- kompozer-libpng14.patch	                        (rev 0)
+++ kompozer-libpng14.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,17 @@
+diff -Naur mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp{-,}
+--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp-	2010-06-10 19:34:09.000000000 -0700
++++ modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-06-10 19:35:13.000000000 -0700
+@@ -111,9 +111,9 @@
+ 
+   // initialize
+   png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                                png_voidp_NULL,
+-                                                png_error_ptr_NULL,
+-                                                png_error_ptr_NULL);
++                                                NULL,
++                                                NULL,
++                                                NULL);
+   if (! png_ptr)
+     return NS_ERROR_OUT_OF_MEMORY;
+   png_info* info_ptr = png_create_info_struct(png_ptr);
+

Deleted: kompozer-libpng15.patch
===================================================================
--- kompozer-libpng15.patch	2019-03-29 21:21:15 UTC (rev 446099)
+++ kompozer-libpng15.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,64 +0,0 @@
-diff -urp mozilla.orig/modules/libpr0n/decoders/png/nsPNGDecoder.cpp mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
---- mozilla.orig/modules/libpr0n/decoders/png/nsPNGDecoder.cpp	2011-11-14 21:55:42.513856274 +0000
-+++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp	2011-11-14 22:15:35.899962674 +0000
-@@ -171,7 +171,7 @@ static NS_METHOD ReadDataOut(nsIInputStr
-   }
- 
-   // we need to do the setjmp here otherwise bad things will happen
--  if (setjmp(decoder->mPNG->jmpbuf)) {
-+  if (setjmp (png_jmpbuf(decoder->mPNG))) {
-     png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
- 
-     decoder->mError = PR_TRUE;
-@@ -227,7 +227,7 @@ info_callback(png_structp png_ptr, png_i
-   if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION) {
-     nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*,
-                                            png_get_progressive_ptr(png_ptr));
--    longjmp(decoder->mPNG->jmpbuf, 1);
-+    longjmp(png_jmpbuf(decoder->mPNG), 1);
-   }
- #undef MOZ_PNG_MAX_DIMENSION
- 
-@@ -307,7 +307,7 @@ info_callback(png_structp png_ptr, png_i
- 
-   decoder->mImage = do_CreateInstance("@mozilla.org/image/container;1");
-   if (!decoder->mImage)
--    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+    longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
- 
-   decoder->mImageLoad->SetImage(decoder->mImage);
- 
-@@ -319,7 +319,7 @@ info_callback(png_structp png_ptr, png_i
- 
-   decoder->mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
-   if (!decoder->mFrame)
--    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+    longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
- 
-   gfx_format format;
- 
-@@ -341,7 +341,7 @@ info_callback(png_structp png_ptr, png_i
-   // then initalize the frame and append it to the container
-   nsresult rv = decoder->mFrame->Init(0, 0, width, height, format, 24);
-   if (NS_FAILED(rv))
--    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+    longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
- 
-   decoder->mImage->AppendFrame(decoder->mFrame);
- 
-@@ -362,7 +362,7 @@ info_callback(png_structp png_ptr, png_i
-       decoder->ibpr = bpr;
-     decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(decoder->ibpr*height);
-     if (!decoder->interlacebuf) {
--      longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
-+      longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
-     }            
-   }
- 
-@@ -555,7 +555,7 @@ void
- error_callback(png_structp png_ptr, png_const_charp error_msg)
- {
-   PR_LOG(gPNGLog, PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
--  longjmp(png_ptr->jmpbuf, 1);
-+  longjmp(png_jmpbuf(png_ptr), 1);
- }

Copied: kompozer/repos/community-x86_64/kompozer-libpng15.patch (from rev 446099, kompozer/trunk/kompozer-libpng15.patch)
===================================================================
--- kompozer-libpng15.patch	                        (rev 0)
+++ kompozer-libpng15.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,64 @@
+diff -urp mozilla.orig/modules/libpr0n/decoders/png/nsPNGDecoder.cpp mozilla/modules/libpr0n/decoders/png/nsPNGDecoder.cpp
+--- mozilla.orig/modules/libpr0n/decoders/png/nsPNGDecoder.cpp	2011-11-14 21:55:42.513856274 +0000
++++ modules/libpr0n/decoders/png/nsPNGDecoder.cpp	2011-11-14 22:15:35.899962674 +0000
+@@ -171,7 +171,7 @@ static NS_METHOD ReadDataOut(nsIInputStr
+   }
+ 
+   // we need to do the setjmp here otherwise bad things will happen
+-  if (setjmp(decoder->mPNG->jmpbuf)) {
++  if (setjmp (png_jmpbuf(decoder->mPNG))) {
+     png_destroy_read_struct(&decoder->mPNG, &decoder->mInfo, NULL);
+ 
+     decoder->mError = PR_TRUE;
+@@ -227,7 +227,7 @@ info_callback(png_structp png_ptr, png_i
+   if (width > MOZ_PNG_MAX_DIMENSION || height > MOZ_PNG_MAX_DIMENSION) {
+     nsPNGDecoder *decoder = NS_STATIC_CAST(nsPNGDecoder*,
+                                            png_get_progressive_ptr(png_ptr));
+-    longjmp(decoder->mPNG->jmpbuf, 1);
++    longjmp(png_jmpbuf(decoder->mPNG), 1);
+   }
+ #undef MOZ_PNG_MAX_DIMENSION
+ 
+@@ -307,7 +307,7 @@ info_callback(png_structp png_ptr, png_i
+ 
+   decoder->mImage = do_CreateInstance("@mozilla.org/image/container;1");
+   if (!decoder->mImage)
+-    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++    longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+ 
+   decoder->mImageLoad->SetImage(decoder->mImage);
+ 
+@@ -319,7 +319,7 @@ info_callback(png_structp png_ptr, png_i
+ 
+   decoder->mFrame = do_CreateInstance("@mozilla.org/gfx/image/frame;2");
+   if (!decoder->mFrame)
+-    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++    longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+ 
+   gfx_format format;
+ 
+@@ -341,7 +341,7 @@ info_callback(png_structp png_ptr, png_i
+   // then initalize the frame and append it to the container
+   nsresult rv = decoder->mFrame->Init(0, 0, width, height, format, 24);
+   if (NS_FAILED(rv))
+-    longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++    longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+ 
+   decoder->mImage->AppendFrame(decoder->mFrame);
+ 
+@@ -362,7 +362,7 @@ info_callback(png_structp png_ptr, png_i
+       decoder->ibpr = bpr;
+     decoder->interlacebuf = (PRUint8 *)nsMemory::Alloc(decoder->ibpr*height);
+     if (!decoder->interlacebuf) {
+-      longjmp(decoder->mPNG->jmpbuf, 5); // NS_ERROR_OUT_OF_MEMORY
++      longjmp(png_jmpbuf(decoder->mPNG), 5); // NS_ERROR_OUT_OF_MEMORY
+     }            
+   }
+ 
+@@ -555,7 +555,7 @@ void
+ error_callback(png_structp png_ptr, png_const_charp error_msg)
+ {
+   PR_LOG(gPNGLog, PR_LOG_ERROR, ("libpng error: %s\n", error_msg));
+-  longjmp(png_ptr->jmpbuf, 1);
++  longjmp(png_jmpbuf(png_ptr), 1);
+ }

Deleted: kompozer.desktop
===================================================================
--- kompozer.desktop	2019-03-29 21:21:15 UTC (rev 446099)
+++ kompozer.desktop	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Exec=kompozer
-Icon=kompozer
-Type=Application
-Terminal=false
-Name=KompoZer
-GenericName=Web Authoring System
-Comment=WYSIWYG Web Editor
-MimeType=text/html;text/xml;text/css;text/x-javascript;text/javascript;application/xhtml+xml;
-Categories=Development;WebDevelopment;Network;
-

Copied: kompozer/repos/community-x86_64/kompozer.desktop (from rev 446099, kompozer/trunk/kompozer.desktop)
===================================================================
--- kompozer.desktop	                        (rev 0)
+++ kompozer.desktop	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Exec=kompozer
+Icon=kompozer
+Type=Application
+Terminal=false
+Name=KompoZer
+GenericName=Web Authoring System
+Comment=WYSIWYG Web Editor
+MimeType=text/html;text/xml;text/css;text/x-javascript;text/javascript;application/xhtml+xml;
+Categories=Development;WebDevelopment;Network;
+

Deleted: kompozer_gcc_4.7.patch
===================================================================
--- kompozer_gcc_4.7.patch	2019-03-29 21:21:15 UTC (rev 446099)
+++ kompozer_gcc_4.7.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,107 +0,0 @@
---- xpcom/glue/nsBaseHashtable.h	2009-05-02 17:43:39.000000000 +0100
-+++ xpcom/glue/nsBaseHashtable.h	2012-07-27 13:43:55.000000000 +0100
-@@ -123,7 +123,7 @@
-    */
-   PRBool Get(KeyType aKey, UserDataType* pData) const
-   {
--    EntryType* ent = GetEntry(aKey);
-+    EntryType* ent = this->GetEntry(aKey);
- 
-     if (!ent)
-       return PR_FALSE;
-@@ -142,7 +142,7 @@
-    */
-   PRBool Put(KeyType aKey, UserDataType aData)
-   {
--    EntryType* ent = PutEntry(aKey);
-+    EntryType* ent = this->PutEntry(aKey);
- 
-     if (!ent)
-       return PR_FALSE;
-@@ -156,7 +156,7 @@
-    * remove the data for the associated key
-    * @param aKey the key to remove from the hashtable
-    */
--  void Remove(KeyType aKey) { RemoveEntry(aKey); }
-+  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
- 
-   /**
-    * function type provided by the application for enumeration.
---- xpcom/glue/nsClassHashtable.h	2009-05-02 17:43:39.000000000 +0100
-+++ xpcom/glue/nsClassHashtable.h	2012-07-27 13:15:10.000000000 +0100
-@@ -98,7 +98,7 @@
- nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
- {
-   typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -126,7 +126,7 @@
-   PR_Lock(this->mLock);
- 
-   typename nsBaseHashtableMT<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
---- xpcom/glue/nsInterfaceHashtable.h	2009-05-02 17:43:39.000000000 +0100
-+++ xpcom/glue/nsInterfaceHashtable.h	2012-07-27 13:30:08.000000000 +0100
-@@ -111,7 +111,7 @@
-   (KeyType aKey, UserDataType* pInterface) const
- {
-   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -139,7 +139,7 @@
-   (KeyType aKey, PRBool* aFound) const
- {
-   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -167,7 +167,7 @@
-   PR_Lock(this->mLock);
- 
-   typename nsBaseHashtableMT<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
---- xpcom/glue/nsRefPtrHashtable.h	2009-05-02 17:43:39.000000000 +0100
-+++ xpcom/glue/nsRefPtrHashtable.h	2012-07-27 13:52:48.000000000 +0100
-@@ -112,7 +112,7 @@
-   (KeyType aKey, UserDataType* pRefPtr) const
- {
-   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -140,7 +140,7 @@
-   (KeyType aKey, PRBool* aFound) const
- {
-   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {
-@@ -168,7 +168,7 @@
-   PR_Lock(this->mLock);
- 
-   typename nsBaseHashtableMT<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
--    GetEntry(aKey);
-+    this->GetEntry(aKey);
- 
-   if (ent)
-   {

Copied: kompozer/repos/community-x86_64/kompozer_gcc_4.7.patch (from rev 446099, kompozer/trunk/kompozer_gcc_4.7.patch)
===================================================================
--- kompozer_gcc_4.7.patch	                        (rev 0)
+++ kompozer_gcc_4.7.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,107 @@
+--- xpcom/glue/nsBaseHashtable.h	2009-05-02 17:43:39.000000000 +0100
++++ xpcom/glue/nsBaseHashtable.h	2012-07-27 13:43:55.000000000 +0100
+@@ -123,7 +123,7 @@
+    */
+   PRBool Get(KeyType aKey, UserDataType* pData) const
+   {
+-    EntryType* ent = GetEntry(aKey);
++    EntryType* ent = this->GetEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -142,7 +142,7 @@
+    */
+   PRBool Put(KeyType aKey, UserDataType aData)
+   {
+-    EntryType* ent = PutEntry(aKey);
++    EntryType* ent = this->PutEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -156,7 +156,7 @@
+    * remove the data for the associated key
+    * @param aKey the key to remove from the hashtable
+    */
+-  void Remove(KeyType aKey) { RemoveEntry(aKey); }
++  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
+ 
+   /**
+    * function type provided by the application for enumeration.
+--- xpcom/glue/nsClassHashtable.h	2009-05-02 17:43:39.000000000 +0100
++++ xpcom/glue/nsClassHashtable.h	2012-07-27 13:15:10.000000000 +0100
+@@ -98,7 +98,7 @@
+ nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
+ {
+   typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -126,7 +126,7 @@
+   PR_Lock(this->mLock);
+ 
+   typename nsBaseHashtableMT<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+--- xpcom/glue/nsInterfaceHashtable.h	2009-05-02 17:43:39.000000000 +0100
++++ xpcom/glue/nsInterfaceHashtable.h	2012-07-27 13:30:08.000000000 +0100
+@@ -111,7 +111,7 @@
+   (KeyType aKey, UserDataType* pInterface) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -139,7 +139,7 @@
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -167,7 +167,7 @@
+   PR_Lock(this->mLock);
+ 
+   typename nsBaseHashtableMT<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+--- xpcom/glue/nsRefPtrHashtable.h	2009-05-02 17:43:39.000000000 +0100
++++ xpcom/glue/nsRefPtrHashtable.h	2012-07-27 13:52:48.000000000 +0100
+@@ -112,7 +112,7 @@
+   (KeyType aKey, UserDataType* pRefPtr) const
+ {
+   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -140,7 +140,7 @@
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -168,7 +168,7 @@
+   PR_Lock(this->mLock);
+ 
+   typename nsBaseHashtableMT<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {

Deleted: mozconfig.patch
===================================================================
--- mozconfig.patch	2019-03-29 21:21:15 UTC (rev 446099)
+++ mozconfig.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -1,142 +0,0 @@
---- .mozconfig	2009-04-26 16:19:33.000000000 +0100
-+++ .mozconfig	1970-01-01 10:14:21.000000000 +0100
-@@ -1,85 +1,79 @@
--# Pulling Composer from the 1.8 Mozilla branch (cvs)
--#$ cvs -d :pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot co -r MOZILLA_1_8_BRANCH mozilla/client.mk
--#$ cvs -d :pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot co -r FIREFOX_2_0_0_20_RELEASE mozilla/client.mk
--#$ cd mozilla
--#$ make -f client.mk checkout MOZ_CO_PROJECT=composer
--#$ find . -name CVS -prune -exec rm -rf {} \;
--#$ find . -name .cvsignore -prune -exec rm -rf {} \;
--
--# Building Composer on the 1.8 Mozilla branch
--# Note: on Ubuntu 8.04, requires libgtk2-dev, libxt-dev, libidl-dev
--#                                + dbus-glib-1-dev, curl (for Mozilla 1.9+)
--#$ make -f client.mk build
--#
-+# Build configuration script for Debian
-+
-+# build in a separate directory (optional)
-+#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj- at CONFIG_GUESS@
- 
--export BUILD_OFFICIAL=1
- export MOZILLA_OFFICIAL=1
-+export BUILD_OFFICIAL=1
-+
-+export MOZ_STANDALONE_COMPOSER=1
-+mk_add_options MOZ_STANDALONE_COMPOSER=1
-+
-+# if you want don't want to use gcc and g or want to use
-+# a specific version of the compilers, specify it in the
-+# two following lines and uncomment them
-+#export CC="gcc-3.0"
-+#export CXX="g-3.0"
-+
-+# Uncomment the 3 following lines on Debian
-+#export OS_LIBS="-lc -lpthread"
-+#export CFLAGS="-DDEBIAN"
-+#export CXXFLAGS="-DDEBIAN"
-+mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-kompozer
- 
--mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj- at CONFIG_GUESS@
--#mk_add_options MOZ_CO_PROJECT=composer
-+# build the standalone composer, obviously
-+mk_add_options MOZ_CO_PROJECT=composer
- ac_add_options --enable-application=composer
- 
-+# change these two line to build in debug mode
- ac_add_options --enable-optimize 
-+ac_add_options --with-pthreads
- ac_add_options --disable-debug
--#ac_add_options --disable-optimize 
--#ac_add_options --enable-debug
--
--#ac_add_options --disable-shared
--#ac_add_options --enable-static
--#ac_add_options --disable-libxul 
--#ac_add_options --disable-xpfe-components
--ac_add_options --enable-xpfe-components
--ac_add_options --disable-tests
--ac_add_options --disable-installer
--
--#ac_add_options --disable-libxul
- 
--#ac_add_options --disable-crashreporter 
-+# adapt the following lines according to your distribution
- 
--#ac_add_options --enable-optimize 
--#ac_add_options --enable-default-toolkit=gtk2
--##ac_add_options --enable-default-toolkit=cairo-gtk2
--#ac_add_options --enable-xft
--#ac_add_options --disable-canvas
--##ac_add_options --disable-cairo
--
--#ac_add_options --enable-extensions="default inspector venkman"
--ac_add_options --enable-extensions="default spellcheck"
--#ac_add_options --enable-inspector-apis
--
--##ac_add_options  --enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
--##ac_add_options  --enable-extensions=xml-rpc,xmlextras,pref,universalchardet
--#ac_add_options --disable-extensions
--## (now by default) ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
--ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
--##ac_add_options  --enable-mathml
--#ac_add_options  --enable-svg
--
--#ac_add_options --disable-installer
--#ac_add_options --disable-javaxpcom
--#ac_add_options --disable-activex
--#ac_add_options --disable-activex-scripting
-+ac_add_options --prefix=/usr
-+ac_add_options --libdir=/usr/lib
-+ac_add_options --disable-tests
-+ac_add_options --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
- 
--# Ubuntu 7.10 default flags: https://wiki.mozilla.org/Linux/Compiler_Options
- ac_add_options --enable-default-toolkit=gtk2
- ac_add_options --enable-xft
- ac_add_options --enable-pango
- ac_add_options --enable-postscript
- ac_add_options --disable-xprint
- 
--ac_add_options --enable-mathml
-+#ac_add_options --enable-mathml
- ac_add_options --enable-svg
--ac_add_options --enable-svg-renderer=cairo
-+#ac_add_options --enable-svg-renderer=cairo
- ac_add_options --enable-system-cairo
- ac_add_options --enable-canvas
- 
--ac_add_options --with-system-png=/usr
--ac_add_options --with-system-jpeg=/usr
--ac_add_options --with-system-zlib=/usr
-+ac_add_options --with-system-png
-+ac_add_options --with-system-jpeg
-+ac_add_options --with-system-zlib
- 
--ac_add_options --enable-gnomevfs
--ac_add_options --enable-xinerama
- ac_add_options --enable-single-profile
- ac_add_options --disable-profilesharing
- ac_add_options --enable-system-myspell
- 
-+ac_add_options --disable-installer
-+ac_add_options --disable-xpfe-components
-+ac_add_options --with-default-mozilla-five-home=/usr/lib/kompozer
-+ac_add_options --with-distribution-id=aur.archlinux.org
-+ac_add_options --without-system-nspr
-+ac_add_options --without-system-nss
-+
-+#ac_add_options --disable-elf-dynstr-gc
-+#ac_add_options --disable-gtktest
-+ac_add_options --enable-strip
-+#ac_add_options --disable-strip-lib
-+ac_add_options --disable-updater
-+
-+ac_add_options --enable-xinerama
-+ac_add_options --enable-xpcom-fastload        
-+
-+ac_cv_visibility_pragma=no
-+
-+
-+

Copied: kompozer/repos/community-x86_64/mozconfig.patch (from rev 446099, kompozer/trunk/mozconfig.patch)
===================================================================
--- mozconfig.patch	                        (rev 0)
+++ mozconfig.patch	2019-03-29 21:21:24 UTC (rev 446100)
@@ -0,0 +1,142 @@
+--- .mozconfig	2009-04-26 16:19:33.000000000 +0100
++++ .mozconfig	1970-01-01 10:14:21.000000000 +0100
+@@ -1,85 +1,79 @@
+-# Pulling Composer from the 1.8 Mozilla branch (cvs)
+-#$ cvs -d :pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot co -r MOZILLA_1_8_BRANCH mozilla/client.mk
+-#$ cvs -d :pserver:anonymous at cvs-mirror.mozilla.org:/cvsroot co -r FIREFOX_2_0_0_20_RELEASE mozilla/client.mk
+-#$ cd mozilla
+-#$ make -f client.mk checkout MOZ_CO_PROJECT=composer
+-#$ find . -name CVS -prune -exec rm -rf {} \;
+-#$ find . -name .cvsignore -prune -exec rm -rf {} \;
+-
+-# Building Composer on the 1.8 Mozilla branch
+-# Note: on Ubuntu 8.04, requires libgtk2-dev, libxt-dev, libidl-dev
+-#                                + dbus-glib-1-dev, curl (for Mozilla 1.9+)
+-#$ make -f client.mk build
+-#
++# Build configuration script for Debian
++
++# build in a separate directory (optional)
++#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj- at CONFIG_GUESS@
+ 
+-export BUILD_OFFICIAL=1
+ export MOZILLA_OFFICIAL=1
++export BUILD_OFFICIAL=1
++
++export MOZ_STANDALONE_COMPOSER=1
++mk_add_options MOZ_STANDALONE_COMPOSER=1
++
++# if you want don't want to use gcc and g or want to use
++# a specific version of the compilers, specify it in the
++# two following lines and uncomment them
++#export CC="gcc-3.0"
++#export CXX="g-3.0"
++
++# Uncomment the 3 following lines on Debian
++#export OS_LIBS="-lc -lpthread"
++#export CFLAGS="-DDEBIAN"
++#export CXXFLAGS="-DDEBIAN"
++mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj-kompozer
+ 
+-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../obj- at CONFIG_GUESS@
+-#mk_add_options MOZ_CO_PROJECT=composer
++# build the standalone composer, obviously
++mk_add_options MOZ_CO_PROJECT=composer
+ ac_add_options --enable-application=composer
+ 
++# change these two line to build in debug mode
+ ac_add_options --enable-optimize 
++ac_add_options --with-pthreads
+ ac_add_options --disable-debug
+-#ac_add_options --disable-optimize 
+-#ac_add_options --enable-debug
+-
+-#ac_add_options --disable-shared
+-#ac_add_options --enable-static
+-#ac_add_options --disable-libxul 
+-#ac_add_options --disable-xpfe-components
+-ac_add_options --enable-xpfe-components
+-ac_add_options --disable-tests
+-ac_add_options --disable-installer
+-
+-#ac_add_options --disable-libxul
+ 
+-#ac_add_options --disable-crashreporter 
++# adapt the following lines according to your distribution
+ 
+-#ac_add_options --enable-optimize 
+-#ac_add_options --enable-default-toolkit=gtk2
+-##ac_add_options --enable-default-toolkit=cairo-gtk2
+-#ac_add_options --enable-xft
+-#ac_add_options --disable-canvas
+-##ac_add_options --disable-cairo
+-
+-#ac_add_options --enable-extensions="default inspector venkman"
+-ac_add_options --enable-extensions="default spellcheck"
+-#ac_add_options --enable-inspector-apis
+-
+-##ac_add_options  --enable-extensions=wallet,xml-rpc,xmlextras,pref,universalchardet,spellcheck
+-##ac_add_options  --enable-extensions=xml-rpc,xmlextras,pref,universalchardet
+-#ac_add_options --disable-extensions
+-## (now by default) ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
+-ac_add_options  --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
+-##ac_add_options  --enable-mathml
+-#ac_add_options  --enable-svg
+-
+-#ac_add_options --disable-installer
+-#ac_add_options --disable-javaxpcom
+-#ac_add_options --disable-activex
+-#ac_add_options --disable-activex-scripting
++ac_add_options --prefix=/usr
++ac_add_options --libdir=/usr/lib
++ac_add_options --disable-tests
++ac_add_options --enable-necko-protocols=http,ftp,file,jar,viewsource,res,data
+ 
+-# Ubuntu 7.10 default flags: https://wiki.mozilla.org/Linux/Compiler_Options
+ ac_add_options --enable-default-toolkit=gtk2
+ ac_add_options --enable-xft
+ ac_add_options --enable-pango
+ ac_add_options --enable-postscript
+ ac_add_options --disable-xprint
+ 
+-ac_add_options --enable-mathml
++#ac_add_options --enable-mathml
+ ac_add_options --enable-svg
+-ac_add_options --enable-svg-renderer=cairo
++#ac_add_options --enable-svg-renderer=cairo
+ ac_add_options --enable-system-cairo
+ ac_add_options --enable-canvas
+ 
+-ac_add_options --with-system-png=/usr
+-ac_add_options --with-system-jpeg=/usr
+-ac_add_options --with-system-zlib=/usr
++ac_add_options --with-system-png
++ac_add_options --with-system-jpeg
++ac_add_options --with-system-zlib
+ 
+-ac_add_options --enable-gnomevfs
+-ac_add_options --enable-xinerama
+ ac_add_options --enable-single-profile
+ ac_add_options --disable-profilesharing
+ ac_add_options --enable-system-myspell
+ 
++ac_add_options --disable-installer
++ac_add_options --disable-xpfe-components
++ac_add_options --with-default-mozilla-five-home=/usr/lib/kompozer
++ac_add_options --with-distribution-id=aur.archlinux.org
++ac_add_options --without-system-nspr
++ac_add_options --without-system-nss
++
++#ac_add_options --disable-elf-dynstr-gc
++#ac_add_options --disable-gtktest
++ac_add_options --enable-strip
++#ac_add_options --disable-strip-lib
++ac_add_options --disable-updater
++
++ac_add_options --enable-xinerama
++ac_add_options --enable-xpcom-fastload        
++
++ac_cv_visibility_pragma=no
++
++
++



More information about the arch-commits mailing list