[arch-commits] Commit in xchm/repos/community-x86_64 (7 files)

Antonio Rojas arojas at archlinux.org
Fri Mar 8 20:01:10 UTC 2019


    Date: Friday, March 8, 2019 @ 20:01:08
  Author: arojas
Revision: 438173

archrelease: copy trunk to community-x86_64

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

-------------------------+
 PKGBUILD                |   80 ++++++++++++++++++++--------------------------
 xchm-wx3.0-compat.patch |   32 ------------------
 xchm.appdata.xml        |   66 ++++++++++++++++++-------------------
 xchm.desktop            |   20 +++++------
 4 files changed, 79 insertions(+), 119 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-03-08 20:00:43 UTC (rev 438172)
+++ PKGBUILD	2019-03-08 20:01:08 UTC (rev 438173)
@@ -1,44 +0,0 @@
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Giovanni Scafora <giovanni at archlinux.org>
-
-pkgname=xchm
-pkgver=1.23
-pkgrel=9
-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.appdata.xml
-        xchm-wx3.0-compat.patch)
-sha256sums=('8f8f5c60954f340e50f1613913eaca6ff489c10ca36b2570b360d8ccba77c062'
-            '3d2eb40ca611bd4b27e20e70a18f506658db83f65d9289333c7af46f53c6bfc4'
-            '5e785053bfa99f3f64efdcbcdebdb3800b61fa0c90eaa7e11b484b710922f91c'
-            '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 art/xchm-16.png "$pkgdir/usr/share/icons/hicolor/16x16/apps/xchm.png"
-  install -Dm644 art/xchm-32.png "$pkgdir/usr/share/icons/hicolor/32x32/apps/xchm.png"
-  install -Dm644 art/xchm-48.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/xchm.png"
-  install -Dm644 art/xchm-128.png "$pkgdir/usr/share/icons/hicolor/128x128/apps/xchm.png"
-  install -Dm644 ../$pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml"
-  rm -r "$pkgdir"/usr/share/pixmaps
-}

Copied: xchm/repos/community-x86_64/PKGBUILD (from rev 438172, xchm/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-03-08 20:01:08 UTC (rev 438173)
@@ -0,0 +1,36 @@
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Giovanni Scafora <giovanni at archlinux.org>
+
+pkgname=xchm
+pkgver=1.26
+pkgrel=1
+pkgdesc="Cross-platform GUI front-end to chmlib"
+arch=('x86_64')
+url="https://github.com/rzvncj/xCHM"
+license=('GPL')
+depends=('chmlib' 'wxgtk3')
+source=("https://github.com/rzvncj/xCHM/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
+        xchm.desktop
+        xchm.appdata.xml)
+sha256sums=('92cc90875404ddd1d3f4823b7518596bbda2e97205ca2332bbb587e5551b3eaf'
+            '3d2eb40ca611bd4b27e20e70a18f506658db83f65d9289333c7af46f53c6bfc4'
+            '5e785053bfa99f3f64efdcbcdebdb3800b61fa0c90eaa7e11b484b710922f91c')
+
+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 art/xchm-16.png "$pkgdir/usr/share/icons/hicolor/16x16/apps/xchm.png"
+  install -Dm644 art/xchm-32.png "$pkgdir/usr/share/icons/hicolor/32x32/apps/xchm.png"
+  install -Dm644 art/xchm-48.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/xchm.png"
+  install -Dm644 art/xchm-128.png "$pkgdir/usr/share/icons/hicolor/128x128/apps/xchm.png"
+  install -Dm644 ../$pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 ../$pkgname.appdata.xml "$pkgdir/usr/share/metainfo/$pkgname.appdata.xml"
+  rm -r "$pkgdir"/usr/share/pixmaps
+}

Deleted: xchm-wx3.0-compat.patch
===================================================================
--- xchm-wx3.0-compat.patch	2019-03-08 20:00:43 UTC (rev 438172)
+++ xchm-wx3.0-compat.patch	2019-03-08 20:01:08 UTC (rev 438173)
@@ -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();
- 	}
- 

