[arch-commits] Commit in xchm/repos (14 files)

Antonio Rojas arojas at archlinux.org
Sun Jan 22 22:08:50 UTC 2017


    Date: Sunday, January 22, 2017 @ 22:08:49
  Author: arojas
Revision: 208445

archrelease: copy trunk to community-i686, community-x86_64

Added:
  xchm/repos/community-i686/PKGBUILD
    (from rev 208444, xchm/trunk/PKGBUILD)
  xchm/repos/community-i686/xchm-wx3.0-compat.patch
    (from rev 208444, xchm/trunk/xchm-wx3.0-compat.patch)
  xchm/repos/community-i686/xchm.desktop
    (from rev 208444, xchm/trunk/xchm.desktop)
  xchm/repos/community-i686/xchm.xml
    (from rev 208444, xchm/trunk/xchm.xml)
  xchm/repos/community-x86_64/PKGBUILD
    (from rev 208444, xchm/trunk/PKGBUILD)
  xchm/repos/community-x86_64/xchm-wx3.0-compat.patch
    (from rev 208444, xchm/trunk/xchm-wx3.0-compat.patch)
  xchm/repos/community-x86_64/xchm.desktop
    (from rev 208444, xchm/trunk/xchm.desktop)
  xchm/repos/community-x86_64/xchm.xml
    (from rev 208444, xchm/trunk/xchm.xml)
Deleted:
  xchm/repos/community-i686/PKGBUILD
  xchm/repos/community-i686/xchm.desktop
  xchm/repos/community-i686/xchm.xml
  xchm/repos/community-x86_64/PKGBUILD
  xchm/repos/community-x86_64/xchm.desktop
  xchm/repos/community-x86_64/xchm.xml

------------------------------------------+
 /PKGBUILD                                |   82 +++++++++++++++++++++++++++++
 /xchm.desktop                            |   20 +++++++
 community-i686/PKGBUILD                  |   34 ------------
 community-i686/xchm-wx3.0-compat.patch   |   32 +++++++++++
 community-i686/xchm.desktop              |   10 ---
 community-x86_64/PKGBUILD                |   34 ------------
 community-x86_64/xchm-wx3.0-compat.patch |   32 +++++++++++
 community-x86_64/xchm.desktop            |   10 ---
 8 files changed, 166 insertions(+), 88 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-01-22 22:07:58 UTC (rev 208444)
+++ community-i686/PKGBUILD	2017-01-22 22:08:49 UTC (rev 208445)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=xchm
-pkgver=1.23
-pkgrel=4
-pkgdesc="A cross-platform GUI front-end to chmlib"
-arch=('i686' 'x86_64')
-url="http://xchm.sourceforge.net/"
-license=('GPL')
-depends=('chmlib' 'wxgtk2.8' 'desktop-file-utils')
-source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
-        'xchm.desktop'
-        'xchm.xml')
-md5sums=('486d029bd81071a2d04e7181909b1602'
-         '31fb9692b9ee9f2a205f58b9ff4bc4fe'
-         '4102b0a393f5c60236143cc034664dd0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-  #export WX_CONFIG_PATH=/usr/bin/wx-config-2.8
-  ./configure --prefix=/usr --with-wx-config=wx-config-2.8
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR=${pkgdir} install
-  install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop"
-  install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml"
-}

Copied: xchm/repos/community-i686/PKGBUILD (from rev 208444, xchm/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-01-22 22:08:49 UTC (rev 208445)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=xchm
+pkgver=1.23
+pkgrel=5
+pkgdesc="A cross-platform GUI front-end to chmlib"
+arch=('i686' 'x86_64')
+url="http://xchm.sourceforge.net/"
+license=('GPL')
+depends=('chmlib' 'wxgtk')
+source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
+        'xchm.desktop'
+        'xchm.xml'
+        xchm-wx3.0-compat.patch)
+md5sums=('486d029bd81071a2d04e7181909b1602'
+         '31fb9692b9ee9f2a205f58b9ff4bc4fe'
+         '4102b0a393f5c60236143cc034664dd0'
+         '80fa0eec2acb73860ccadff21aa5c71c')
+
+prepare() {
+  cd $pkgname-$pkgver
+# Fix build with WxGTK 3 (Debian)
+  patch -p1 -i ../xchm-wx3.0-compat.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop"
+  install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml"
+}

