Date: Friday, March 8, 2019 @ 20:00:43 Author: arojas Revision: 438172
Update to 1.26 Modified: xchm/trunk/PKGBUILD Deleted: xchm/trunk/xchm-wx3.0-compat.patch -------------------------+ PKGBUILD | 22 +++++++--------------- xchm-wx3.0-compat.patch | 32 -------------------------------- 2 files changed, 7 insertions(+), 47 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-03-08 19:51:17 UTC (rev 438171) +++ PKGBUILD 2019-03-08 20:00:43 UTC (rev 438172) @@ -2,28 +2,20 @@ # Contributor: Giovanni Scafora <[email protected]> pkgname=xchm -pkgver=1.23 -pkgrel=9 +pkgver=1.26 +pkgrel=1 pkgdesc="Cross-platform GUI front-end to chmlib" arch=('x86_64') -url="http://xchm.sourceforge.net/"; +url="https://github.com/rzvncj/xCHM"; license=('GPL') depends=('chmlib' 'wxgtk3') -source=("https://downloads.sourceforge.net/xchm/$pkgname-$pkgver.tar.gz"; +source=("https://github.com/rzvncj/xCHM/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"; xchm.desktop - xchm.appdata.xml - xchm-wx3.0-compat.patch) -sha256sums=('8f8f5c60954f340e50f1613913eaca6ff489c10ca36b2570b360d8ccba77c062' + xchm.appdata.xml) +sha256sums=('92cc90875404ddd1d3f4823b7518596bbda2e97205ca2332bbb587e5551b3eaf' '3d2eb40ca611bd4b27e20e70a18f506658db83f65d9289333c7af46f53c6bfc4' - '5e785053bfa99f3f64efdcbcdebdb3800b61fa0c90eaa7e11b484b710922f91c' - 'f98c3fa2a82f66ae627015388a9f0e671e280c2b9a1b6007f78a7b3ce013138f') + '5e785053bfa99f3f64efdcbcdebdb3800b61fa0c90eaa7e11b484b710922f91c') -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 Deleted: xchm-wx3.0-compat.patch =================================================================== --- xchm-wx3.0-compat.patch 2019-03-08 19:51:17 UTC (rev 438171) +++ xchm-wx3.0-compat.patch 2019-03-08 20:00:43 UTC (rev 438172) @@ -1,32 +0,0 @@ -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 <[email protected]> -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(); - } -
