diff options
| -rw-r--r-- | libre/midori-gtk2/PKGBUILD | 62 | ||||
| -rw-r--r-- | libre/midori-gtk2/midori.install (renamed from libre/midori-gtk3/midori.install) | 0 | ||||
| -rw-r--r-- | libre/midori-gtk3/PKGBUILD | 69 | ||||
| -rw-r--r-- | libre/midori/PKGBUILD | 42 |
4 files changed, 87 insertions, 86 deletions
diff --git a/libre/midori-gtk2/PKGBUILD b/libre/midori-gtk2/PKGBUILD new file mode 100644 index 000000000..7a7559d4c --- /dev/null +++ b/libre/midori-gtk2/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 139371 2015-09-06 21:13:29Z arodseth $ +# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com> +# Contributor (Arch): Andreas Radke <andyrtr@archlinux.org> +# Contributor (Arch): rabyte <rabyte.at.gmail.dot.com> +# Contributor (Arch): Johannes Krampf <wuischke.at.amule.dot.org> +# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> +# Contributor (Arch): Andrew Gregory <andrew.gregory.8@gmail.com> +# Maintainer: André Silva <emulatorman@parabola.nu> + +pkgname=midori-gtk2 +pkgver=0.5.11 +pkgrel=1.parabola1 +pkgdesc='Lightweight web browser (GTK2), without non-privacy search engines' +arch=('x86_64' 'i686') +url='http://www.midori-browser.org/' +license=('LGPL2.1') +install='midori.install' +conflicts=('midori') +provides=('midori') +depends=('webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique' 'gcr' 'libzeitgeist' 'zeitgeist') +makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr' 'libzeitgeist' 'zeitgeist') +optdepends=('aria2: download utility') +options=('!emptydirs') +# options=('!emptydirs' '!strip') # useful for debbuging see: https://labs.parabola.nu/issues/515 +source=("http://www.midori-browser.org/downloads/${pkgname/-gtk2}_${pkgver}_all_.tar.bz2") +sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d') + +prepare() { + cd "${pkgname/-gtk2}-$pkgver" + # remove non-privacy search engines + sed -i 's|Duck Duck Go|DuckDuckGo HTML| + s|duckduckgo[.]com|duckduckgo.com/html| + \|Yahoo|d + \|name=Yahoo|d + \|text=Yahoo Web Search|d + \|uri=http://search[.]yahoo[.]com/search?p=|d + \|token=y|d + \|Google|d + \|name=Google|d + \|text=Web Search|d + \|uri=http://www[.]google[.]com/search?q=%s|d + \|token=g|d + \|Localize text or URL|d + \|translate[.]google[.]com/?q=|d + ' config/search +} + +build() { + cd "${pkgname/-gtk2}-$pkgver" + + mkdir -p build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -G Ninja + ninja +} + +package() { + DESTDIR="$pkgdir" ninja -C "${pkgname/-gtk2}-$pkgver/build" install +} + +# getver: -u 2 midori-browser.org/download/source +# vim:set ts=2 sw=2 et: diff --git a/libre/midori-gtk3/midori.install b/libre/midori-gtk2/midori.install index e6af79c5f..e6af79c5f 100644 --- a/libre/midori-gtk3/midori.install +++ b/libre/midori-gtk2/midori.install diff --git a/libre/midori-gtk3/PKGBUILD b/libre/midori-gtk3/PKGBUILD deleted file mode 100644 index 36ed4f4ee..000000000 --- a/libre/midori-gtk3/PKGBUILD +++ /dev/null @@ -1,69 +0,0 @@ -# $Id: PKGBUILD 131941 2015-04-22 12:54:39Z arodseth $ -# Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com> -# Contributor (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl> -# Contributor (Arch): Andreas Radke <andyrtr@archlinux.org> -# Contributor (Arch): rabyte <rabyte.at.gmail.dot.com> -# Contributor (Arch): Johannes Krampf <wuischke.at.amule.dot.org> -# Contributor (Arch): Bartłomiej Piotrowski <barthalion@gmail.com> -# Maintainer: André Silva <emulatorman@parabola.nu> - -pkgname=midori-gtk3 -pkgver=0.5.10 -pkgrel=1.parabola2 -pkgdesc='Lightweight web browser (GTK3), without non-privacy search engines' -arch=('x86_64' 'i686') -url='http://www.midori-browser.org/' -license=('LGPL2.1') -install='midori.install' -replaces=('midori-gtk3-libre' 'midori-libre-gtk3') -conflicts=('midori' 'midori-gtk3-libre' 'midori-libre-gtk3') -provides=('midori') -depends=('libzeitgeist' 'webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') -makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr') -optdepends=('gst-plugins-base: HTML5 OGG videos support' - 'gst-plugins-good: HTML5 H264 and WebM videos support' - 'gst-libav: HTML5 H264 videos support' - 'aria2: download utility') -options=('!emptydirs') -# options=('!emptydirs' '!strip') # useful for debbuging see: https://labs.parabola.nu/issues/515 -source=("http://www.midori-browser.org/downloads/${pkgname/-gtk3}_${pkgver}_all_.tar.bz2") -sha256sums=('702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f') - -prepare() { - #cd "${pkgname/-gtk3}-$pkgver" - # remove non-privacy search engines - sed -i 's|Duck Duck Go|DuckDuckGo HTML| - s|duckduckgo[.]com|duckduckgo.com/html| - \|Yahoo|d - \|name=Yahoo|d - \|text=Yahoo Web Search|d - \|uri=http://search[.]yahoo[.]com/search?p=|d - \|token=y|d - \|Google|d - \|name=Google|d - \|text=Web Search|d - \|uri=http://www[.]google[.]com/search?q=%s|d - \|token=g|d - \|Localize text or URL|d - \|translate[.]google[.]com/?q=|d - ' config/search -} - -build() { - #cd "${pkgname/-gtk3}-$pkgver" - mkdir -p build - cd build - cmake .. \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DUSE_GTK3=1 \ - -G Ninja - ninja -} - -package() { - #DESTDIR="$pkgdir" ninja -C "${pkgname/-gtk3}-$pkgver/build" install - DESTDIR="$pkgdir" ninja -C build install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/midori/PKGBUILD b/libre/midori/PKGBUILD index a400cbcb0..e82733161 100644 --- a/libre/midori/PKGBUILD +++ b/libre/midori/PKGBUILD @@ -1,31 +1,35 @@ -# $Id: PKGBUILD 131924 2015-04-22 09:36:13Z arodseth $ +# $Id: PKGBUILD 139406 2015-09-06 22:19:51Z arodseth $ # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com> +# Contributor (Arch): Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor (Arch): Andreas Radke <andyrtr@archlinux.org> # Contributor (Arch): rabyte <rabyte.at.gmail.dot.com> # Contributor (Arch): Johannes Krampf <wuischke.at.amule.dot.org> -# Contributor (Arch): Bartłomiej Piotrowski <bpiotrowski@archlinux.org> -# Contributor (Arch): Andrew Gregory <andrew.gregory.8@gmail.com> +# Contributor (Arch): Bartłomiej Piotrowski <barthalion@gmail.com> # Maintainer: André Silva <emulatorman@parabola.nu> pkgname=midori -pkgver=0.5.10 -pkgrel=1.parabola2 -pkgdesc='Lightweight web browser (GTK2), without non-privacy search engines' +pkgver=0.5.11 +pkgrel=1.parabola1 +pkgdesc='Lightweight web browser (GTK3), without non-privacy search engines' arch=('x86_64' 'i686') url='http://www.midori-browser.org/' license=('LGPL2.1') install='midori.install' -replaces=(${pkgname}-libre) -conflicts=(${pkgname}-libre) -depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique' 'gcr') -makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr') -optdepends=('aria2: download utility') +conflicts=('midori-gtk2') +provides=('midori') +replaces=('midori-gtk3') +depends=('webkitgtk3' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr' 'libzeitgeist' 'zeitgeist') +makedepends=('pkg-config' 'bzr' 'python2' 'libxml2' 'gtk3' 'intltool' 'python2-docutils' 'libsoup' 'vala' 'librsvg' 'cmake' 'ninja' 'gcr' 'libzeitgeist' 'zeitgeist') +optdepends=('gst-plugins-base: HTML5 OGG videos support' + 'gst-plugins-good: HTML5 H264 and WebM videos support' + 'gst-libav: HTML5 H264 videos support' + 'aria2: download utility') options=('!emptydirs') source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2") -sha256sums=('702344f68d7f034866a46398e35b3c16a5a5f3e431a5d916ea5efc3eaaa3e46f') +sha256sums=('96191a96be71144ae848a409fae5a1d6d52a00e583f33122081f47ead9c49c3d') prepare() { - #cd "$pkgname-$pkgver" + cd "$pkgname-$pkgver" # remove non-privacy search engines sed -i 's|Duck Duck Go|DuckDuckGo HTML| s|duckduckgo[.]com|duckduckgo.com/html| @@ -45,16 +49,20 @@ prepare() { } build() { - #cd "$pkgname-$pkgver" + cd "$pkgname-$pkgver" mkdir -p build cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -G Ninja + cmake .. \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DUSE_GTK3=1 \ + -G Ninja ninja } package() { - #DESTDIR="$pkgdir" ninja -C "$pkgname-$pkgver/build" install - DESTDIR="$pkgdir" ninja -C build install + DESTDIR="$pkgdir" ninja -C "$pkgname-$pkgver/build" install } +# getver: -u 2 midori-browser.org/download/source # vim:set ts=2 sw=2 et: |