Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre

5 files changed, 128 insertions, 35 deletions

diff --git a/libre/liferea-libre/PKGBUILD b/libre/liferea-libre/PKGBUILD
index 3718e0fe4..0bd411f13 100644
--- a/libre/liferea-libre/PKGBUILD
+++ b/libre/liferea-libre/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 211690 2014-04-23 14:07:47Z eric $
+# $Id: PKGBUILD 220652 2014-08-26 01:15:15Z eric $
 # Maintainer (Arch): Eric Bélanger <eric@archlinux.org>
 # Contributor: bitlord
 # Contributor: André Silva <emulatorman@parabola.nu>
 
 _pkgname=liferea
 pkgname=liferea-libre
-pkgver=1.10.9
+pkgver=1.10.11
 pkgrel=1
 pkgdesc="A desktop news aggregator for online news feeds and weblogs, without nonfree suggestions"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ options=('!emptydirs')
 install=liferea.install
 source=(https://github.com/lwindolf/liferea/releases/download/v${pkgver}/liferea-${pkgver}.tar.bz2
         remove-non-free-suggestions.patch)
-sha1sums=('04ff66e4f08ad2f46563a6784c656439cda1f223'
+sha1sums=('7ff8197989f4caad5f50c6b4c18ee19699ecf70c'
           '855de60c91b5fee71c7ec88dd04b7d24a02dc0d1')
 
 build() {
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
index 21cedb2a4..70ed26c7e 100644
--- a/libre/netsurf-libre/PKGBUILD
+++ b/libre/netsurf-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 110427 2014-04-29 13:53:01Z arodseth $
+# $Id: PKGBUILD 117980 2014-08-27 19:40:10Z arodseth $
 # Maintainer (Arch): Alexander Rødseth <rodseth@gmail.com>
 # Contributor (Arch): Paulo Matias <matiasΘarchlinux-br·org>
 # Contributor (Arch): Georgij Kondratjev <smpuj@bk.ru>
@@ -8,7 +8,7 @@
 _pkgname=netsurf
 pkgname=netsurf-libre
 pkgver=3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
 arch=('x86_64' 'i686' 'mips64el')
 url='http://www.netsurf-browser.org/'
@@ -16,8 +16,8 @@ license=('MIT' 'GPL2')
 replaces=($_pkgname)
 conflicts=($_pkgname)
 provides=($_pkgname=$pkgver)
-depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.3.0' 'libdom>=0.1.0' 'js185' 'gtk2') # gtk3
-makedepends=('js185' 're2c' 'gendesk' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils')
+depends=('libmng' 'librsvg' 'libwebp' 'curl' 'lcms' 'desktop-file-utils' 'libnsbmp>=0.1.1' 'libnsgif>=0.1.1' 'libcss>=0.3.0' 'libdom>=0.1.0' 'gtk2') # gtk3
+makedepends=('re2c' 'gendesk' 'netsurf-buildsystem' 'perl-html-parser' 'nsgenbind' 'inetutils')
 install="$_pkgname.install"
 source=("netsurf.png::http://ubuntu.allmyapps.com/data/n/e/netsurf-netsurf-web-browser/icon_48x48_netsurf.png"
         "http://download.$_pkgname-browser.org/$_pkgname/releases/source/$_pkgname-$pkgver-src.tar.gz"
@@ -99,11 +99,6 @@ prepare() {
   gendesk -f --pkgname "$_pkgname" --pkgdesc "$pkgdesc" --exec 'netsurf %U' \
     --genericname 'Web Browser' --comment 'Lightweight web browser' \
     --mimetypes 'text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/geo'
-
-  # If patching the GTK3 deprecated errors by including files from
-  # /usr/include/gtk-3.0/gtk/deprecated, something like this might be useful:
-  #setconf "$_pkgname-$pkgver/Makefile.defaults" \
-  #  CFLAGS " -DGTK_COMPILATION"
 }
 
 build() {
@@ -111,9 +106,9 @@ build() {
     PREFIX=/usr \
     TARGET=gtk \
     NETSURF_USE_WEBP=YES \
-    NETSURF_USE_VIDEO=NO
-    #NETSURF_GTK_MAJOR=3 # The latest version of GTK3 has deprecated several
-                         # features that are used by NetSurf.
+    NETSURF_USE_VIDEO=NO \
+    NETSURF_USE_JS=NO \
+    NETSURF_USE_MOZJS=NO # Javascript is disabled, for now. See FS#41582
 }
 
 package() {
diff --git a/nonprism/kde-meta-nonprism/PKGBUILD b/nonprism/kde-meta-nonprism/PKGBUILD
new file mode 100644
index 000000000..71ae7d6c6
--- /dev/null
+++ b/nonprism/kde-meta-nonprism/PKGBUILD
@@ -0,0 +1,115 @@
+# $Id: PKGBUILD 208325 2014-03-21 13:57:48Z andrea $
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
+# Maintainer: André Silva <emulatorman@parabola.nu>
+
+pkgbase=kde-meta
+pkgname=('kde-meta-kdepim-nonprism'
+         'kde-meta-kdeplasma-addons-nonprism')
+pkgver=4.13
+pkgrel=3.1
+arch=('any')
+url='http://parabolagnulinux.org/'
+license=('GPL')
+groups=('kde-meta')
+
+package_kde-meta-kdepim-nonprism() {
+	pkgdesc=('Meta package for kdepim, with nonprism packages included and kdepim-blogilo removed')
+	depends=('kdepim-akonadiconsole-nonprism'
+	         'kdepim-akregator'
+	         'kdepim-console'
+	         'kdepim-kaddressbook-nonprism'
+	         'kdepim-kalarm'
+	         'kdepim-kjots-nonprism'
+	         'kdepim-kleopatra'
+	         'kdepim-kmail-nonprism'
+	         'kdepim-knode-nonprism'
+	         'kdepim-knotes-nonprism'
+	         'kdepim-kontact'
+	         'kdepim-korganizer-nonprism'
+	         'kdepim-kresources'
+	         'kdepim-ktimetracker'
+	         'kdepim-ktnef')
+	replaces=('kdepim' 'kde-meta-kdepim')
+	conflicts=('kdepim' 'kde-meta-kdepim')
+	provides=(kde-meta-kdepim=$pkgver)
+}
+
+package_kde-meta-kdeplasma-addons-nonprism() {
+	pkgdesc=('Meta package for kdeplasma-addons, without kdeplasma-addons-runners-translator')
+	depends=('kdeplasma-addons-applets-bball'
+	         'kdeplasma-addons-applets-binary-clock'
+	         'kdeplasma-addons-applets-blackboard'
+	         'kdeplasma-addons-applets-bookmarks'
+	         'kdeplasma-addons-applets-bubblemon'
+	         'kdeplasma-addons-applets-calculator'
+	         'kdeplasma-addons-applets-charselect'
+	         'kdeplasma-addons-applets-comic'
+	         'kdeplasma-addons-applets-community'
+	         'kdeplasma-addons-applets-dict'
+	         'kdeplasma-addons-applets-eyes'
+	         'kdeplasma-addons-applets-fifteenpuzzle'
+	         'kdeplasma-addons-applets-filewatcher'
+	         'kdeplasma-addons-applets-frame'
+	         'kdeplasma-addons-applets-fuzzy-clock'
+	         'kdeplasma-addons-applets-icontasks'
+	         'kdeplasma-addons-applets-incomingmsg'
+	         'kdeplasma-addons-applets-kimpanel'
+	         'kdeplasma-addons-applets-knowledgebase'
+	         'kdeplasma-addons-applets-kolourpicker'
+	         'kdeplasma-addons-applets-konqprofiles'
+	         'kdeplasma-addons-applets-konsoleprofiles'
+	         'kdeplasma-addons-applets-lancelot'
+	         'kdeplasma-addons-applets-leavenote'
+	         'kdeplasma-addons-applets-life'
+	         'kdeplasma-addons-applets-luna'
+	         'kdeplasma-addons-applets-magnifique'
+	         'kdeplasma-addons-applets-mediaplayer'
+	         'kdeplasma-addons-applets-microblog'
+	         'kdeplasma-addons-applets-news'
+	         'kdeplasma-addons-applets-notes'
+	         'kdeplasma-addons-applets-nowplaying'
+	         'kdeplasma-addons-applets-paste'
+	         'kdeplasma-addons-applets-pastebin'
+	         'kdeplasma-addons-applets-plasmaboard'
+	         'kdeplasma-addons-applets-previewer'
+	         'kdeplasma-addons-applets-qalculate'
+	         'kdeplasma-addons-applets-rememberthemilk'
+	         'kdeplasma-addons-applets-rssnow'
+	         'kdeplasma-addons-applets-showdashboard'
+	         'kdeplasma-addons-applets-showdesktop'
+	         'kdeplasma-addons-applets-social-news'
+	         'kdeplasma-addons-applets-spellcheck'
+	         'kdeplasma-addons-applets-systemloadviewer'
+	         'kdeplasma-addons-applets-timer'
+	         'kdeplasma-addons-applets-unitconverter'
+	         'kdeplasma-addons-applets-weather'
+	         'kdeplasma-addons-applets-weatherstation'
+	         'kdeplasma-addons-applets-webslice'
+	         'kdeplasma-addons-containments'
+	         'kdeplasma-addons-runners-audioplayercontrol'
+	         'kdeplasma-addons-runners-browserhistory'
+	         'kdeplasma-addons-runners-characters'
+	         'kdeplasma-addons-runners-contacts'
+	         'kdeplasma-addons-runners-converter'
+	         'kdeplasma-addons-runners-datetime'
+	         'kdeplasma-addons-runners-dictionary'
+	         'kdeplasma-addons-runners-events'
+	         'kdeplasma-addons-runners-katesessions'
+	         'kdeplasma-addons-runners-konquerorsessions'
+	         'kdeplasma-addons-runners-konsolesessions'
+	         'kdeplasma-addons-runners-kopete'
+	         'kdeplasma-addons-runners-mediawiki'
+	         'kdeplasma-addons-runners-spellchecker'
+	         'kdeplasma-addons-runners-youtube'
+	         'kdeplasma-addons-wallpapers-mandelbrot'
+	         'kdeplasma-addons-wallpapers-marble'
+	         'kdeplasma-addons-wallpapers-pattern'
+	         'kdeplasma-addons-wallpapers-potd'
+	         'kdeplasma-addons-wallpapers-qmlwallpapers'
+	         'kdeplasma-addons-wallpapers-virus'
+	         'kdeplasma-addons-wallpapers-weather')
+	replaces=('kdeplasma-addons' 'kde-meta-kdeplasma-addons')
+	conflicts=('kdeplasma-addons' 'kde-meta-kdeplasma-addons')
+	provides=(kde-meta-kdeplasma-addons=$pkgver)
+}
diff --git a/nonprism/kdepim-nonprism/PKGBUILD b/nonprism/kdepim-nonprism/PKGBUILD
index fe78189f7..abcfe2387 100644
--- a/nonprism/kdepim-nonprism/PKGBUILD
+++ b/nonprism/kdepim-nonprism/PKGBUILD
@@ -5,7 +5,6 @@
 
 pkgbase=kdepim
 pkgname=('kdepim-akonadiconsole-nonprism'
-         'kdepim-blogilo-nonprism'
          'kdepim-kaddressbook-nonprism'
          'kdepim-kjots-nonprism'
          'kdepim-kmail-nonprism'
@@ -49,22 +48,6 @@ package_kdepim-akonadiconsole-nonprism() {
 	make DESTDIR="${pkgdir}" install
 }
 
-package_kdepim-blogilo-nonprism() {
-	pkgdesc='A KDE Blogging Client, without Google Drive support'
-	depends=('kdepim-libkdepim')
-	url="http://kde.org/applications/internet/blogilo/"
-	replaces=('blogilo' 'kdepim-blogilo')
-	conflicts=('blogilo' 'kdepim-blogilo')
-	provides=("kdepim-blogilo=${pkgver}")
-	install='kdepim.install'
-	cd "${srcdir}"/build/blogilo
-	make DESTDIR="${pkgdir}" install
-    cd "${srcdir}"/build/composereditor-ng
-	make DESTDIR="${pkgdir}" install
-	cd "${srcdir}"/build/doc/blogilo
-	make DESTDIR="${pkgdir}" install
-}
-
 package_kdepim-kaddressbook-nonprism() {
 	pkgdesc='Contact Manager, without Google Drive support'
 	depends=('kdepim-libkdepim')
diff --git a/nonprism/your-privacy/PKGBUILD b/nonprism/your-privacy/PKGBUILD
index 599f586b3..60637b98f 100644
--- a/nonprism/your-privacy/PKGBUILD
+++ b/nonprism/your-privacy/PKGBUILD
@@ -5,8 +5,8 @@ pkgdesc="This package will remove support for unsafe/dangerous for privacy proto
 license=('GPL3')
 #url="https://projects.parabolagnulinux.org/blacklist.git"
 url="https://lukeshu.com/git/mirror/parabola/blacklist.git"
-pkgver=20140827.1
-_gitver=ee8234dcb7e270c434d6cce01942600feb9444f0
+pkgver=20140827.2
+_gitver=cecf3ae5ffae7611db5ad3241ef6421af31a1664
 pkgrel=1
 
 arch=('any')
@@ -16,7 +16,7 @@ replaces=(your-coherence)
 makedepends=(librelib)
 #source=(blacklist-${_gitver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver})
 source=(blacklist-${_gitver}.txt::https://lukeshu.com/git/mirror/parabola/blacklist.git/plain/${pkgname}-blacklist.txt?id=${_gitver})
-md5sums=('f3ed6499df6780764beb53a7109fe8d6')
+md5sums=('d6d53d581e77146b05c53f60f1dce2c2')
 
 package() {
 	cd "$srcdir"