From e83db65fe5398fe5da9eb893626238f463474535 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 23 Dec 2013 09:27:27 -0200 Subject: lirc-libre: fix provides on lirc-libre-utils --- libre/lirc-libre/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index 80797ffe5..c06de343e 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -106,7 +106,7 @@ package_lirc-libre-utils() { options=('strip') replaces=('lirc-utils' 'lirc-utils-libre') conflicts=('lirc-utils' 'lirc-utils-libre') - provides=("lirc-utils=$pkgver" "lirc-utils-libre=$pkgver") + provides=("lirc-utils=$pkgver" 'lirc-utils-libre') install=lirc-utils.install cd "${srcdir}/lirc-${pkgver}" -- cgit v1.2.3-2-g168b From 6c96ad0ab3222240938dd30a9667b088e29294ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 23 Dec 2013 09:28:21 -0200 Subject: qupzilla-libre: add noextract line and fix syntax on PKGBUILD --- libre/qupzilla-libre/PKGBUILD | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD index fbd577a90..dcc4e13a8 100644 --- a/libre/qupzilla-libre/PKGBUILD +++ b/libre/qupzilla-libre/PKGBUILD @@ -16,6 +16,7 @@ source=("$_pkgbase-$pkgver.tar.gz::https://github.com/QupZilla/$_pkgbase/tarball 'searchenginesmanager.cpp.sed' 'speeddial.cpp.sed' 'start.html.sed') +noextract=("$_pkgbase-$pkgver.tar.gz") install="$_pkgbase.install" md5sums=('cfbf5cd23d184275c389c79a39a28631' '1d926e97a5b287d40fb695f6516f2a06' @@ -57,9 +58,9 @@ build() { package_qupzilla-libre() { pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers" depends=('qtwebkit' 'hunspell') - replaces=qupzilla - conflicts=qupzilla provides=qupzilla=$pkgver + conflicts=qupzilla + replaces=qupzilla cd qt4 make INSTALL_ROOT="$pkgdir/" install @@ -72,9 +73,9 @@ package_qupzilla-libre() { package_qupzilla-libre-qt5() { pkgdesc="Cross-platform QtWebKit browser (Qt5), without non-privacy search providers" depends=('qt5-webkit' 'qt5-script' 'hunspell' 'desktop-file-utils' 'hicolor-icon-theme') - provides=('qupzilla-qt5' 'qupzilla-libre') + provides=("qupzilla-qt5=$pkgver" 'qupzilla-libre') conflicts=('qupzilla-qt5' 'qupzilla-libre') - provides=qupzilla-qt5=$pkgver + replaces=qupzilla-qt5 cd qt5 make INSTALL_ROOT="$pkgdir/" install -- cgit v1.2.3-2-g168b From 10b1f2f79f47d736979d32f1b5700fa118867ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Fabian=20Silva=20Delgado?= Date: Mon, 23 Dec 2013 09:46:31 -0200 Subject: kdenetwork-kopete-libre-nonprism: fix libre-nonprism.patch --- nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD | 3 ++- .../libre-nonprism.patch | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD index cd932ac3e..86a91508f 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD +++ b/nonprism/kdenetwork-kopete-libre-nonprism/PKGBUILD @@ -20,7 +20,8 @@ conflicts=$_pkgname provides=$_pkgname=$pkgver source=("http://download.kde.org/stable/${pkgver}/src/kopete-${pkgver}.tar.xz" 'libre-nonprism.patch') -sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875') +sha1sums=('c1ef611b27079388e48e558a65e2de80db93d875' + 'ddde6ed0b6f281512dc12cb80f712f33c6932c92') prepare() { cd kopete-${pkgver} diff --git a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch index b6915cbb5..6d73766cc 100644 --- a/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch +++ b/nonprism/kdenetwork-kopete-libre-nonprism/libre-nonprism.patch @@ -1,8 +1,8 @@ diff --git a/doc/index.docbook b/doc/index.docbook -index 1576dc9..daf7170 100644 +index b55fd88..416de49 100644 --- a/doc/index.docbook +++ b/doc/index.docbook -@@ -20,7 +20,6 @@ +@@ -24,7 +24,6 @@ @@ -10,7 +10,7 @@ index 1576dc9..daf7170 100644 ]>