Copied: xchm/repos/community-i686/xchm-wx3.0-compat.patch (from rev 208444, xchm/trunk/xchm-wx3.0-compat.patch)
===================================================================
--- community-i686/xchm-wx3.0-compat.patch	                        (rev 0)
+++ community-i686/xchm-wx3.0-compat.patch	2017-01-22 22:08:49 UTC (rev 208445)
@@ -0,0 +1,32 @@
+Description: Fix code to compile with wxwidgets 3.0
+ Drops support for wx < 2.7, which is just not relevant now.  And in fact
+ configure.ac checks for at least 2.8.0.
+Author: Olly Betts <olly at survex.com>
+Last-Update: 2014-03-07
+
+--- xchm-1.23.orig/src/chmframe.cpp
++++ xchm-1.23/src/chmframe.cpp
+@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ 		enu.EnumerateFacenames();
+ 		_normalFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ 		*_normalFonts = enu.GetFacenames();
+-#else
+-		*_normalFonts = *enu.GetFacenames();
+-#endif
+ 		_normalFonts->Sort();
+ 	}
+ 
+@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ 		enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
+ 		_fixedFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ 		*_fixedFonts = enu.GetFacenames();
+-#else
+-		*_fixedFonts = *enu.GetFacenames();
+-#endif
+ 		_fixedFonts->Sort();
+ 	}
+ 

Deleted: community-i686/xchm.desktop
===================================================================
--- community-i686/xchm.desktop	2017-01-22 22:07:58 UTC (rev 208444)
+++ community-i686/xchm.desktop	2017-01-22 22:08:49 UTC (rev 208445)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Xchm
-Comment=Views CHM files
-Exec=xchm %f
-Terminal=false
-Type=Application
-Icon=xchm-48
-Categories=Viewer;Utility;
-MimeType=application/x-chm;
-StartupNotify=true

Copied: xchm/repos/community-i686/xchm.desktop (from rev 208444, xchm/trunk/xchm.desktop)
===================================================================
--- community-i686/xchm.desktop	                        (rev 0)
+++ community-i686/xchm.desktop	2017-01-22 22:08:49 UTC (rev 208445)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Xchm
+Comment=Views CHM files
+Exec=xchm %f
+Terminal=false
+Type=Application
+Icon=xchm-48
+Categories=Viewer;Utility;
+MimeType=application/x-chm;
+StartupNotify=true

Deleted: community-i686/xchm.xml
===================================================================
(Binary files differ)

Copied: xchm/repos/community-i686/xchm.xml (from rev 208444, xchm/trunk/xchm.xml)
===================================================================
(Binary files differ)

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-01-22 22:07:58 UTC (rev 208444)
+++ community-x86_64/PKGBUILD	2017-01-22 22:08:49 UTC (rev 208445)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=xchm
-pkgver=1.23
-pkgrel=4
-pkgdesc="A cross-platform GUI front-end to chmlib"
-arch=('i686' 'x86_64')
-url="http://xchm.sourceforge.net/"
-license=('GPL')
-depends=('chmlib' 'wxgtk2.8' 'desktop-file-utils')
-source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
-        'xchm.desktop'
-        'xchm.xml')
-md5sums=('486d029bd81071a2d04e7181909b1602'
-         '31fb9692b9ee9f2a205f58b9ff4bc4fe'
-         '4102b0a393f5c60236143cc034664dd0')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
-  #export WX_CONFIG_PATH=/usr/bin/wx-config-2.8
-  ./configure --prefix=/usr --with-wx-config=wx-config-2.8
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  make DESTDIR=${pkgdir} install
-  install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop"
-  install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml"
-}

