Modified package to have wxgtk-dev be installed in /opt.

Updated PKGBUILD, maintainer and .SRCINFO

2 files changed, 32 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22bc2bfa6d2d..b77b394d8dd0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = wxgtk-dev
+pkgbase = wxgtk-dev-opt
 	pkgver = 3.1.4
 	pkgrel = 1
 	url = https://wxwidgets.org
@@ -14,39 +14,29 @@ pkgbase = wxgtk-dev
 	sha1sums = f8c77e6336b5f6414b07e27baa489fb8abc620c4
 	sha256sums = 3ca3a19a14b407d0cdda507a7930c2e84ae1c8e74f946e0144d2fa7d881f1a94
 
-pkgname = wxgtk2-dev
-	pkgdesc = GTK+2 implementation of wxWidgets API for GUI
+pkgname = wxgtk2-dev-opt
+	pkgdesc = GTK+2 implementation of wxWidgets API for GUI (/opt)
 	depends = gtk2
 	depends = libgl
 	depends = gst-plugins-base-libs
 	depends = libsm
 	depends = libxxf86vm
-	depends = wxgtk-common-dev
+	depends = wxgtk-common-dev-opt
 	depends = libnotify
-	provides = wxgtk
-	provides = wxgtk2
-	conflicts = wxgtk
-	conflicts = wxgtk2
-	replaces = wxgtk
 
-pkgname = wxgtk3-dev
-	pkgdesc = GTK+3 implementation of wxWidgets API for GUI
+pkgname = wxgtk3-dev-opt
+	pkgdesc = GTK+3 implementation of wxWidgets API for GUI (/opt)
 	depends = gtk3
 	depends = gst-plugins-base-libs
 	depends = libsm
 	depends = libxxf86vm
-	depends = wxgtk-common-dev
+	depends = wxgtk-common-dev-opt
 	depends = libnotify
 	optdepends = webkit2gtk: for webview support
-	provides = wxgtk3
-	conflicts = wxgtk<3.0.3.1-2
-	conflicts = wxgtk3
 
-pkgname = wxgtk-common-dev
-	pkgdesc = Common libraries and headers for wxgtk2 and wxgtk3
+pkgname = wxgtk-common-dev-opt
+	pkgdesc = Common libraries and headers for wxgtk2 and wxgtk3 (/opt)
 	depends = zlib
 	depends = gcc-libs
 	depends = expat
-	provides = wxgtk-common
-	conflicts = wxgtk-common
 
diff --git a/PKGBUILD b/PKGBUILD
index 5b3d568bfd8d..c04d20233f24 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
-# Maintainer: Qirui Wang <wqr.prg@gmail.com>
+# Maintainer: George Katevenis <george_kate[at]hotmail[dot]com>
+# wxgtk-dev (non-opt) maintainer: Qirui Wang <wqr.prg@gmail.com>
 
-pkgbase=wxgtk-dev
-pkgname=(wxgtk2-dev wxgtk3-dev wxgtk-common-dev)
+pkgbase=wxgtk-dev-opt
+pkgname=(wxgtk2-dev-opt wxgtk3-dev-opt wxgtk-common-dev-opt)
 pkgver=3.1.4
 pkgrel=1
 arch=('x86_64')
@@ -19,7 +20,7 @@ prepare() {
 
 build() {
   cd wxWidgets-${pkgver}
-  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
+  ./configure --prefix=/opt/wxgtk-dev --libdir=/opt/wxgtk-dev/lib --with-gtk=2 --with-opengl --enable-unicode \
     --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \
     --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
     --disable-precomp-headers
@@ -27,51 +28,44 @@ build() {
   make -C locale allmo
 
   cd ../wxWidgets-${pkgver}-gtk3
-  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=3 --with-opengl --enable-unicode \
+  ./configure --prefix=/opt/wxgtk-dev --libdir=/opt/wxgtk-dev/lib --with-gtk=3 --with-opengl --enable-unicode \
     --enable-graphics_ctx --enable-mediactrl --enable-webview --with-regex=builtin \
     --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
     --disable-precomp-headers
   make
 }
 
-package_wxgtk-common-dev() {
-  pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3'
+package_wxgtk-common-dev-opt() {
+  pkgdesc='Common libraries and headers for wxgtk2 and wxgtk3 (/opt)'
   depends=('zlib' 'gcc-libs' 'expat')
-  conflicts=('wxgtk-common')
-  provides=('wxgtk-common')
 
   cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install
-  rm -r "$pkgdir"/usr/{bin/wx-config,lib/{wx,libwx_gtk*}}
+  rm -r "$pkgdir"/opt/wxgtk-dev/{bin/wx-config,lib/{wx,libwx_gtk*}}
 
-  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -D -m644 docs/licence.txt "${pkgdir}/opt/wxgtk-dev/share/licenses/${pkgname}/LICENSE"
 }
 
-package_wxgtk2-dev() {
-  pkgdesc='GTK+2 implementation of wxWidgets API for GUI'
-  depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common-dev' 'libnotify')
-  conflicts=('wxgtk' 'wxgtk2')
-  provides=('wxgtk' 'wxgtk2')
-  replaces=('wxgtk')
+package_wxgtk2-dev-opt() {
+  pkgdesc='GTK+2 implementation of wxWidgets API for GUI (/opt)'
+  depends=('gtk2' 'libgl' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common-dev-opt' 'libnotify')
 
   cd wxWidgets-${pkgver}
   make DESTDIR="${pkgdir}" install
-  rm -r "$pkgdir"/usr/{include,share,lib/libwx_base*,bin/wxrc*}
-  
-  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  rm -r "$pkgdir"/opt/wxgtk-dev/{include,share,lib/libwx_base*,bin/wxrc*}
+
+  install -D -m644 docs/licence.txt "${pkgdir}/opt/wxgtk-dev/share/licenses/${pkgname}/LICENSE"
 }
 
-package_wxgtk3-dev() {
-  pkgdesc='GTK+3 implementation of wxWidgets API for GUI'
-  depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common-dev' 'libnotify')
+package_wxgtk3-dev-opt() {
+  pkgdesc='GTK+3 implementation of wxWidgets API for GUI (/opt)'
+  depends=('gtk3' 'gst-plugins-base-libs' 'libsm' 'libxxf86vm' 'wxgtk-common-dev-opt' 'libnotify')
   optdepends=('webkit2gtk: for webview support')
-  conflicts=('wxgtk<3.0.3.1-2' 'wxgtk3')
-  provides=('wxgtk3')
 
   cd wxWidgets-${pkgver}-gtk3
   make DESTDIR="${pkgdir}" install  
-  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"
+  rm -r "$pkgdir"/opt/wxgtk-dev/{include,share,lib/libwx_base*,bin/wxrc*}
+  mv "$pkgdir"/opt/wxgtk-dev/bin/wx-config{,-gtk3}
+
+  install -D -m644 docs/licence.txt "${pkgdir}/opt/wxgtk-dev/share/licenses/${pkgname}/LICENSE"
 }