From fa0a3ef780274f9b17a10b70baafec02798b389a Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Tue, 2 Apr 2013 17:47:42 -0300 Subject: hexchat-libre: updating version and move to [libre] repo due that hexchat from archlinux that is not free was included on community repo --- libre/hexchat-libre/PKGBUILD | 57 ++++++++++++++++++++++ libre/hexchat-libre/hexchat.install | 14 ++++++ libre/hexchat-libre/no-firefox.patch | 16 ++++++ .../hexchat-libre/remove-non-free-suggestion.patch | 12 +++++ pcr/hexchat-libre/PKGBUILD | 47 ------------------ pcr/hexchat-libre/hexchat.install | 8 --- pcr/hexchat-libre/no-firefox.patch | 16 ------ pcr/hexchat-libre/remove-non-free-suggestion.patch | 12 ----- 8 files changed, 99 insertions(+), 83 deletions(-) create mode 100644 libre/hexchat-libre/PKGBUILD create mode 100644 libre/hexchat-libre/hexchat.install create mode 100644 libre/hexchat-libre/no-firefox.patch create mode 100644 libre/hexchat-libre/remove-non-free-suggestion.patch delete mode 100644 pcr/hexchat-libre/PKGBUILD delete mode 100644 pcr/hexchat-libre/hexchat.install delete mode 100644 pcr/hexchat-libre/no-firefox.patch delete mode 100644 pcr/hexchat-libre/remove-non-free-suggestion.patch diff --git a/libre/hexchat-libre/PKGBUILD b/libre/hexchat-libre/PKGBUILD new file mode 100644 index 000000000..82bfe1cec --- /dev/null +++ b/libre/hexchat-libre/PKGBUILD @@ -0,0 +1,57 @@ +# $Id$ +# Maintainer: Maxime Gauduin +# Contributor: TingPing +# Maintainer (Parabola): André Silva + +_pkgname=hexchat +pkgname=hexchat-libre +pkgver=2.9.5 +pkgrel=3 +pkgdesc="A popular and easy to use graphical IRC (chat) client, without non-free browser reference (Parabola rebranded)" +arch=('i686' 'x86_64' 'mips64el') +url="http://www.hexchat.org/" +license=('GPL') +options=('!libtool') +depends=('desktop-file-utils' 'gtkspell' 'hicolor-icon-theme' 'libnotify' 'libproxy' 'pciutils') +makedepends=('perl' 'python2') +optdepends=('enchant: Spell check' + 'perl: Perl plugin' + 'python2: Python plugin') +install="${_pkgname}.install" +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +source=("https://github.com/downloads/hexchat/hexchat/hexchat-$pkgver.tar.xz" + 'remove-non-free-suggestion.patch' + 'no-firefox.patch') +sha256sums=('11dfd0fbfb88d8dbb38f631fab8a7dffbb179f7f7dafe316953ed6f513ac623d' + '61040cb2a369b1b8801509c88019d68d1ab4c2505b1dfd859de1a4c22503f02d' + 'de338821e1a8790a6fbdba2ce41d323002f51e3ae3e99ee8d815fcf087197e45') + +build() { + cd "${srcdir}"/${_pkgname}-${pkgver}" + +# Rebrand to Parabola + sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c + +# Remove non-free browser references + patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" + patch -p1 -i "${srcdir}/no-firefox.patch" + +# Build + ./autogen.sh + ./configure --prefix=/usr --enable-{shm,spell=gtkspell,textfe} + make +} + +package() { + cd "${srcdir}"/${_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/hexchat.install b/libre/hexchat-libre/hexchat.install new file mode 100644 index 000000000..214da2ef9 --- /dev/null +++ b/libre/hexchat-libre/hexchat.install @@ -0,0 +1,14 @@ +post_install() { + gtk-update-icon-cache -ftq usr/share/icons/hicolor + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + +# vim: ts=2 sw=2 et: diff --git a/libre/hexchat-libre/no-firefox.patch b/libre/hexchat-libre/no-firefox.patch new file mode 100644 index 000000000..998ff4dca --- /dev/null +++ b/libre/hexchat-libre/no-firefox.patch @@ -0,0 +1,16 @@ +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 new file mode 100644 index 000000000..a83a71f17 --- /dev/null +++ b/libre/hexchat-libre/remove-non-free-suggestion.patch @@ -0,0 +1,12 @@ +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/hexchat-libre/PKGBUILD b/pcr/hexchat-libre/PKGBUILD deleted file mode 100644 index 489fb0c91..000000000 --- a/pcr/hexchat-libre/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -#Maintainer: TingPing tingping@tingping.se -#Maintainer (Parabola): André Silva - -_pkgname=hexchat -pkgname=hexchat-libre -pkgver=2.9.4 -pkgrel=2.1 -pkgdesc='A GTK+ based IRC client without non-free browser reference (Parabola rebranded)' -arch=('i686' 'x86_64' 'mips64el') -url='http://www.hexchat.org/' -license=('GPL') -options=('!libtool') -replaces=('hexchat') -conflicts=('hexchat') -provides=("hexchat=$pkgver") -depends=('gtk2' 'openssl' 'dbus-glib' 'hicolor-icon-theme' 'libnotify' 'libproxy') -makedepends=('perl' 'python2' 'tcl') -optdepends=('enchant: for spell check' - 'perl: for perl plugin' - 'tcl: for tcl plugin' - 'python2: for python plugin') -install="$_pkgname.install" -source=("https://github.com/downloads/hexchat/hexchat/hexchat-$pkgver.tar.xz" - 'remove-non-free-suggestion.patch' - 'no-firefox.patch') -md5sums=('5609cac7200fc91be57196501aaf07fa' - '978da875b73d9570134a1e87af54f94b' - '8934416304ed77161da0883d5b06e7b8') - -build() { - cd "$srcdir/$_pkgname-$pkgver" - sed -i -e 's#ArchLinux#Parabola GNU/Linux-libre#' plugins/sysinfo/parse.c - patch -p1 -i "${srcdir}/remove-non-free-suggestion.patch" - patch -p1 -i "${srcdir}/no-firefox.patch" - mkdir m4 - chmod +x autogen.sh - ./autogen.sh - ./configure --prefix=/usr \ - --enable-openssl --enable-dbus --enable-nls --enable-ipv6 --enable-shm --enable-spell=static - make -} - -package() { - cd "$srcdir/$_pkgname-$pkgver" - make DESTDIR="$pkgdir" install - install -D -m644 "share/icons/hexchat.svg" "${pkgdir}/usr/share/icons/hicolor/scalable/apps/hexchat.svg" -} diff --git a/pcr/hexchat-libre/hexchat.install b/pcr/hexchat-libre/hexchat.install deleted file mode 100644 index 4b3df7505..000000000 --- a/pcr/hexchat-libre/hexchat.install +++ /dev/null @@ -1,8 +0,0 @@ -post_install() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - echo 'Read the FAQ if migrating from XChat - https://github.com/hexchat/hexchat/blob/master/share/doc/faq.md' -} - -post_upgrade() { - gtk-update-icon-cache -q -t -f usr/share/icons/hicolor -} diff --git a/pcr/hexchat-libre/no-firefox.patch b/pcr/hexchat-libre/no-firefox.patch deleted file mode 100644 index 998ff4dca..000000000 --- a/pcr/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/pcr/hexchat-libre/remove-non-free-suggestion.patch b/pcr/hexchat-libre/remove-non-free-suggestion.patch deleted file mode 100644 index a83a71f17..000000000 --- a/pcr/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 */ -- cgit v1.2.3