Move insecure, unmaintained web browser from the [community] repository

3 files changed, 19 insertions, 76 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a9d06601980..771706cba4c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,21 @@
 pkgbase = xombrero
 	pkgdesc = A minimalists web browser, vi-like but with traditional web browser behavior.
 	pkgver = 1.6.4
-	pkgrel = 2
-	url = https://opensource.conformal.com/wiki/xombrero
-	install = xombrero.install
+	pkgrel = 5
+	url = https://github.com/conformal/xombrero
 	arch = i686
 	arch = x86_64
 	license = custom:ISC
-	depends = webkitgtk3
+	depends = webkitgtk
 	depends = libbsd
 	depends = desktop-file-utils
 	conflicts = xxxterm
 	replaces = xxxterm
 	options = !emptydirs
-	source = https://opensource.conformal.com/snapshots/xombrero/xombrero-1.6.4.tgz
+	source = https://github.com/conformal/xombrero/archive/XOMBRERO_1_6_4.tar.gz
 	source = LICENSE
-	md5sums = 3c5458e448314494f48784c6303a695c
+	md5sums = a7c570f67b5791ec132bade643b508f7
 	md5sums = f3eeb6e8b70a3dcccb8ee57daf584c9e
 
 pkgname = xombrero
-	depends = webkitgtk3
-	depends = libbsd
-	depends = desktop-file-utils
-	conflicts = xombrero-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index 2b334d72c845..5f7c17d42532 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,68 +1,41 @@
+# $Id: PKGBUILD 186911 2016-08-17 17:41:49Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 
-# uncomment whichever you want to build
 pkgname=xombrero
-#pkgname=xombrero-gtk2
-pkgbase=xombrero
 pkgver=1.6.4
-pkgrel=2
+_pkgver=1_6_4
+pkgrel=5
 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/"
+url="https://github.com/conformal/xombrero"
 license=('custom:ISC')
-depends=('webkitgtk3' 'libbsd' 'desktop-file-utils')
-if [[ "$pkgname" == "xombrero-gtk2" ]]; then
-    depends=('webkitgtk2' 'libbsd' 'desktop-file-utils')
-fi
-install=$pkgbase.install
+depends=('webkitgtk' 'libbsd' 'desktop-file-utils')
 replaces=('xxxterm')
 conflicts=('xxxterm')
 options=('!emptydirs')
-source=(https://opensource.conformal.com/snapshots/$pkgbase/$pkgbase-$pkgver.tgz \
+source=(https://github.com/conformal/xombrero/archive/XOMBRERO_${_pkgver}.tar.gz
         LICENSE)
-md5sums=('3c5458e448314494f48784c6303a695c'
+md5sums=('a7c570f67b5791ec132bade643b508f7'
          'f3eeb6e8b70a3dcccb8ee57daf584c9e')
 
-build() {
-    cd "$srcdir/$pkgbase-$pkgver"
+prepare() {
+    cd "$srcdir/xombrero-XOMBRERO_$_pkgver"
     # no spam
     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
     sed -i 's|/usr/local/share/|/usr/share/|' {unix.c,xombrero.conf,xombrero.h}
-    cd ..
-
-    mkdir -p build-gtk{2,3}
-    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" == "xombrero" ]]; then
-        cp -R "$srcdir/$pkgbase-$pkgver" build-gtk3
-        pushd "build-gtk3/$pkgbase-$pkgver"
-        make PREFIX="/usr" -C linux GTK_VERSION=gtk3
-        popd
-    fi
 }
 
-package() {
-    if [[ "$pkgname" == "xombrero" ]]; then
-        package_xombrero
-    elif [[ "$pkgname" == "xombrero-gtk2" ]]; then
-        package_xombrero-gtk2
-    fi
+build() {
+    cd "$srcdir/xombrero-XOMBRERO_$_pkgver"
+    make PREFIX="/usr" -C linux GTK_VERSION=gtk3
 }
 
-package_xombrero() {
-    depends=('webkitgtk3' 'libbsd' 'desktop-file-utils')
-    conflicts=('xombrero-gtk2')
+package() {
+    cd "$srcdir/xombrero-XOMBRERO_$_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=gtk3
     install -Dm644 xombrero.conf     "$pkgdir/etc/skel/.xombrero.conf"
@@ -71,16 +44,3 @@ package_xombrero() {
     install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package_xombrero-gtk2() {
-    depends=('webkitgtk2' 'libbsd' 'desktop-file-utils')
-    conflicts=('xxxterm' 'xombrero')
-
-    cd "$srcdir/build-gtk2/$pkgbase-$pkgver"
-    mkdir -p "$pkgdir/usr/share/applications/"  # buggy makefile
-    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"
-}
-
diff --git a/xombrero.install b/xombrero.install
deleted file mode 100644
index d3289ab64233..000000000000
--- a/xombrero.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-