From 4ac32d4cf06625e145fe9b35d65c793192275d09 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 20:50:20 -0300 Subject: spacefm: remove libre suffix and add complex pkgrel --- libre/spacefm-libre/PKGBUILD | 50 ------------------------------------- libre/spacefm-libre/libre.patch | 24 ------------------ libre/spacefm-libre/spacefm.install | 14 ----------- libre/spacefm/PKGBUILD | 48 +++++++++++++++++++++++++++++++++++ libre/spacefm/libre.patch | 24 ++++++++++++++++++ libre/spacefm/spacefm.install | 14 +++++++++++ 6 files changed, 86 insertions(+), 88 deletions(-) delete mode 100644 libre/spacefm-libre/PKGBUILD delete mode 100644 libre/spacefm-libre/libre.patch delete mode 100644 libre/spacefm-libre/spacefm.install create mode 100644 libre/spacefm/PKGBUILD create mode 100644 libre/spacefm/libre.patch create mode 100644 libre/spacefm/spacefm.install (limited to 'libre') diff --git a/libre/spacefm-libre/PKGBUILD b/libre/spacefm-libre/PKGBUILD deleted file mode 100644 index 59c79f1c8..000000000 --- a/libre/spacefm-libre/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 116546 2014-07-29 18:12:51Z bpiotrowski $ -# Maintainer (Arch): Bartłomiej Piotrowski -# Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ -# Contributor (Arch): ridikulus_rat -# Maintainer: André Silva -# Contributor: Edison Ibañez - -_pkgname=spacefm -pkgname=spacefm-libre -pkgver=0.9.4 -pkgrel=2 -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 -depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' - 'systemd' 'bash' 'unar') -makedepends=('intltool' 'gettext') -optdepends=('lsof: device processes' - 'wget: plugin download' - 'gksu: perform as root functionality' - '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) -source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz - libre.patch) -md5sums=('daeee7dcccea33d6258a0a9d783470c4' - '30ba2b4b8f5ae7bf1552689b192eab89') - -prepare() { - # replace nonfree unrar with unar support - cd $_pkgname-$pkgver - patch -Np1 -i $srcdir/libre.patch src/ptk/ptk-file-archiver.c -} - -build() { - cd $_pkgname-$pkgver - ./configure --prefix=/usr \ - --disable-pixmaps - make -} - -package() { - cd $_pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/libre/spacefm-libre/libre.patch b/libre/spacefm-libre/libre.patch deleted file mode 100644 index 82d51f705..000000000 --- a/libre/spacefm-libre/libre.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 4605df33f85e5dbd4cc0238b9d289ff73601d898 Mon Sep 17 00:00:00 2001 -From: Edison Ibañez -Date: mar, 20 may 2014 10:27:55 -0500 -Subject: [PATCH] replace nonfree unrar with unar support - - -diff --git a/src/ptk/ptk-file-archiver.c b/src/ptk/ptk-file-archiver.c -index ec9fbd7..55648d2 100644 ---- a/src/ptk/ptk-file-archiver.c -+++ b/src/ptk/ptk-file-archiver.c -@@ -80,8 +80,8 @@ const ArchiveHandler handlers[]= - { - "application/x-rar", - "rar a -r %o", -- "unrar -o- x", -- "unrar lt", -+ "unar -D ", -+ "unar -D ", - ".rar", "arc_rar", TRUE - }, - { --- -Gitg - diff --git a/libre/spacefm-libre/spacefm.install b/libre/spacefm-libre/spacefm.install deleted file mode 100644 index 76a5d56b9..000000000 --- a/libre/spacefm-libre/spacefm.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-mime-database /usr/share/mime > /dev/null - update-desktop-database -q - gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor - [[ -d /usr/share/icons/Faenza ]] && gtk-update-icon-cache -q -t -f /usr/share/icons/Faenza -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/spacefm/PKGBUILD b/libre/spacefm/PKGBUILD new file mode 100644 index 000000000..5159a11b0 --- /dev/null +++ b/libre/spacefm/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 116546 2014-07-29 18:12:51Z bpiotrowski $ +# Maintainer (Arch): Bartłomiej Piotrowski +# Contributor (Arch): IgnorantGuru http://igurublog.wordpress.com/contact-ignorantguru/ +# Contributor (Arch): ridikulus_rat +# Maintainer: André Silva +# Contributor: Edison Ibañez + +pkgname=spacefm +pkgver=0.9.4 +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 +depends=('gtk2' 'shared-mime-info' 'desktop-file-utils' 'startup-notification' + 'systemd' 'bash' 'unar') +makedepends=('intltool' 'gettext') +optdepends=('lsof: device processes' + 'wget: plugin download' + 'gksu: perform as root functionality' + 'udevil: mount as non-root user and mount networks' + 'udisks: mount as non-root user' + 'udisks2: mount as non-root user') +replaces=(${pkgname}-libre) +conflicts=(${pkgname}-libre) +source=(https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz + libre.patch) +md5sums=('daeee7dcccea33d6258a0a9d783470c4' + '30ba2b4b8f5ae7bf1552689b192eab89') + +prepare() { + # replace nonfree unrar with unar support + cd $pkgname-$pkgver + patch -Np1 -i $srcdir/libre.patch src/ptk/ptk-file-archiver.c +} + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr \ + --disable-pixmaps + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/libre/spacefm/libre.patch b/libre/spacefm/libre.patch new file mode 100644 index 000000000..82d51f705 --- /dev/null +++ b/libre/spacefm/libre.patch @@ -0,0 +1,24 @@ +From 4605df33f85e5dbd4cc0238b9d289ff73601d898 Mon Sep 17 00:00:00 2001 +From: Edison Ibañez +Date: mar, 20 may 2014 10:27:55 -0500 +Subject: [PATCH] replace nonfree unrar with unar support + + +diff --git a/src/ptk/ptk-file-archiver.c b/src/ptk/ptk-file-archiver.c +index ec9fbd7..55648d2 100644 +--- a/src/ptk/ptk-file-archiver.c ++++ b/src/ptk/ptk-file-archiver.c +@@ -80,8 +80,8 @@ const ArchiveHandler handlers[]= + { + "application/x-rar", + "rar a -r %o", +- "unrar -o- x", +- "unrar lt", ++ "unar -D ", ++ "unar -D ", + ".rar", "arc_rar", TRUE + }, + { +-- +Gitg + diff --git a/libre/spacefm/spacefm.install b/libre/spacefm/spacefm.install new file mode 100644 index 000000000..76a5d56b9 --- /dev/null +++ b/libre/spacefm/spacefm.install @@ -0,0 +1,14 @@ +post_install() { + update-mime-database /usr/share/mime > /dev/null + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor + [[ -d /usr/share/icons/Faenza ]] && gtk-update-icon-cache -q -t -f /usr/share/icons/Faenza +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} -- cgit v1.2.3 From eaa7dd3c7b19ec07ca6ace686561cf024c293ead Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 20:56:26 -0300 Subject: rp-pppoe: remove libre suffix and add complex pkgrel --- libre/rp-pppoe-libre/PKGBUILD | 54 --------------- libre/rp-pppoe-libre/adsl | 35 ---------- libre/rp-pppoe-libre/adsl.service | 10 --- libre/rp-pppoe-libre/kmode.patch | 19 ------ libre/rp-pppoe-libre/rp-pppoe-libre.patch | 110 ------------------------------ libre/rp-pppoe-libre/rp-pppoe.install | 12 ---- libre/rp-pppoe/PKGBUILD | 52 ++++++++++++++ libre/rp-pppoe/adsl | 35 ++++++++++ libre/rp-pppoe/adsl.service | 10 +++ libre/rp-pppoe/kmode.patch | 19 ++++++ libre/rp-pppoe/libre.patch | 110 ++++++++++++++++++++++++++++++ libre/rp-pppoe/rp-pppoe.install | 12 ++++ 12 files changed, 238 insertions(+), 240 deletions(-) delete mode 100644 libre/rp-pppoe-libre/PKGBUILD delete mode 100644 libre/rp-pppoe-libre/adsl delete mode 100644 libre/rp-pppoe-libre/adsl.service delete mode 100644 libre/rp-pppoe-libre/kmode.patch delete mode 100644 libre/rp-pppoe-libre/rp-pppoe-libre.patch delete mode 100644 libre/rp-pppoe-libre/rp-pppoe.install create mode 100644 libre/rp-pppoe/PKGBUILD create mode 100644 libre/rp-pppoe/adsl create mode 100644 libre/rp-pppoe/adsl.service create mode 100644 libre/rp-pppoe/kmode.patch create mode 100644 libre/rp-pppoe/libre.patch create mode 100644 libre/rp-pppoe/rp-pppoe.install (limited to 'libre') diff --git a/libre/rp-pppoe-libre/PKGBUILD b/libre/rp-pppoe-libre/PKGBUILD deleted file mode 100644 index 7c4952e9a..000000000 --- a/libre/rp-pppoe-libre/PKGBUILD +++ /dev/null @@ -1,54 +0,0 @@ -# $Id: PKGBUILD 206300 2014-02-23 17:13:12Z thomas $ -# Maintainer (Arch): Daniel Isenmann -# Contributor (Arch): orelien -# Maintainer: André Silva - -_pkgname=rp-pppoe -pkgname=rp-pppoe-libre -pkgver=3.11 -pkgrel=5 -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') -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') -install=rp-pppoe.install -source=(http://www.roaringpenguin.com/files/download/rp-pppoe-$pkgver.tar.gz{,.sig} - adsl.service - kmode.patch - $pkgname.patch) - -prepare() { - cd "$srcdir/$_pkgname-$pkgver" - - ## Adding patch to remove nonfree software recommendation (ServPoET) - patch -Np1 -i "$srcdir/rp-pppoe-libre.patch" - - cd "$srcdir/$_pkgname-$pkgver/src" - patch -Np2 -i ../../kmode.patch -} - -build() { - 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" - make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install - - #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" - install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" -} -md5sums=('13b5900c56bd602df6cc526e5e520722' - 'SKIP' - '45dc8fc3d0341a3930182a480859ad76' - 'd38a903a247d689ff0323d7b6caa1c6b' - '3c53d550ac408608abb0b6cd6b76b6c2') diff --git a/libre/rp-pppoe-libre/adsl b/libre/rp-pppoe-libre/adsl deleted file mode 100644 index 33bd91839..000000000 --- a/libre/rp-pppoe-libre/adsl +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -case "$1" in - start) - stat_busy "Starting ADSL Connection" - /usr/sbin/pppoe-start &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon adsl - stat_done - fi - ;; - stop) - stat_busy "Stopping ADSL Connection" - /usr/sbin/pppoe-stop &>/dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon adsl - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/libre/rp-pppoe-libre/adsl.service b/libre/rp-pppoe-libre/adsl.service deleted file mode 100644 index f9a2fdcc6..000000000 --- a/libre/rp-pppoe-libre/adsl.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=ADSL Deamon - -[Service] -Type=forking -ExecStart=/usr/bin/pppoe-start -ExecStop=/usr/bin/pppoe-stop - -[Install] -WantedBy=multi-user.target diff --git a/libre/rp-pppoe-libre/kmode.patch b/libre/rp-pppoe-libre/kmode.patch deleted file mode 100644 index 37eef58f7..000000000 --- a/libre/rp-pppoe-libre/kmode.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up rp-pppoe-3.11/src/configure.orig rp-pppoe-3.11/src/configure ---- rp-pppoe-3.11/src/configure.orig 2012-08-17 12:31:25.000000000 -0600 -+++ rp-pppoe-3.11/src/configure 2013-02-11 14:23:05.000000000 -0700 -@@ -3679,6 +3679,7 @@ do : - #include - #include - #include -+#include - - " - if test "x$ac_cv_header_linux_if_pppox_h" = x""yes; then : -@@ -4525,6 +4526,7 @@ else - #include - #include - #include -+#include - #include - int main() - { diff --git a/libre/rp-pppoe-libre/rp-pppoe-libre.patch b/libre/rp-pppoe-libre/rp-pppoe-libre.patch deleted file mode 100644 index 9cf16d7d7..000000000 --- a/libre/rp-pppoe-libre/rp-pppoe-libre.patch +++ /dev/null @@ -1,110 +0,0 @@ -diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec ---- rp-pppoe-3.11.orig/rp-pppoe.spec 2012-08-17 15:31:25.000000000 -0300 -+++ rp-pppoe-3.11/rp-pppoe.spec 2012-10-05 01:42:29.964508454 -0300 -@@ -55,7 +55,7 @@ - - %files - %defattr(-,root,root) --%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README SERVPOET -+%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README - %config(noreplace) /etc/ppp/pppoe.conf - %config(noreplace) /etc/ppp/pppoe-server-options - %config(noreplace) /etc/ppp/firewall-masq -diff -Nur rp-pppoe-3.11.orig/SERVPOET /dev/null ---- rp-pppoe-3.11.orig/SERVPOET 2012-08-17 15:31:25.000000000 -0300 -+++ /dev/null 2012-10-05 01:27:08.580078512 -0300 -@@ -1,18 +0,0 @@ --# LIC: GPL -- --ServPoET ---------- -- --ServPoET is a commercial version of the PPPoE server. While everything --you received in this package is licensed under the GNU General Public --License, ServPoET is not free software and is licensed under a traditional --commercial license. -- --ServPoET features RADIUS support, support for different realms, --real-time server status reporting and a friendly curses-based GUI for --administration. For information on ServPoET: -- --Contact Fine Point Technologies, Inc. (http://www.finepoint.com/) -- ---- --David F. Skoll -diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in ---- rp-pppoe-3.11.orig/src/Makefile.in 2012-08-17 15:31:25.000000000 -0300 -+++ rp-pppoe-3.11/src/Makefile.in 2012-10-05 01:46:13.121336619 -0300 -@@ -44,9 +44,6 @@ - PPPOE_PATH=$(sbindir)/pppoe - PPPD_PATH=@PPPD@ - --# Include ServPoET version if we're building for ServPoET --@LIC_MAKEFILE_INCLUDE@ -- - # Kernel-mode plugin gets installed here. - PLUGIN_DIR=/etc/ppp/plugins - PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so -@@ -152,7 +149,6 @@ - $(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir) - $(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir) - $(install) -m 644 ../README $(DESTDIR)$(docdir) -- $(install) -m 644 ../SERVPOET $(DESTDIR)$(docdir) - $(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir) - -mkdir -p $(DESTDIR)$(mandir)/man8 - for i in $(TARGETS) ; do \ -@@ -210,25 +206,15 @@ - @echo "" - @echo "Type 'pppoe-setup' to configure the software." - --servpoet-tgz: distro-servpoet -- cd .. && tar cvf servpoet-$(VERSION)$(BETA).tar servpoet-$(VERSION)$(BETA) -- gzip -f -v -9 ../servpoet-$(VERSION)$(BETA).tar -- rm -rf ../servpoet-$(VERSION)$(BETA) -- - tgz: distro - cd .. && tar cvf rp-pppoe-$(VERSION)$(BETA).tar rp-pppoe-$(VERSION)$(BETA) - gzip -f -v -9 ../rp-pppoe-$(VERSION)$(BETA).tar - rm -rf ../rp-pppoe-$(VERSION)$(BETA) - --distro-servpoet: distro -- cp ../servpoet.spec ../rp-pppoe-$(VERSION)$(BETA) -- $(MAKE) -C licensed-only distro VERSION=$(VERSION) BETA=$(BETA) -- mv ../rp-pppoe-$(VERSION)$(BETA) ../servpoet-$(VERSION)$(BETA) -- - distro: - rm -rf ../rp-pppoe-$(VERSION)$(BETA) - mkdir ../rp-pppoe-$(VERSION)$(BETA) -- for i in README SERVPOET go go-gui rp-pppoe.spec ; do \ -+ for i in README go go-gui rp-pppoe.spec ; do \ - cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \ - done - mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui -@@ -286,10 +272,6 @@ - /usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \ - /usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm - --servpoet-rpms: servpoet-tgz -- cp ../servpoet-$(VERSION).tar.gz /usr/src/redhat/SOURCES -- cd .. && rpm -ba servpoet.spec -- - clean: - rm -f *.o pppoe-relay pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~ - test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true -@@ -304,15 +286,13 @@ - update-version: - sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec - sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-$(VERSION).tar.gz+' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec -- test -f ../servpoet.spec && sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true -- test -f ../servpoet.spec && sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/servpoet-$(VERSION).tar.gz+' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true - - # Convenience target for David! Don't try to use this one. - km: - ./configure --enable-plugin=/home/dfs/Archive/PPP/ppp-2.4.0.pppoe4-patched-dfs - - licensed-only: -- $(MAKE) -C licensed-only all VERSION=$(VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION) -+ $(MAKE) -C licensed-only all VERSION=$(VERSION) - - l2tp: libevent/libevent.a - $(MAKE) -C l2tp all diff --git a/libre/rp-pppoe-libre/rp-pppoe.install b/libre/rp-pppoe-libre/rp-pppoe.install deleted file mode 100644 index 1d4bccce2..000000000 --- a/libre/rp-pppoe-libre/rp-pppoe.install +++ /dev/null @@ -1,12 +0,0 @@ -#arg 1: the new package version -post_install() { -echo ">>> The kernel-mode plugin has a new place." -echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so" -echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf" -} - -# arg 1: the new package version -# arg 2: the old package version -post_upgrade() { - post_install $1 -} diff --git a/libre/rp-pppoe/PKGBUILD b/libre/rp-pppoe/PKGBUILD new file mode 100644 index 000000000..218591511 --- /dev/null +++ b/libre/rp-pppoe/PKGBUILD @@ -0,0 +1,52 @@ +# $Id: PKGBUILD 220603 2014-08-23 13:00:49Z heftig $ +# Maintainer (Arch): Daniel Isenmann +# Contributor (Arch): orelien +# Maintainer: André Silva + +pkgname=rp-pppoe +pkgver=3.11 +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.7' 'sh' 'net-tools') +backup=(etc/ppp/pppoe.conf etc/ppp/firewall-standalone etc/ppp/firewall-masq + etc/ppp/pppoe-server-options) +options=('!makeflags') +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 + libre.patch) + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + ## Adding patch to remove nonfree software recommendation (ServPoET) + patch -Np1 -i "$srcdir/libre.patch" + + cd "$srcdir/$pkgname-$pkgver/src" + patch -Np2 -i ../../kmode.patch +} + +build() { + 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" + make PLUGIN_DIR="/usr/lib/rp-pppoe" DESTDIR="$pkgdir" install + + #install -Dm755 "$srcdir/adsl" "$pkgdir/etc/rc.d/adsl" + install -Dm644 "$srcdir/adsl.service" "$pkgdir/usr/lib/systemd/system/adsl.service" +} +md5sums=('13b5900c56bd602df6cc526e5e520722' + 'SKIP' + '926b00aa2a0c0d3a21970acde9695e47' + 'd38a903a247d689ff0323d7b6caa1c6b' + '3c53d550ac408608abb0b6cd6b76b6c2') diff --git a/libre/rp-pppoe/adsl b/libre/rp-pppoe/adsl new file mode 100644 index 000000000..33bd91839 --- /dev/null +++ b/libre/rp-pppoe/adsl @@ -0,0 +1,35 @@ +#!/bin/bash + +. /etc/rc.conf +. /etc/rc.d/functions + +case "$1" in + start) + stat_busy "Starting ADSL Connection" + /usr/sbin/pppoe-start &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + add_daemon adsl + stat_done + fi + ;; + stop) + stat_busy "Stopping ADSL Connection" + /usr/sbin/pppoe-stop &>/dev/null + if [ $? -gt 0 ]; then + stat_fail + else + rm_daemon adsl + stat_done + fi + ;; + restart) + $0 stop + sleep 1 + $0 start + ;; + *) + echo "usage: $0 {start|stop|restart}" +esac +exit 0 diff --git a/libre/rp-pppoe/adsl.service b/libre/rp-pppoe/adsl.service new file mode 100644 index 000000000..85ff49287 --- /dev/null +++ b/libre/rp-pppoe/adsl.service @@ -0,0 +1,10 @@ +[Unit] +Description=ADSL Daemon + +[Service] +Type=forking +ExecStart=/usr/bin/pppoe-start +ExecStop=/usr/bin/pppoe-stop + +[Install] +WantedBy=multi-user.target diff --git a/libre/rp-pppoe/kmode.patch b/libre/rp-pppoe/kmode.patch new file mode 100644 index 000000000..37eef58f7 --- /dev/null +++ b/libre/rp-pppoe/kmode.patch @@ -0,0 +1,19 @@ +diff -up rp-pppoe-3.11/src/configure.orig rp-pppoe-3.11/src/configure +--- rp-pppoe-3.11/src/configure.orig 2012-08-17 12:31:25.000000000 -0600 ++++ rp-pppoe-3.11/src/configure 2013-02-11 14:23:05.000000000 -0700 +@@ -3679,6 +3679,7 @@ do : + #include + #include + #include ++#include + + " + if test "x$ac_cv_header_linux_if_pppox_h" = x""yes; then : +@@ -4525,6 +4526,7 @@ else + #include + #include + #include ++#include + #include + int main() + { diff --git a/libre/rp-pppoe/libre.patch b/libre/rp-pppoe/libre.patch new file mode 100644 index 000000000..9cf16d7d7 --- /dev/null +++ b/libre/rp-pppoe/libre.patch @@ -0,0 +1,110 @@ +diff -Nur rp-pppoe-3.11.orig/rp-pppoe.spec rp-pppoe-3.11/rp-pppoe.spec +--- rp-pppoe-3.11.orig/rp-pppoe.spec 2012-08-17 15:31:25.000000000 -0300 ++++ rp-pppoe-3.11/rp-pppoe.spec 2012-10-05 01:42:29.964508454 -0300 +@@ -55,7 +55,7 @@ + + %files + %defattr(-,root,root) +-%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README SERVPOET ++%doc doc/CHANGES doc/HOW-TO-CONNECT doc/LICENSE doc/KERNEL-MODE-PPPOE README + %config(noreplace) /etc/ppp/pppoe.conf + %config(noreplace) /etc/ppp/pppoe-server-options + %config(noreplace) /etc/ppp/firewall-masq +diff -Nur rp-pppoe-3.11.orig/SERVPOET /dev/null +--- rp-pppoe-3.11.orig/SERVPOET 2012-08-17 15:31:25.000000000 -0300 ++++ /dev/null 2012-10-05 01:27:08.580078512 -0300 +@@ -1,18 +0,0 @@ +-# LIC: GPL +- +-ServPoET +--------- +- +-ServPoET is a commercial version of the PPPoE server. While everything +-you received in this package is licensed under the GNU General Public +-License, ServPoET is not free software and is licensed under a traditional +-commercial license. +- +-ServPoET features RADIUS support, support for different realms, +-real-time server status reporting and a friendly curses-based GUI for +-administration. For information on ServPoET: +- +-Contact Fine Point Technologies, Inc. (http://www.finepoint.com/) +- +--- +-David F. Skoll +diff -Nur rp-pppoe-3.11.orig/src/Makefile.in rp-pppoe-3.11/src/Makefile.in +--- rp-pppoe-3.11.orig/src/Makefile.in 2012-08-17 15:31:25.000000000 -0300 ++++ rp-pppoe-3.11/src/Makefile.in 2012-10-05 01:46:13.121336619 -0300 +@@ -44,9 +44,6 @@ + PPPOE_PATH=$(sbindir)/pppoe + PPPD_PATH=@PPPD@ + +-# Include ServPoET version if we're building for ServPoET +-@LIC_MAKEFILE_INCLUDE@ +- + # Kernel-mode plugin gets installed here. + PLUGIN_DIR=/etc/ppp/plugins + PLUGIN_PATH=$(PLUGIN_DIR)/rp-pppoe.so +@@ -152,7 +149,6 @@ + $(install) -m 644 ../doc/HOW-TO-CONNECT $(DESTDIR)$(docdir) + $(install) -m 644 ../doc/LICENSE $(DESTDIR)$(docdir) + $(install) -m 644 ../README $(DESTDIR)$(docdir) +- $(install) -m 644 ../SERVPOET $(DESTDIR)$(docdir) + $(install) -m 644 ../configs/pap-secrets $(DESTDIR)$(docdir) + -mkdir -p $(DESTDIR)$(mandir)/man8 + for i in $(TARGETS) ; do \ +@@ -210,25 +206,15 @@ + @echo "" + @echo "Type 'pppoe-setup' to configure the software." + +-servpoet-tgz: distro-servpoet +- cd .. && tar cvf servpoet-$(VERSION)$(BETA).tar servpoet-$(VERSION)$(BETA) +- gzip -f -v -9 ../servpoet-$(VERSION)$(BETA).tar +- rm -rf ../servpoet-$(VERSION)$(BETA) +- + tgz: distro + cd .. && tar cvf rp-pppoe-$(VERSION)$(BETA).tar rp-pppoe-$(VERSION)$(BETA) + gzip -f -v -9 ../rp-pppoe-$(VERSION)$(BETA).tar + rm -rf ../rp-pppoe-$(VERSION)$(BETA) + +-distro-servpoet: distro +- cp ../servpoet.spec ../rp-pppoe-$(VERSION)$(BETA) +- $(MAKE) -C licensed-only distro VERSION=$(VERSION) BETA=$(BETA) +- mv ../rp-pppoe-$(VERSION)$(BETA) ../servpoet-$(VERSION)$(BETA) +- + distro: + rm -rf ../rp-pppoe-$(VERSION)$(BETA) + mkdir ../rp-pppoe-$(VERSION)$(BETA) +- for i in README SERVPOET go go-gui rp-pppoe.spec ; do \ ++ for i in README go go-gui rp-pppoe.spec ; do \ + cp ../$$i ../rp-pppoe-$(VERSION)$(BETA) || exit 1; \ + done + mkdir ../rp-pppoe-$(VERSION)$(BETA)/gui +@@ -286,10 +272,6 @@ + /usr/src/redhat/RPMS/i386/rp-pppoe-$(VERSION)-1.i386.rpm \ + /usr/src/redhat/RPMS/i386/rp-pppoe-gui-$(VERSION)-1.i386.rpm + +-servpoet-rpms: servpoet-tgz +- cp ../servpoet-$(VERSION).tar.gz /usr/src/redhat/SOURCES +- cd .. && rpm -ba servpoet.spec +- + clean: + rm -f *.o pppoe-relay pppoe pppoe-sniff pppoe-server core rp-pppoe.so plugin/*.o plugin/libplugin.a *~ + test -f licensed-only/Makefile && $(MAKE) -C licensed-only clean || true +@@ -304,15 +286,13 @@ + update-version: + sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec + sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/rp-pppoe-$(VERSION).tar.gz+' ../rp-pppoe.spec > ../rp-pppoe.spec.new && mv ../rp-pppoe.spec.new ../rp-pppoe.spec +- test -f ../servpoet.spec && sed -e 's/^Version: .*$$/Version: $(VERSION)/' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true +- test -f ../servpoet.spec && sed -e 's+^Source: .*$$+Source: http://www.roaringpenguin.com/pppoe/servpoet-$(VERSION).tar.gz+' ../servpoet.spec > ../servpoet.spec.new && mv ../servpoet.spec.new ../servpoet.spec || true + + # Convenience target for David! Don't try to use this one. + km: + ./configure --enable-plugin=/home/dfs/Archive/PPP/ppp-2.4.0.pppoe4-patched-dfs + + licensed-only: +- $(MAKE) -C licensed-only all VERSION=$(VERSION) SERVPOET_VERSION=$(SERVPOET_VERSION) ++ $(MAKE) -C licensed-only all VERSION=$(VERSION) + + l2tp: libevent/libevent.a + $(MAKE) -C l2tp all diff --git a/libre/rp-pppoe/rp-pppoe.install b/libre/rp-pppoe/rp-pppoe.install new file mode 100644 index 000000000..1d4bccce2 --- /dev/null +++ b/libre/rp-pppoe/rp-pppoe.install @@ -0,0 +1,12 @@ +#arg 1: the new package version +post_install() { +echo ">>> The kernel-mode plugin has a new place." +echo ">>> It's now located under /usr/lib/rp-pppoe/rp-pppoe.so" +echo ">>> Change LINUX_PLUGIN to the new path in your /etc/ppp/pppoe.conf" +} + +# arg 1: the new package version +# arg 2: the old package version +post_upgrade() { + post_install $1 +} -- cgit v1.2.3 From 906e0f541f0910bf438d750956e508cc8e64d9aa Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 21:05:23 -0300 Subject: qupzilla: remove libre suffix and add complex pkgrel --- libre/qupzilla-libre/PKGBUILD | 93 ----------------------- libre/qupzilla-libre/qupzilla.install | 12 --- libre/qupzilla-libre/searchenginesmanager.cpp.sed | 19 ----- libre/qupzilla-libre/speeddial.cpp.sed | 4 - libre/qupzilla-libre/start.html.sed | 1 - libre/qupzilla/PKGBUILD | 92 ++++++++++++++++++++++ libre/qupzilla/qupzilla.install | 12 +++ libre/qupzilla/searchenginesmanager.cpp.sed | 19 +++++ libre/qupzilla/speeddial.cpp.sed | 4 + libre/qupzilla/start.html.sed | 1 + 10 files changed, 128 insertions(+), 129 deletions(-) delete mode 100644 libre/qupzilla-libre/PKGBUILD delete mode 100644 libre/qupzilla-libre/qupzilla.install delete mode 100644 libre/qupzilla-libre/searchenginesmanager.cpp.sed delete mode 100644 libre/qupzilla-libre/speeddial.cpp.sed delete mode 100644 libre/qupzilla-libre/start.html.sed create mode 100644 libre/qupzilla/PKGBUILD create mode 100644 libre/qupzilla/qupzilla.install create mode 100644 libre/qupzilla/searchenginesmanager.cpp.sed create mode 100644 libre/qupzilla/speeddial.cpp.sed create mode 100644 libre/qupzilla/start.html.sed (limited to 'libre') diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD deleted file mode 100644 index b26cbfcc9..000000000 --- a/libre/qupzilla-libre/PKGBUILD +++ /dev/null @@ -1,93 +0,0 @@ -# $Id: PKGBUILD 111093 2014-05-13 15:31:43Z speps $ -# Maintainer (Arch): speps -# Maintainer: André Silva - -_pkgbase=qupzilla -pkgbase=qupzilla-libre -pkgname=(qupzilla-libre qupzilla-libre-qt4) -pkgver=1.6.6 -pkgrel=1 -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" - 'searchenginesmanager.cpp.sed' - 'speeddial.cpp.sed' - 'start.html.sed') -noextract=("$_pkgbase-$pkgver.tar.gz") -md5sums=('daad78e47a0956dcc99c0cba9ae6e462' - '1d926e97a5b287d40fb695f6516f2a06' - '0f166fa102af975b3b8ac030d477e9b8' - '77120a0c39ba8254e5b2c273910f029a') - -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 - - # configure - export USE_WEBGL=true \ - QUPZILLA_PREFIX=/usr/ \ - KDE_INTEGRATION=true \ - GNOME_INTEGRATION=true - - # remove Google and Youtube support, replaces it to DDG HTML - cd qt4 - sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp - sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp - sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html - - cd ../qt5 - sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp - sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp - sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html -} - -build() { - cd qt4 - qmake-qt4 - make - - cd ../qt5 - qmake - make -} - -package_qupzilla-libre() { - 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') - - cd qt5 - make INSTALL_ROOT="$pkgdir/" install - - # zsh completion - install -Dm644 linux/completion/_$_pkgbase \ - "$pkgdir/usr/share/zsh/site-functions/_$_pkgbase" -} - -package_qupzilla-libre-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') - - cd qt4 - make INSTALL_ROOT="$pkgdir/" install - - # zsh completion - 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-libre/qupzilla.install deleted file mode 100644 index 029294d67..000000000 --- a/libre/qupzilla-libre/qupzilla.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - xdg-icon-resource forceupdate --theme hicolor 2> /dev/null - update-desktop-database -q -} - -post_upgrade() { - post_install -} - -post_remove() { - post_install -} diff --git a/libre/qupzilla-libre/searchenginesmanager.cpp.sed b/libre/qupzilla-libre/searchenginesmanager.cpp.sed deleted file mode 100644 index 76011d058..000000000 --- a/libre/qupzilla-libre/searchenginesmanager.cpp.sed +++ /dev/null @@ -1,19 +0,0 @@ -s|DuckDuckGo|DuckDuckGo HTML| -\|m_startingEngineName = settings[.]value("activeEngine", "Google")[.]toString();| s|Google|DuckDuckGo HTML| -\|m_defaultEngineName = settings[.]value("DefaultEngine", "Google")[.]toString();| s|Google|DuckDuckGo HTML| -\|Engine google;|d -\|google[.]name = "Google";|d -\|google[.]icon = QIcon(":icons/sites/google[.]png");|d -\|google[.]url = "http://www[.]google[.]com/search?client=qupzilla[&]q=%s";|d -\|google[.]shortcut = "g";|d -\|google[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?output=firefox[&]q=%s";|d -\|Engine yt;|d -\|yt[.]name = "YouTube";|d -\|yt[.]icon = QIcon(":/icons/sites/youtube.png");|d -\|yt[.]url = "http://www[.]youtube[.]com/results?search_query=%s[&]search=Search";|d -\|yt[.]shortcut = "yt";|d -\|yt[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?ds=yt[&]output=firefox[&]q=%s";|d -\|https://duckduckgo[.]com/?q=%s[&]t=qupzilla| s|duckduckgo[.]com|duckduckgo.com/html| -\|addEngine(google);|d -\|addEngine(yt);|d -\|m_defaultEngine = google;| s|google|duck| diff --git a/libre/qupzilla-libre/speeddial.cpp.sed b/libre/qupzilla-libre/speeddial.cpp.sed deleted file mode 100644 index b8f591e87..000000000 --- a/libre/qupzilla-libre/speeddial.cpp.sed +++ /dev/null @@ -1,4 +0,0 @@ -s|www[.]google[.]com|duckduckgo.com/html| -s|Google|DuckDuckGo HTML| -\#"url:[\]"https://github[.]com/QupZilla/qupzilla[\]"|title:[\]"QupZilla GitHub[\]";"# s#$#;# -\#"url:[\]"https://duckduckgo[.]com[\]"|title:[\]"DuckDuckGo[\]";";#d diff --git a/libre/qupzilla-libre/start.html.sed b/libre/qupzilla-libre/start.html.sed deleted file mode 100644 index f59a65979..000000000 --- a/libre/qupzilla-libre/start.html.sed +++ /dev/null @@ -1 +0,0 @@ -\|
| s|duckduckgo[.]com|duckduckgo.com/html| diff --git a/libre/qupzilla/PKGBUILD b/libre/qupzilla/PKGBUILD new file mode 100644 index 000000000..fd7c14ac0 --- /dev/null +++ b/libre/qupzilla/PKGBUILD @@ -0,0 +1,92 @@ +# $Id: PKGBUILD 111093 2014-05-13 15:31:43Z speps $ +# Maintainer (Arch): speps +# Maintainer: André Silva + +pkgbase=qupzilla +pkgname=(qupzilla qupzilla-qt4) +pkgver=1.6.6 +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" + 'searchenginesmanager.cpp.sed' + 'speeddial.cpp.sed' + 'start.html.sed') +noextract=("$pkgbase-$pkgver.tar.gz") +md5sums=('daad78e47a0956dcc99c0cba9ae6e462' + '1d926e97a5b287d40fb695f6516f2a06' + '0f166fa102af975b3b8ac030d477e9b8' + '77120a0c39ba8254e5b2c273910f029a') + +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 + + # configure + export USE_WEBGL=true \ + QUPZILLA_PREFIX=/usr/ \ + KDE_INTEGRATION=true \ + GNOME_INTEGRATION=true + + # remove Google and Youtube support, replaces it to DDG HTML + cd qt4 + sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp + sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp + sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html + + cd ../qt5 + sed -i -f $srcdir/searchenginesmanager.cpp.sed src/lib/opensearch/searchenginesmanager.cpp + sed -i -f $srcdir/speeddial.cpp.sed src/lib/plugins/speeddial.cpp + sed -i -f $srcdir/start.html.sed src/lib/data/html/start.html +} + +build() { + cd qt4 + qmake-qt4 + make + + cd ../qt5 + qmake + make +} + +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') + 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" +} + +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') + 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" +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/qupzilla/qupzilla.install b/libre/qupzilla/qupzilla.install new file mode 100644 index 000000000..029294d67 --- /dev/null +++ b/libre/qupzilla/qupzilla.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor 2> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/libre/qupzilla/searchenginesmanager.cpp.sed b/libre/qupzilla/searchenginesmanager.cpp.sed new file mode 100644 index 000000000..76011d058 --- /dev/null +++ b/libre/qupzilla/searchenginesmanager.cpp.sed @@ -0,0 +1,19 @@ +s|DuckDuckGo|DuckDuckGo HTML| +\|m_startingEngineName = settings[.]value("activeEngine", "Google")[.]toString();| s|Google|DuckDuckGo HTML| +\|m_defaultEngineName = settings[.]value("DefaultEngine", "Google")[.]toString();| s|Google|DuckDuckGo HTML| +\|Engine google;|d +\|google[.]name = "Google";|d +\|google[.]icon = QIcon(":icons/sites/google[.]png");|d +\|google[.]url = "http://www[.]google[.]com/search?client=qupzilla[&]q=%s";|d +\|google[.]shortcut = "g";|d +\|google[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?output=firefox[&]q=%s";|d +\|Engine yt;|d +\|yt[.]name = "YouTube";|d +\|yt[.]icon = QIcon(":/icons/sites/youtube.png");|d +\|yt[.]url = "http://www[.]youtube[.]com/results?search_query=%s[&]search=Search";|d +\|yt[.]shortcut = "yt";|d +\|yt[.]suggestionsUrl = "http://suggestqueries[.]google[.]com/complete/search?ds=yt[&]output=firefox[&]q=%s";|d +\|https://duckduckgo[.]com/?q=%s[&]t=qupzilla| s|duckduckgo[.]com|duckduckgo.com/html| +\|addEngine(google);|d +\|addEngine(yt);|d +\|m_defaultEngine = google;| s|google|duck| diff --git a/libre/qupzilla/speeddial.cpp.sed b/libre/qupzilla/speeddial.cpp.sed new file mode 100644 index 000000000..b8f591e87 --- /dev/null +++ b/libre/qupzilla/speeddial.cpp.sed @@ -0,0 +1,4 @@ +s|www[.]google[.]com|duckduckgo.com/html| +s|Google|DuckDuckGo HTML| +\#"url:[\]"https://github[.]com/QupZilla/qupzilla[\]"|title:[\]"QupZilla GitHub[\]";"# s#$#;# +\#"url:[\]"https://duckduckgo[.]com[\]"|title:[\]"DuckDuckGo[\]";";#d diff --git a/libre/qupzilla/start.html.sed b/libre/qupzilla/start.html.sed new file mode 100644 index 000000000..f59a65979 --- /dev/null +++ b/libre/qupzilla/start.html.sed @@ -0,0 +1 @@ +\|| s|duckduckgo[.]com|duckduckgo.com/html| -- cgit v1.2.3