diff options
Diffstat (limited to 'libre')
-rw-r--r-- | libre/qupzilla/PKGBUILD (renamed from libre/qupzilla-libre/PKGBUILD) | 41 | ||||
-rw-r--r-- | libre/qupzilla/qupzilla.install (renamed from libre/qupzilla-libre/qupzilla.install) | 0 | ||||
-rw-r--r-- | libre/qupzilla/searchenginesmanager.cpp.sed (renamed from libre/qupzilla-libre/searchenginesmanager.cpp.sed) | 0 | ||||
-rw-r--r-- | libre/qupzilla/speeddial.cpp.sed (renamed from libre/qupzilla-libre/speeddial.cpp.sed) | 0 | ||||
-rw-r--r-- | libre/qupzilla/start.html.sed (renamed from libre/qupzilla-libre/start.html.sed) | 0 | ||||
-rw-r--r-- | libre/rp-pppoe/PKGBUILD (renamed from libre/rp-pppoe-libre/PKGBUILD) | 28 | ||||
-rw-r--r-- | libre/rp-pppoe/adsl (renamed from libre/rp-pppoe-libre/adsl) | 0 | ||||
-rw-r--r-- | libre/rp-pppoe/adsl.service (renamed from libre/rp-pppoe-libre/adsl.service) | 2 | ||||
-rw-r--r-- | libre/rp-pppoe/kmode.patch (renamed from libre/rp-pppoe-libre/kmode.patch) | 0 | ||||
-rw-r--r-- | libre/rp-pppoe/libre.patch (renamed from libre/rp-pppoe-libre/rp-pppoe-libre.patch) | 0 | ||||
-rw-r--r-- | libre/rp-pppoe/rp-pppoe.install (renamed from libre/rp-pppoe-libre/rp-pppoe.install) | 0 | ||||
-rw-r--r-- | libre/spacefm/PKGBUILD (renamed from libre/spacefm-libre/PKGBUILD) | 18 | ||||
-rw-r--r-- | libre/spacefm/libre.patch (renamed from libre/spacefm-libre/libre.patch) | 0 | ||||
-rw-r--r-- | libre/spacefm/spacefm.install (renamed from libre/spacefm-libre/spacefm.install) | 0 |
14 files changed, 42 insertions, 47 deletions
diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla/PKGBUILD index b26cbfcc9..fd7c14ac0 100644 --- a/libre/qupzilla-libre/PKGBUILD +++ b/libre/qupzilla/PKGBUILD @@ -2,22 +2,21 @@ # Maintainer (Arch): speps <speps at aur dot archlinux dot org> # Maintainer: André Silva <emulatorman@parabola.nu> -_pkgbase=qupzilla -pkgbase=qupzilla-libre -pkgname=(qupzilla-libre qupzilla-libre-qt4) +pkgbase=qupzilla +pkgname=(qupzilla qupzilla-qt4) pkgver=1.6.6 -pkgrel=1 +pkgrel=1.parabola1 arch=(i686 x86_64 mips64el) url="http://www.qupzilla.com/" license=('GPL3') makedepends=('qtwebkit' 'qt5-webkit' 'qt5-script' 'hunspell' 'kdelibs' 'libgnome-keyring') optdepends=('bash-completion: bash completion support') -install="$_pkgbase.install" -source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz" +install="$pkgbase.install" +source=("$pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/qupzilla/archive/v$pkgver.tar.gz" 'searchenginesmanager.cpp.sed' 'speeddial.cpp.sed' 'start.html.sed') -noextract=("$_pkgbase-$pkgver.tar.gz") +noextract=("$pkgbase-$pkgver.tar.gz") md5sums=('daad78e47a0956dcc99c0cba9ae6e462' '1d926e97a5b287d40fb695f6516f2a06' '0f166fa102af975b3b8ac030d477e9b8' @@ -26,8 +25,8 @@ md5sums=('daad78e47a0956dcc99c0cba9ae6e462' prepare() { # extract mkdir -p qt{4,5} - bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt4 - bsdtar --strip-components 1 -zxf $_pkgbase-$pkgver.tar.gz -C qt5 + bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt4 + bsdtar --strip-components 1 -zxf $pkgbase-$pkgver.tar.gz -C qt5 # configure export USE_WEBGL=true \ @@ -57,37 +56,37 @@ build() { make } -package_qupzilla-libre() { +package_qupzilla() { pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers" depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme') optdepends=('libgnome-keyring: gnome keyring integration') - provides=('qupzilla-qt5' "qupzilla=$pkgver") - conflicts=('qupzilla-qt5' 'qupzilla') - replaces=('qupzilla-qt5' 'qupzilla') + provides=('qupzilla-qt5') + conflicts=('qupzilla-qt5' 'qupzilla-libre') + replaces=('qupzilla-qt5' 'qupzilla-libre') cd qt5 make INSTALL_ROOT="$pkgdir/" install # zsh completion - install -Dm644 linux/completion/_$_pkgbase \ - "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase" + install -Dm644 linux/completion/_$pkgbase \ + "$pkgdir/usr/share/zsh/site-functions/_$pkgbase" } -package_qupzilla-libre-qt4() { +package_qupzilla-qt4() { pkgdesc="Cross-platform QtWebKit browser (Qt4), without non-privacy search providers" depends=('qtwebkit' 'hunspell') optdepends=('kdelibs: kwallet integration' 'libgnome-keyring: gnome keyring integration') - provides=('qupzilla-libre' "qupzilla-qt4=$pkgver") - conflicts=('qupzilla-libre' 'qupzilla-qt4') - replaces=('qupzilla-qt4') + provides=('qupzilla') + conflicts=('qupzilla' 'qupzilla-libre-qt4') + replaces=('qupzilla-libre-qt4') cd qt4 make INSTALL_ROOT="$pkgdir/" install # zsh completion - install -Dm644 linux/completion/_$_pkgbase \ - "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase" + install -Dm644 linux/completion/_$pkgbase \ + "$pkgdir/usr/share/zsh/site-functions/_$pkgbase" } # vim:set ts=2 sw=2 et: diff --git a/libre/qupzilla-libre/qupzilla.install b/libre/qupzilla/qupzilla.install index 029294d67..029294d67 100644 --- a/libre/qupzilla-libre/qupzilla.install +++ b/libre/qupzilla/qupzilla.install diff --git a/libre/qupzilla-libre/searchenginesmanager.cpp.sed b/libre/qupzilla/searchenginesmanager.cpp.sed index 76011d058..76011d058 100644 --- a/libre/qupzilla-libre/searchenginesmanager.cpp.sed +++ b/libre/qupzilla/searchenginesmanager.cpp.sed diff --git a/libre/qupzilla-libre/speeddial.cpp.sed b/libre/qupzilla/speeddial.cpp.sed index b8f591e87..b8f591e87 100644 --- a/libre/qupzilla-libre/speeddial.cpp.sed +++ b/libre/qupzilla/speeddial.cpp.sed diff --git a/libre/qupzilla-libre/start.html.sed b/libre/qupzilla/start.html.sed index f59a65979..f59a65979 100644 --- a/libre/qupzilla-libre/start.html.sed +++ b/libre/qupzilla/start.html.sed diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe/PKGBUILD index 7c4952e9a..218591511 100644 --- a/libre/rp-pppoe-libre/PKGBUILD +++ b/libre/rp-pppoe/PKGBUILD @@ -1,47 +1,45 @@ -# $Id: PKGBUILD 206300 2014-02-23 17:13:12Z thomas $ +# $Id: PKGBUILD 220603 2014-08-23 13:00:49Z heftig $ # Maintainer (Arch): Daniel Isenmann <daniel@archlinux.org> # Contributor (Arch): orelien <aurelien.foret@wanadoo.fr> # Maintainer: André Silva <emulatorman@parabola.nu> -_pkgname=rp-pppoe -pkgname=rp-pppoe-libre +pkgname=rp-pppoe pkgver=3.11 -pkgrel=5 +pkgrel=7.parabola1 pkgdesc="Roaring Penguin's Point-to-Point Protocol over Ethernet client, without nonfree ServPoET recommendation" arch=('i686' 'x86_64' 'mips64el') url="http://www.roaringpenguin.com/pppoe/" license=('GPL') -depends=('ppp=2.4.6' 'sh' 'net-tools') +depends=('ppp=2.4.7' 'sh' 'net-tools') backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq etc/ppp/pppoe-server-options) options=('!makeflags') -provides=("rp-pppoe=$pkgver") -replaces=('rp-pppoe') -conflicts=('rp-pppoe') +replaces=('rp-pppoe-libre') +conflicts=('rp-pppoe-libre') install=rp-pppoe.install source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} adsl.service kmode.patch - $pkgname.patch) + libre.patch) prepare() { - cd "$srcdir/$_pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" ## Adding patch to remove nonfree software recommendation (ServPoET) - patch -Np1 -i "$srcdir/rp-pppoe-libre.patch" + patch -Np1 -i "$srcdir/libre.patch" - cd "$srcdir/$_pkgname-$pkgver/src" + cd "$srcdir/$pkgname-$pkgver/src" patch -Np2 -i ../../kmode.patch } build() { - cd "$srcdir/$_pkgname-$pkgver/src" + cd "$srcdir/$pkgname-$pkgver/src" ./configure --prefix=/usr --sbindir=/usr/bin --enable-plugin make PLUGIN_DIR="/usr/lib/rp-pppoe" all rp-pppoe.so } package() { - cd "$srcdir/$_pkgname-$pkgver/src" + cd "$srcdir/$pkgname-$pkgver/src" make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" @@ -49,6 +47,6 @@ package() { } md5sums=('13b5900c56bd602df6cc526e5e520722' 'SKIP' - '45dc8fc3d0341a3930182a480859ad76' + '926b00aa2a0c0d3a21970acde9695e47' 'd38a903a247d689ff0323d7b6caa1c6b' '3c53d550ac408608abb0b6cd6b76b6c2') diff --git a/libre/rp-pppoe-libre/adsl b/libre/rp-pppoe/adsl index 33bd91839..33bd91839 100644 --- a/libre/rp-pppoe-libre/adsl +++ b/libre/rp-pppoe/adsl diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe/adsl.service index f9a2fdcc6..85ff49287 100644 --- a/libre/rp-pppoe-libre/adsl.service +++ b/libre/rp-pppoe/adsl.service @@ -1,5 +1,5 @@ [Unit] -Description=ADSL Deamon +Description=ADSL Daemon [Service] Type=forking diff --git a/libre/rp-pppoe-libre/kmode.patch b/libre/rp-pppoe/kmode.patch index 37eef58f7..37eef58f7 100644 --- a/libre/rp-pppoe-libre/kmode.patch +++ b/libre/rp-pppoe/kmode.patch diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe/libre.patch index 9cf16d7d7..9cf16d7d7 100644 --- a/libre/rp-pppoe-libre/rp-pppoe-libre.patch +++ b/libre/rp-pppoe/libre.patch diff --git a/libre/rp-pppoe-libre/rp-pppoe.install b/libre/rp-pppoe/rp-pppoe.install index 1d4bccce2..1d4bccce2 100644 --- a/libre/rp-pppoe-libre/rp-pppoe.install +++ b/libre/rp-pppoe/rp-pppoe.install diff --git a/libre/spacefm-libre/PKGBUILD b/libre/spacefm/PKGBUILD index 59c79f1c8..5159a11b0 100644 --- a/libre/spacefm-libre/PKGBUILD +++ b/libre/spacefm/PKGBUILD @@ -5,15 +5,14 @@ # Maintainer: André Silva <emulatorman@parabola.nu> # Contributor: Edison Ibañez <arkhan.xxx@gmail.com> -_pkgname=spacefm -pkgname=spacefm-libre +pkgname=spacefm pkgver=0.9.4 -pkgrel=2 +pkgrel=2.parabola1 pkgdesc='Multi-panel tabbed file manager, with unar support' arch=('i686' 'x86_64' 'mips64el') url='http://ignorantguru.github.com/spacefm/' license=('GPL3') -install=$_pkgname.install +install=$pkgname.install depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' 'systemd' 'bash' 'unar') makedepends=('intltool' 'gettext') @@ -23,9 +22,8 @@ optdepends=('lsof: device processes' 'udevil: mount as non-root user and mount networks' 'udisks: mount as non-root user' 'udisks2: mount as non-root user') -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) +replaces=(${pkgname}-libre) +conflicts=(${pkgname}-libre) source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz libre.patch) md5sums=('daeee7dcccea33d6258a0a9d783470c4' @@ -33,18 +31,18 @@ md5sums=('daeee7dcccea33d6258a0a9d783470c4' prepare() { # replace nonfree unrar with unar support - cd $_pkgname-$pkgver + cd $pkgname-$pkgver patch -Np1 -i $srcdir/libre.patch src/ptk/ptk-file-archiver.c } build() { - cd $_pkgname-$pkgver + cd $pkgname-$pkgver ./configure --prefix=/usr \ --disable-pixmaps make } package() { - cd $_pkgname-$pkgver + cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/libre/spacefm-libre/libre.patch b/libre/spacefm/libre.patch index 82d51f705..82d51f705 100644 --- a/libre/spacefm-libre/libre.patch +++ b/libre/spacefm/libre.patch diff --git a/libre/spacefm-libre/spacefm.install b/libre/spacefm/spacefm.install index 76a5d56b9..76a5d56b9 100644 --- a/libre/spacefm-libre/spacefm.install +++ b/libre/spacefm/spacefm.install |