From 115eec400e26fb01257183953bfccf0afda45dac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Thu, 4 Sep 2014 23:44:28 -0300 Subject: midori{,-gtk3}: remove libre suffix and add complex pkgrel --- libre/midori-gtk3/PKGBUILD | 62 +++++++++++++++++++++++++++++++++ libre/midori-gtk3/midori.install | 14 ++++++++ libre/midori-libre-gtk3/PKGBUILD | 63 ---------------------------------- libre/midori-libre-gtk3/midori.install | 14 -------- libre/midori-libre/PKGBUILD | 58 ------------------------------- libre/midori-libre/midori.install | 14 -------- libre/midori/PKGBUILD | 56 ++++++++++++++++++++++++++++++ libre/midori/midori.install | 14 ++++++++ 8 files changed, 146 insertions(+), 149 deletions(-) create mode 100644 libre/midori-gtk3/PKGBUILD create mode 100644 libre/midori-gtk3/midori.install delete mode 100644 libre/midori-libre-gtk3/PKGBUILD delete mode 100644 libre/midori-libre-gtk3/midori.install delete mode 100644 libre/midori-libre/PKGBUILD delete mode 100644 libre/midori-libre/midori.install create mode 100644 libre/midori/PKGBUILD create mode 100644 libre/midori/midori.install diff --git a/libre/midori-gtk3/PKGBUILD b/libre/midori-gtk3/PKGBUILD new file mode 100644 index 000000000..e4bac6b96 --- /dev/null +++ b/libre/midori-gtk3/PKGBUILD @@ -0,0 +1,62 @@ +# $Id: PKGBUILD 108941 2014-04-07 21:25:27Z arodseth $ +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Bartłomiej Piotrowski +# Contributor (Arch): Andreas Radke +# Contributor (Arch): rabyte +# Contributor (Arch): Johannes Krampf +# Contributor (Arch): Bartłomiej Piotrowski +# Maintainer: André Silva + +pkgname=midori-gtk3 +pkgver=0.5.8 +pkgrel=1.parabola1 +pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers' +arch=('x86_64' 'i686' 'mips64el') +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') +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=('af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381') + +prepare() { + # remove non-privacy search providers + 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() { + mkdir -p build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DUSE_GTK3=1 + make +} + +package() { + make -C build DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/midori-gtk3/midori.install b/libre/midori-gtk3/midori.install new file mode 100644 index 000000000..e6af79c5f --- /dev/null +++ b/libre/midori-gtk3/midori.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/midori-libre-gtk3/PKGBUILD b/libre/midori-libre-gtk3/PKGBUILD deleted file mode 100644 index 938454573..000000000 --- a/libre/midori-libre-gtk3/PKGBUILD +++ /dev/null @@ -1,63 +0,0 @@ -# $Id: PKGBUILD 108941 2014-04-07 21:25:27Z arodseth $ -# Maintainer (Arch): Alexander Rødseth -# Contributor (Arch): Bartłomiej Piotrowski -# Contributor (Arch): Andreas Radke -# Contributor (Arch): rabyte -# Contributor (Arch): Johannes Krampf -# Contributor (Arch): Bartłomiej Piotrowski -# Maintainer: André Silva - -_pkgname=midori-gtk3 -pkgname=midori-libre-gtk3 -pkgver=0.5.8 -pkgrel=1 -pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers' -arch=('x86_64' 'i686' 'mips64el') -url='http://www.midori-browser.org/' -license=('LGPL2.1') -install='midori.install' -replaces=("$_pkgname" "$_pkgname-libre") -conflicts=('midori-libre' "$_pkgname" "$_pkgname-libre") -provides=('midori-libre' "$_pkgname=$pkgver" "$_pkgname-libre") -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') -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=('af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381') - -prepare() { - # remove non-privacy search providers - 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() { - mkdir -p build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DUSE_GTK3=1 - make -} - -package() { - make -C build DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/midori-libre-gtk3/midori.install b/libre/midori-libre-gtk3/midori.install deleted file mode 100644 index e6af79c5f..000000000 --- a/libre/midori-libre-gtk3/midori.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -f -q -t usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/midori-libre/PKGBUILD b/libre/midori-libre/PKGBUILD deleted file mode 100644 index 9dd09b6dc..000000000 --- a/libre/midori-libre/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 108939 2014-04-07 21:17:17Z arodseth $ -# Maintainer (Arch): Alexander Rødseth -# Contributor (Arch): Andreas Radke -# Contributor (Arch): rabyte -# Contributor (Arch): Johannes Krampf -# Contributor (Arch): Bartłomiej Piotrowski -# Maintainer: André Silva - -_pkgname=midori -pkgname=midori-libre -pkgver=0.5.8 -pkgrel=1 -pkgdesc='Lightweight web browser (GTK2), without non-privacy search providers' -arch=('x86_64' 'i686') -url='http://www.midori-browser.org/' -license=('LGPL2.1') -install='midori.install' -replaces=($_pkgname) -conflicts=($_pkgname) -provides=($_pkgname=$pkgver) -depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique') -makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake') -optdepends=('aria2: download utility') -options=('!emptydirs') -source=("http://www.midori-browser.org/downloads/${_pkgname}_${pkgver}_all_.tar.bz2") -sha256sums=('af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381') - -prepare() { - # remove non-privacy search providers - 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() { - mkdir -p build - cd build - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib - make -} - -package() { - make -C build DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/midori-libre/midori.install b/libre/midori-libre/midori.install deleted file mode 100644 index e6af79c5f..000000000 --- a/libre/midori-libre/midori.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - update-desktop-database -q - gtk-update-icon-cache -f -q -t usr/share/icons/hicolor -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/midori/PKGBUILD b/libre/midori/PKGBUILD new file mode 100644 index 000000000..e91a69716 --- /dev/null +++ b/libre/midori/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 108939 2014-04-07 21:17:17Z arodseth $ +# Maintainer (Arch): Alexander Rødseth +# Contributor (Arch): Andreas Radke +# Contributor (Arch): rabyte +# Contributor (Arch): Johannes Krampf +# Contributor (Arch): Bartłomiej Piotrowski +# Maintainer: André Silva + +pkgname=midori +pkgver=0.5.8 +pkgrel=1.parabola1 +pkgdesc='Lightweight web browser (GTK2), without non-privacy search providers' +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') +makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg' 'cmake') +optdepends=('aria2: download utility') +options=('!emptydirs') +source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2") +sha256sums=('af19135fd4c4b04345df4d3592e7939c20f9b40eaca24550e6cb619751aa9381') + +prepare() { + # remove non-privacy search providers + 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() { + mkdir -p build + cd build + cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib + make +} + +package() { + make -C build DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/midori/midori.install b/libre/midori/midori.install new file mode 100644 index 000000000..e6af79c5f --- /dev/null +++ b/libre/midori/midori.install @@ -0,0 +1,14 @@ +post_install() { + update-desktop-database -q + gtk-update-icon-cache -f -q -t usr/share/icons/hicolor +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-2-g168b