Deleted: xchm.appdata.xml
===================================================================
--- xchm.appdata.xml	2019-03-08 20:00:43 UTC (rev 438172)
+++ xchm.appdata.xml	2019-03-08 20:01:08 UTC (rev 438173)
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component type="desktop-application">
-  <id>net.sourceforge.xchm</id>
-  <launchable type="desktop-id">xchm.desktop</launchable>
-  <name>xCHM</name>
-  <summary>View CHM files</summary>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>GPL-2.0</project_license>
-  <description>
-    <p>xCHM is a viewer for Compiled HTML Help (CHM) files. It can show the contents tree if one is available, print the current page and do the usual history stunts. It allows one to change fonts and search for text in all the pages of the file, or in the page's titles.</p>
-  </description>
-  <screenshots>
-    <screenshot type="default">
-      <image>http://xchm.sourceforge.net/pics/1viewing.jpg</image>
-    </screenshot>
-    <screenshot>
-      <image>http://xchm.sourceforge.net/pics/2searching.jpg</image>
-    </screenshot>
-    <screenshot>
-      <image>http://xchm.sourceforge.net/pics/3font.jpg</image>
-    </screenshot>
-    <screenshot>
-      <image>http://xchm.sourceforge.net/pics/4find.jpg</image>
-    </screenshot>
-    <screenshot>
-      <image>http://xchm.sourceforge.net/pics/5printing.jpg</image>
-    </screenshot>
-    <screenshot>
-      <image>http://xchm.sourceforge.net/pics/6russian.jpg</image>
-    </screenshot>
-  </screenshots>
-  <url type="homepage">http://xchm.sourceforge.net/</url>
-</component>

Copied: xchm/repos/community-x86_64/xchm.appdata.xml (from rev 438172, xchm/trunk/xchm.appdata.xml)
===================================================================
--- xchm.appdata.xml	                        (rev 0)
+++ xchm.appdata.xml	2019-03-08 20:01:08 UTC (rev 438173)
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>net.sourceforge.xchm</id>
+  <launchable type="desktop-id">xchm.desktop</launchable>
+  <name>xCHM</name>
+  <summary>View CHM files</summary>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0</project_license>
+  <description>
+    <p>xCHM is a viewer for Compiled HTML Help (CHM) files. It can show the contents tree if one is available, print the current page and do the usual history stunts. It allows one to change fonts and search for text in all the pages of the file, or in the page's titles.</p>
+  </description>
+  <screenshots>
+    <screenshot type="default">
+      <image>http://xchm.sourceforge.net/pics/1viewing.jpg</image>
+    </screenshot>
+    <screenshot>
+      <image>http://xchm.sourceforge.net/pics/2searching.jpg</image>
+    </screenshot>
+    <screenshot>
+      <image>http://xchm.sourceforge.net/pics/3font.jpg</image>
+    </screenshot>
+    <screenshot>
+      <image>http://xchm.sourceforge.net/pics/4find.jpg</image>
+    </screenshot>
+    <screenshot>
+      <image>http://xchm.sourceforge.net/pics/5printing.jpg</image>
+    </screenshot>
+    <screenshot>
+      <image>http://xchm.sourceforge.net/pics/6russian.jpg</image>
+    </screenshot>
+  </screenshots>
+  <url type="homepage">http://xchm.sourceforge.net/</url>
+</component>

Deleted: xchm.desktop
===================================================================
--- xchm.desktop	2019-03-08 20:00:43 UTC (rev 438172)
+++ xchm.desktop	2019-03-08 20:01:08 UTC (rev 438173)
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=xCHM
-Comment=View CHM files
-Exec=xchm %f
-Terminal=false
-Type=Application
-Icon=xchm
-Categories=Viewer;Utility;
-MimeType=application/x-chm;application/vnd.ms-htmlhelp;
-StartupNotify=true

Copied: xchm/repos/community-x86_64/xchm.desktop (from rev 438172, xchm/trunk/xchm.desktop)
===================================================================
--- xchm.desktop	                        (rev 0)
+++ xchm.desktop	2019-03-08 20:01:08 UTC (rev 438173)
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=xCHM
+Comment=View CHM files
+Exec=xchm %f
+Terminal=false
+Type=Application
+Icon=xchm
+Categories=Viewer;Utility;
+MimeType=application/x-chm;application/vnd.ms-htmlhelp;
+StartupNotify=true



More information about the arch-commits mailing list