[arch-commits] Commit in xchm/repos (14 files)
Balló György
bgyorgy at archlinux.org
Wed Jun 21 09:59:51 UTC 2017
Date: Wednesday, June 21, 2017 @ 09:59:49
Author: bgyorgy
Revision: 239229
archrelease: copy trunk to community-i686, community-x86_64
Added:
xchm/repos/community-i686/PKGBUILD
(from rev 239228, xchm/trunk/PKGBUILD)
xchm/repos/community-i686/xchm-wx3.0-compat.patch
(from rev 239228, xchm/trunk/xchm-wx3.0-compat.patch)
xchm/repos/community-i686/xchm.desktop
(from rev 239228, xchm/trunk/xchm.desktop)
xchm/repos/community-x86_64/PKGBUILD
(from rev 239228, xchm/trunk/PKGBUILD)
xchm/repos/community-x86_64/xchm-wx3.0-compat.patch
(from rev 239228, xchm/trunk/xchm-wx3.0-compat.patch)
xchm/repos/community-x86_64/xchm.desktop
(from rev 239228, xchm/trunk/xchm.desktop)
Deleted:
xchm/repos/community-i686/PKGBUILD
xchm/repos/community-i686/xchm-wx3.0-compat.patch
xchm/repos/community-i686/xchm.desktop
xchm/repos/community-i686/xchm.xml
xchm/repos/community-x86_64/PKGBUILD
xchm/repos/community-x86_64/xchm-wx3.0-compat.patch
xchm/repos/community-x86_64/xchm.desktop
xchm/repos/community-x86_64/xchm.xml
------------------------------------------+
/PKGBUILD | 76 +++++++++++++++++++++++++++++
/xchm-wx3.0-compat.patch | 64 ++++++++++++++++++++++++
/xchm.desktop | 20 +++++++
community-i686/PKGBUILD | 41 ---------------
community-i686/xchm-wx3.0-compat.patch | 32 ------------
community-i686/xchm.desktop | 10 ---
community-x86_64/PKGBUILD | 41 ---------------
community-x86_64/xchm-wx3.0-compat.patch | 32 ------------
community-x86_64/xchm.desktop | 10 ---
9 files changed, 160 insertions(+), 166 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2017-06-21 09:59:31 UTC (rev 239228)
+++ community-i686/PKGBUILD 2017-06-21 09:59:49 UTC (rev 239229)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=xchm
-pkgver=1.23
-pkgrel=6
-pkgdesc="A cross-platform GUI front-end to chmlib"
-arch=('i686' 'x86_64')
-url="http://xchm.sourceforge.net/"
-license=('GPL')
-depends=('chmlib' 'wxgtk3')
-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 --with-wx-config=/usr/bin/wx-config-gtk3
- 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/PKGBUILD (from rev 239228, xchm/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2017-06-21 09:59:49 UTC (rev 239229)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=xchm
+pkgver=1.23
+pkgrel=7
+pkgdesc="A cross-platform GUI front-end to chmlib"
+arch=('i686' 'x86_64')
+url="http://xchm.sourceforge.net/"
+license=('GPL')
+depends=('chmlib' 'wxgtk3')
+source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
+ xchm.desktop
+ xchm-wx3.0-compat.patch)
+md5sums=('486d029bd81071a2d04e7181909b1602'
+ '629a10fc2bac9e6ca47daa66512f33b4'
+ '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 --with-wx-config=/usr/bin/wx-config-gtk3
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+ install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop"
+}
Deleted: community-i686/xchm-wx3.0-compat.patch
===================================================================
--- community-i686/xchm-wx3.0-compat.patch 2017-06-21 09:59:31 UTC (rev 239228)
+++ community-i686/xchm-wx3.0-compat.patch 2017-06-21 09:59:49 UTC (rev 239229)
@@ -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 <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-i686/xchm-wx3.0-compat.patch (from rev 239228, xchm/trunk/xchm-wx3.0-compat.patch)
===================================================================
--- community-i686/xchm-wx3.0-compat.patch (rev 0)
+++ community-i686/xchm-wx3.0-compat.patch 2017-06-21 09:59:49 UTC (rev 239229)
@@ -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-06-21 09:59:31 UTC (rev 239228)
+++ community-i686/xchm.desktop 2017-06-21 09:59:49 UTC (rev 239229)
@@ -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 239228, xchm/trunk/xchm.desktop)
===================================================================
--- community-i686/xchm.desktop (rev 0)
+++ community-i686/xchm.desktop 2017-06-21 09:59:49 UTC (rev 239229)
@@ -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
Deleted: community-i686/xchm.xml
===================================================================
(Binary files differ)
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2017-06-21 09:59:31 UTC (rev 239228)
+++ community-x86_64/PKGBUILD 2017-06-21 09:59:49 UTC (rev 239229)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=xchm
-pkgver=1.23
-pkgrel=6
-pkgdesc="A cross-platform GUI front-end to chmlib"
-arch=('i686' 'x86_64')
-url="http://xchm.sourceforge.net/"
-license=('GPL')
-depends=('chmlib' 'wxgtk3')
-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 --with-wx-config=/usr/bin/wx-config-gtk3
- 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/PKGBUILD (from rev 239228, xchm/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2017-06-21 09:59:49 UTC (rev 239229)
@@ -0,0 +1,38 @@
+# $Id$
+# Maintainer: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=xchm
+pkgver=1.23
+pkgrel=7
+pkgdesc="A cross-platform GUI front-end to chmlib"
+arch=('i686' 'x86_64')
+url="http://xchm.sourceforge.net/"
+license=('GPL')
+depends=('chmlib' 'wxgtk3')
+source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz"
+ xchm.desktop
+ xchm-wx3.0-compat.patch)
+md5sums=('486d029bd81071a2d04e7181909b1602'
+ '629a10fc2bac9e6ca47daa66512f33b4'
+ '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 --with-wx-config=/usr/bin/wx-config-gtk3
+ make
+}
+
+package() {
+ cd ${pkgname}-${pkgver}
+
+ make DESTDIR=${pkgdir} install
+ install -D -m644 ${srcdir}/xchm.desktop "${pkgdir}/usr/share/applications/xchm.desktop"
+}
Deleted: community-x86_64/xchm-wx3.0-compat.patch
===================================================================
--- community-x86_64/xchm-wx3.0-compat.patch 2017-06-21 09:59:31 UTC (rev 239228)
+++ community-x86_64/xchm-wx3.0-compat.patch 2017-06-21 09:59:49 UTC (rev 239229)
@@ -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 <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-x86_64/xchm-wx3.0-compat.patch (from rev 239228, 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-06-21 09:59:49 UTC (rev 239229)
@@ -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-06-21 09:59:31 UTC (rev 239228)
+++ community-x86_64/xchm.desktop 2017-06-21 09:59:49 UTC (rev 239229)
@@ -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 239228, xchm/trunk/xchm.desktop)
===================================================================
--- community-x86_64/xchm.desktop (rev 0)
+++ community-x86_64/xchm.desktop 2017-06-21 09:59:49 UTC (rev 239229)
@@ -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
Deleted: community-x86_64/xchm.xml
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list