From 906e0f541f0910bf438d750956e508cc8e64d9aa Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
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

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 <speps at aur dot archlinux dot org>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-
-_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 @@
-\|<form action="https://duckduckgo[.]com/" method="GET">| 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 <speps at aur dot archlinux dot org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+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 @@
+\|<form action="https://duckduckgo[.]com/" method="GET">| s|duckduckgo[.]com|duckduckgo.com/html|
-- 
cgit v1.2.3