[arch-commits] Commit in wxgtk/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Monday, June 5, 2017 @ 21:23:05
  Author: arojas
Revision: 297824

Move wxrc to common subpackage

Modified:
  wxgtk/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-05 21:08:28 UTC (rev 297823)
+++ PKGBUILD	2017-06-05 21:23:05 UTC (rev 297824)
@@ -4,8 +4,7 @@
 pkgbase=wxgtk
 pkgname=(wxgtk2 wxgtk3 wxgtk-common)
 pkgver=3.0.3.1
-pkgrel=2
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
+pkgrel=3
 arch=('i686' 'x86_64')
 url="https://wxwidgets.org"
 license=('custom:wxWindows')
@@ -47,16 +46,18 @@
 }
 
 package_wxgtk-common() {
+  pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3'
   depends=('zlib' 'gcc-libs' 'expat')
 
   cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install
-  rm -r "$pkgdir"/usr/{bin,lib/{wx,libwx_gtk*}}
+  rm -r "$pkgdir"/usr/{bin/wx-config,lib/{wx,libwx_gtk*}}
 
   install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_wxgtk2() {
+  pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
   depends=('gtk2' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
   optdepends=('webkitgtk2: for webview support')
   conflicts=('wxgtk')
@@ -65,12 +66,13 @@
 
   cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install
-  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*}
+  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
   
   install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 package_wxgtk3() {
+  pkgdesc='GTK+3 implementation of wxWidgets API for GUI'
   depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'wxgtk-common' 'libnotify')
   optdepends=('webkitgtk: for webview support')
   conflicts=('wxgtk<3.0.3.1-2')
@@ -77,14 +79,8 @@
 
   cd wxWidgets-${pkgver}-gtk3
   make DESTDIR="${pkgdir}" install  
-  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*}
-  for _i in wx-config wxrc-3.0
-  do
-    mv "$pkgdir"/usr/bin/{${_i},${_i}-gtk3}
-  done
-  rm "$pkgdir"/usr/bin/wxrc
-  ln -s wxrc-3.0-gtk3 "$pkgdir"/usr/bin/wxrc-gtk3
+  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
+  mv "$pkgdir"/usr/bin/wx-config{,-gtk3}
    
   install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
-