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

[Evangelos Foutras]

    Date: Saturday, November 10, 2018 @ 00:31:03
  Author: foutrelis
Revision: 405542

archrelease: copy trunk to community-staging-x86_64

Added:
  xchm/repos/community-staging-x86_64/
  xchm/repos/community-staging-x86_64/PKGBUILD
    (from rev 405541, xchm/trunk/PKGBUILD)
  xchm/repos/community-staging-x86_64/xchm-wx3.0-compat.patch
    (from rev 405541, xchm/trunk/xchm-wx3.0-compat.patch)
  xchm/repos/community-staging-x86_64/xchm.desktop
    (from rev 405541, xchm/trunk/xchm.desktop)

-------------------------+
 PKGBUILD                |   35 +++++++++++++++++++++++++++++++++++
 xchm-wx3.0-compat.patch |   32 ++++++++++++++++++++++++++++++++
 xchm.desktop            |   10 ++++++++++
 3 files changed, 77 insertions(+)

Copied: xchm/repos/community-staging-x86_64/PKGBUILD (from rev 405541, xchm/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD	                        (rev 0)
+++ community-staging-x86_64/PKGBUILD	2018-11-10 00:31:03 UTC (rev 405542)
@@ -0,0 +1,35 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=xchm
+pkgver=1.23
+pkgrel=8
+pkgdesc="Cross-platform GUI front-end to chmlib"
+arch=('x86_64')
+url="http://xchm.sourceforge.net/"
+license=('GPL')
+depends=('chmlib' 'wxgtk3')
+source=("https://downloads.sourceforge.net/xchm/$pkgname-$pkgver.tar.gz"
+        xchm.desktop
+        xchm-wx3.0-compat.patch)
+sha256sums=('8f8f5c60954f340e50f1613913eaca6ff489c10ca36b2570b360d8ccba77c062'
+            '5c3a47762361f2088eddff29c89e2217c9d063aee8ef152fe3ec9dd9deb8046f'
+            'f98c3fa2a82f66ae627015388a9f0e671e280c2b9a1b6007f78a7b3ce013138f')
+
+prepare() {
+  cd $pkgname-$pkgver
+  # Fix build with WxGTK 3 (Debian)
+  patch -Np1 -i ../xchm-wx3.0-compat.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --with-wx-config=/usr/bin/wx-config-gtk3
+  make
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 ../$pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+}

Copied: xchm/repos/community-staging-x86_64/xchm-wx3.0-compat.patch (from rev 405541, xchm/trunk/xchm-wx3.0-compat.patch)
===================================================================
--- community-staging-x86_64/xchm-wx3.0-compat.patch	                        (rev 0)
+++ community-staging-x86_64/xchm-wx3.0-compat.patch	2018-11-10 00:31:03 UTC (rev 405542)
@@ -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();
+ 	}
+ 

Copied: xchm/repos/community-staging-x86_64/xchm.desktop (from rev 405541, xchm/trunk/xchm.desktop)
===================================================================
--- community-staging-x86_64/xchm.desktop	                        (rev 0)
+++ community-staging-x86_64/xchm.desktop	2018-11-10 00:31:03 UTC (rev 405542)
@@ -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;application/vnd.ms-htmlhelp;
+StartupNotify=true