Copied: xchm/repos/community-x86_64/PKGBUILD (from rev 208444, xchm/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-01-22 22:08:49 UTC (rev 208445)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=xchm
+pkgver=1.23
+pkgrel=5
+pkgdesc="A cross-platform GUI front-end to chmlib"
+arch=('i686' 'x86_64')
+url="http://xchm.sourceforge.net/"
+license=('GPL')
+depends=('chmlib' 'wxgtk')
+source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
+        'xchm.desktop'
+        'xchm.xml'
+        xchm-wx3.0-compat.patch)
+md5sums=('486d029bd81071a2d04e7181909b1602'
+         '31fb9692b9ee9f2a205f58b9ff4bc4fe'
+         '4102b0a393f5c60236143cc034664dd0'
+         '80fa0eec2acb73860ccadff21aa5c71c')
+
+prepare() {
+  cd $pkgname-$pkgver
+# Fix build with WxGTK 3 (Debian)
+  patch -p1 -i ../xchm-wx3.0-compat.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+
+  export CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+  install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop"
+  install -D -m644 ${srcdir}/xchm.xml "${pkgdir}/usr/share/mime/packages/xchm.xml"
+}

Copied: xchm/repos/community-x86_64/xchm-wx3.0-compat.patch (from rev 208444, xchm/trunk/xchm-wx3.0-compat.patch)
===================================================================
--- community-x86_64/xchm-wx3.0-compat.patch	                        (rev 0)
+++ community-x86_64/xchm-wx3.0-compat.patch	2017-01-22 22:08:49 UTC (rev 208445)
@@ -0,0 +1,32 @@
+Description: Fix code to compile with wxwidgets 3.0
+ Drops support for wx < 2.7, which is just not relevant now.  And in fact
+ configure.ac checks for at least 2.8.0.
+Author: Olly Betts <olly at survex.com>
+Last-Update: 2014-03-07
+
+--- xchm-1.23.orig/src/chmframe.cpp
++++ xchm-1.23/src/chmframe.cpp
+@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ 		enu.EnumerateFacenames();
+ 		_normalFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ 		*_normalFonts = enu.GetFacenames();
+-#else
+-		*_normalFonts = *enu.GetFacenames();
+-#endif
+ 		_normalFonts->Sort();
+ 	}
+ 
+@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
+ 		enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
+ 		_fixedFonts = new wxArrayString;
+ 
+-#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
+ 		*_fixedFonts = enu.GetFacenames();
+-#else
+-		*_fixedFonts = *enu.GetFacenames();
+-#endif
+ 		_fixedFonts->Sort();
+ 	}
+ 

Deleted: community-x86_64/xchm.desktop
===================================================================
--- community-x86_64/xchm.desktop	2017-01-22 22:07:58 UTC (rev 208444)
+++ community-x86_64/xchm.desktop	2017-01-22 22:08:49 UTC (rev 208445)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Xchm
-Comment=Views CHM files
-Exec=xchm %f
-Terminal=false
-Type=Application
-Icon=xchm-48
-Categories=Viewer;Utility;
-MimeType=application/x-chm;
-StartupNotify=true

Copied: xchm/repos/community-x86_64/xchm.desktop (from rev 208444, xchm/trunk/xchm.desktop)
===================================================================
--- community-x86_64/xchm.desktop	                        (rev 0)
+++ community-x86_64/xchm.desktop	2017-01-22 22:08:49 UTC (rev 208445)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Xchm
+Comment=Views CHM files
+Exec=xchm %f
+Terminal=false
+Type=Application
+Icon=xchm-48
+Categories=Viewer;Utility;
+MimeType=application/x-chm;
+StartupNotify=true

Deleted: community-x86_64/xchm.xml
===================================================================
(Binary files differ)

Copied: xchm/repos/community-x86_64/xchm.xml (from rev 208444, xchm/trunk/xchm.xml)
===================================================================
(Binary files differ)



More information about the arch-commits mailing list