xombrero-1.6.4-2: updating version

1 files changed, 25 insertions, 24 deletions

diff --git a/pcr/xombrero/PKGBUILD b/pcr/xombrero/PKGBUILD
index d2257a643..0d05a1b41 100644
--- a/pcr/xombrero/PKGBUILD
+++ b/pcr/xombrero/PKGBUILD
@@ -1,33 +1,34 @@
 # Maintainer (Arch): Kyle Keen <keenerd@gmail.com>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
-pkgbase=xombrero
-#pkgname=('xombrero' 'xombrero3')
+# uncomment whichever you want to build
 pkgname=xombrero
-#pkgname=xombrero3  # uncomment to package the gtk3 version instead
-pkgver=1.6.3
+#pkgname=xombrero-gtk2
+pkgbase=xombrero
+pkgver=1.6.4
 pkgrel=2
 pkgdesc="A minimalists web browser, vi-like but with traditional web browser behavior."
 arch=('i686' 'x86_64')
 url="https://opensource.conformal.com/wiki/xombrero"
 _watch="https://opensource.conformal.com/snapshots/xombrero/"
 license=('custom:ISC')
-depends=('webkitgtk2' 'libbsd' 'desktop-file-utils')
-if [[ "$pkgname" == "xombrero3" ]]; then
-    depends=('webkitgtk3' 'libbsd' 'desktop-file-utils')
+depends=('webkitgtk3' 'libbsd' 'desktop-file-utils')
+if [[ "$pkgname" == "xombrero-gtk2" ]]; then
+    depends=('webkitgtk2' 'libbsd' 'desktop-file-utils')
 fi
 install=$pkgbase.install
 replaces=('xxxterm')
 conflicts=('xxxterm')
 options=('!emptydirs')
-source=(http://opensource.conformal.com/snapshots/$pkgname/$pkgbase-$pkgver.tgz \
+source=(https://opensource.conformal.com/snapshots/$pkgbase/$pkgbase-$pkgver.tgz \
         LICENSE)
-md5sums=('11248a0f40542265022e8dfe692644da'
+md5sums=('3c5458e448314494f48784c6303a695c'
          'f3eeb6e8b70a3dcccb8ee57daf584c9e')
 
 build() {
     cd "$srcdir/$pkgbase-$pkgver"
     # no spam
-    sed -i 's|https://www.cyphertite.com|https://archlinux.org|' xombrero.{c,conf,h}
+    sed -i 's|https://www.cyphertite.com|https://www.archlinux.org|' xombrero.{c,conf,h}
     # relocations
     sed -i 's|/etc/ssl/cert.pem|/etc/ssl/certs/ca-certificates.crt|' xombrero.conf
     #sed -i 's|/usr/local/share/xombrero/style.css|/usr/share/xombrero/style.css|' xombrero.conf
@@ -35,14 +36,14 @@ build() {
     cd ..
 
     mkdir -p build-gtk{2,3}
-    if [[ "$pkgname" == "xombrero" ]]; then
+    if [[ "$pkgname" == "xombrero-gtk2" ]]; then
         cp -R "$srcdir/$pkgbase-$pkgver" build-gtk2
         pushd "build-gtk2/$pkgbase-$pkgver"
         make PREFIX="/usr" -C linux GTK_VERSION=gtk2
         popd
     fi
 
-    if [[ "$pkgname" == "xombrero3" ]]; then
+    if [[ "$pkgname" == "xombrero" ]]; then
         cp -R "$srcdir/$pkgbase-$pkgver" build-gtk3
         pushd "build-gtk3/$pkgbase-$pkgver"
         make PREFIX="/usr" -C linux GTK_VERSION=gtk3
@@ -50,37 +51,37 @@ build() {
     fi
 }
 
-# non-split aur compatibility function (remove for real split pkg)
 package() {
     if [[ "$pkgname" == "xombrero" ]]; then
         package_xombrero
-    elif [[ "$pkgname" == "xombrero3" ]]; then
-        package_xombrero3
+    elif [[ "$pkgname" == "xombrero-gtk2" ]]; then
+        package_xombrero-gtk2
     fi
 }
 
 package_xombrero() {
-    depends=('webkitgtk2' 'libbsd' 'desktop-file-utils')
-    conflicts=('xxxterm' 'xombrero3')
+    depends=('webkitgtk3' 'libbsd' 'desktop-file-utils')
+    conflicts=('xombrero-gtk2')
 
-    cd "$srcdir/build-gtk2/$pkgbase-$pkgver"
+    cd "$srcdir/build-gtk3/$pkgbase-$pkgver"
     mkdir -p "$pkgdir/usr/share/applications/"  # buggy makefile
-    make PREFIX="/usr" DESTDIR="$pkgdir" install -C linux GTK_VERSION=gtk2
+    make PREFIX="/usr" DESTDIR="$pkgdir" install -C linux GTK_VERSION=gtk3
     install -Dm644 xombrero.conf     "$pkgdir/etc/skel/.xombrero.conf"
     install -Dm644 xombrero.desktop  "$pkgdir/usr/share/applications/xombrero.desktop"
     install -Dm755 config-checker.pl "$pkgdir/usr/bin/config-checker.pl"
     install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_xombrero3() {
-    depends=('webkitgtk3' 'libbsd' 'desktop-file-utils')
-    conflicts=('xombrero')
+package_xombrero-gtk2() {
+    depends=('webkitgtk2' 'libbsd' 'desktop-file-utils')
+    conflicts=('xxxterm' 'xombrero')
 
-    cd "$srcdir/build-gtk3/$pkgbase-$pkgver"
+    cd "$srcdir/build-gtk2/$pkgbase-$pkgver"
     mkdir -p "$pkgdir/usr/share/applications/"  # buggy makefile
-    make PREFIX="/usr" DESTDIR="$pkgdir" install -C linux GTK_VERSION=gtk3
+    make PREFIX="/usr" DESTDIR="$pkgdir" install -C linux GTK_VERSION=gtk2
     install -Dm644 xombrero.conf     "$pkgdir/etc/skel/.xombrero.conf"
     install -Dm644 xombrero.desktop  "$pkgdir/usr/share/applications/xombrero.desktop"
     install -Dm755 config-checker.pl "$pkgdir/usr/bin/config-checker.pl"
     install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
+