Merge branch 'master' of vparabola:abslibre

4 files changed, 20 insertions, 57 deletions

diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD
index a377c189c..242c4dcb3 100644
--- a/libre/hexchat-libre/PKGBUILD
+++ b/libre/hexchat-libre/PKGBUILD
@@ -1,57 +1,48 @@
-# $Id: PKGBUILD 91125 2013-05-19 21:58:09Z alucryd $
+# $Id: PKGBUILD 97065 2013-09-12 08:20:08Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: TingPing <tingping@tingping.se>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 _pkgname=hexchat
 pkgname=hexchat-libre
-pkgver=2.9.5
-pkgrel=5
+pkgver=2.9.6
+pkgrel=1
 pkgdesc="A popular and easy to use graphical IRC (chat) client, without nonfree browser reference (Parabola rebranded)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.hexchat.org/"
 license=('GPL')
-depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libnotify' 'libproxy' 'libsexy' 'pciutils')
-makedepends=('perl' 'python2')
+depends=('dbus-glib' 'desktop-file-utils' 'hicolor-icon-theme' 'libcanberra' 'libnotify' 'libproxy' 'libsexy' 'pciutils')
+makedepends=('perl' 'python')
 optdepends=('enchant: Spell check'
             'perl: Perl plugin'
-            'python2: Python plugin')
+            'python: Python plugin')
 options=('!libtool')
 install=${_pkgname}.install
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-source=("http://dl.hexchat.org/hexchat/hexchat-${pkgver}.tar.xz"
-        'remove-non-free-suggestion.patch'
-        'no-firefox.patch')
-sha256sums=('11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d'
-            '61040cb2a369b1b8801509c88019d68d1ab4c2505b1dfd859de1a4c22503f02d'
-            'de338821e1a8790a6fbdba2ce41d323002f51e3ae3e99ee8d815fcf087197e45')
+source=("http://dl.hexchat.org/hexchat/hexchat-${pkgver}.tar.xz")
+sha256sums=('eaefc07867a6e546cd9e19a4ccc976b4736c759ba3f946020eeae3cd6f4684b0')
 
 build() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
 
 # Rebrand to Parabola
-  sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
+  sed -i 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c
 
 # Remove nonfree browser references
-  patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch"
-  patch -p1 -i "${srcdir}/no-firefox.patch"
+  sed -i '\|NAME Open Link| s|Firefox|Iceweasel|' src/common/hexchat.c
+  sed -i '\|NAME Open Link| s|firefox -private %s\\n\\n";|iceweasel -private %s\\n\\n";\n		"NAME Open Link in Private Icecat Window\\n"		"CMD !icecat -private %s\\n\\n";|' src/common/hexchat.c
+  sed -i '\|NAME Open Link in Private Iceweasel Window| s|%s\\n\\n";|%s\\n\\n"\\|' src/common/hexchat.c
 
-# Build
-  ./autogen.sh
-  ./configure --prefix=/usr --enable-{shm,spell=libsexy,textfe}
+  ./configure --prefix='/usr' --enable-{python='python3',shm,spell='libsexy',textfe,xft}
   make
 }
 
 package() {
-  cd "${srcdir}"/${_pkgname}-${pkgver}
+  cd ${_pkgname}-${pkgver}
 
-# Install
   make DESTDIR="$pkgdir" install
-
-# IRC Mime Types
-  desktop-file-edit --add-mime-type='x-scheme-handler/irc;x-scheme-handler/ircs' --set-key=Exec --set-value='sh -c "hexchat --existing --url %u || exec hexchat"' "$pkgdir/usr/share/applications/hexchat.desktop"
 }
 
 # vim: ts=2 sw=2 et:
diff --git a/libre/hexchat-libre/no-firefox.patch b/libre/hexchat-libre/no-firefox.patch
deleted file mode 100644
index 998ff4dca..000000000
--- a/libre/hexchat-libre/no-firefox.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur hexchat-2.9.4.orig/src/fe-gtk/fe-gtk.c hexchat-2.9.4/src/fe-gtk/fe-gtk.c
---- hexchat-2.9.4.orig/src/fe-gtk/fe-gtk.c	2012-11-11 07:08:30.000000000 -0200
-+++ hexchat-2.9.4/src/fe-gtk/fe-gtk.c	2013-01-30 23:06:38.670239405 -0200
-@@ -1039,8 +1039,10 @@
- 			return;
- 	}
- 
--	/* everything failed, what now? just try firefox */
--	if (try_browser ("firefox", NULL, url))
-+	/* everything failed, what now? just try iceweasel or icecat */
-+	if (try_browser ("iceweasel", NULL, url))
-+		return;
-+	if (try_browser ("icecat", NULL, url))
- 		return;
- 
- 	/* fresh out of ideas... */
diff --git a/libre/hexchat-libre/remove-non-free-suggestion.patch b/libre/hexchat-libre/remove-non-free-suggestion.patch
deleted file mode 100644
index a83a71f17..000000000
--- a/libre/hexchat-libre/remove-non-free-suggestion.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur hexchat-2.9.4.orig/src/common/hexchat.c hexchat-2.9.4/src/common/hexchat.c
---- hexchat-2.9.4.orig/src/common/hexchat.c	2012-11-11 07:08:30.000000000 -0200
-+++ hexchat-2.9.4/src/common/hexchat.c	2013-01-30 23:02:12.884864062 -0200
-@@ -618,7 +618,7 @@
- 	"NAME WII\n"			"CMD quote WHOIS %2 %2\n\n";
- 
- static char defaultconf_urlhandlers[] =
--		"NAME Open Link in Opera\n"		"CMD !opera -remote 'openURL(%s)'\n\n";
-+		""		"";
- 
- #ifdef USE_SIGACTION
- /* Close and open log files on SIGUSR1. Usefull for log rotating */
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index 0a12e4f19..37b4b5747 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -1,11 +1,12 @@
-# Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
+# Maintainer: Eric Bélanger <eric@archlinux.org>
 # Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
 # Based on https://www.archlinux.org/packages/community/any/youtube-dl/ 
 
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2013.09.10
+pkgver=2013.09.11
+_pkgver=2013.11.09
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -13,7 +14,7 @@ url="http://rg3.github.io/youtube-dl/"
 license=('custom')
 depends=('python')
 makedepends=('python-distribute')
-source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig})
+source=(http://youtube-dl.org/downloads/${_pkgver}/${_pkgname}-${_pkgver}.tar.gz{,.sig})
 
 prepare() {
   cd ${_pkgname}
@@ -27,6 +28,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-
-md5sums=('1ad831c338c82b97e0b4ef4f62d55a0c'
+md5sums=('ad389dffc97d36c355115831a460b64e'
          'SKIP')