Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

3 files changed, 159 insertions, 18 deletions

diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index 6e992807c..c44b6b787 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 96553 2013-08-31 16:26:33Z fyan $
+# $Id: PKGBUILD 96688 2013-09-03 03:01:25Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: David Manouchehri <david@davidmanouchehri.com>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
+_pkgname=cgminer
 pkgname=cgminer-libre
-_pkgflag=libre
-pkgver=3.4.1
+pkgver=3.4.2
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
-depends=('curl' 'libcl-libre' 'libusbx' 'jansson')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+depends=('curl' 'mesa-libcl' 'libusbx' 'jansson')
 makedepends=('opencl-headers')
-provides=(${pkgname%-$_pkgflag}=$pkgver)
-conflicts=${pkgname%-$_pkgflag}
-replaces=${pkgname%-$_pkgflag}
-source=("http://ck.kolivas.org/apps/${pkgname%-$_pkgflag}/${pkgname%-$_pkgflag}-${pkgver}.tar.bz2"
-        "${pkgname%-$_pkgflag}.conf.d"
-        "${pkgname%-$_pkgflag}.service")
-backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
+source=("http://ck.kolivas.org/apps/$_pkgname/$_pkgname-${pkgver}.tar.bz2"
+        "$_pkgname.conf.d"
+        "$_pkgname.service")
+backup=("etc/conf.d/$_pkgname" "etc/$_pkgname.conf")
 
 [ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
 
 build() {
-  cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   # We have latest jansson and libusb - just use them
   sed "s|ac_subdirs_all='compat/libusb\-1.0'||" -i ./configure
@@ -60,16 +60,19 @@ build() {
 }
 
 package() {
-  cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
+  cd "$srcdir/$_pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 
-  install -Dm644 "$srcdir"/${pkgname%-$_pkgflag}.service "$pkgdir"/usr/lib/systemd/system/${pkgname%-$_pkgflag}.service
-  install -Dm644 "$srcdir"/${pkgname%-$_pkgflag}.conf.d "$pkgdir"/etc/conf.d/${pkgname%-$_pkgflag}
-  sed 's#/usr/local/bin#/usr/bin#g' example.conf > ${pkgname%-$_pkgflag}.conf
-  install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
+  install -d "$pkgdir/usr/share/$_pkgname"
+  install -m755 miner.php api-example.* "$pkgdir/usr/share/$_pkgname"
+
+  install -Dm644 "$srcdir"/$_pkgname.service "$pkgdir"/usr/lib/systemd/system/$_pkgname.service
+  install -Dm644 "$srcdir"/$_pkgname.conf.d "$pkgdir"/etc/conf.d/$_pkgname
+  sed 's#/usr/local/bin#/usr/bin#g' example.conf > $_pkgname.conf
+  install -Dm644 $_pkgname.conf "$pkgdir"/etc/$_pkgname.conf
 }
 
-sha512sums=('db648f18002ce558454fa0e4aa948146dcaeb473728c15503c8e908fc26507df25602edc5b8295cf578327bf43f99f9846d9580f9c3b4b08b03a0ca24da8f15c'
+sha512sums=('cccdab8de11b9bc740ba387685a24ae07729eedba0dd02d83d708d66b208cff2c719157a90cc157fa4900a386ae76e7692bdc893f3de9928dbcaacc86a4c05f1'
             '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
             '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/netsurf-libre/PKGBUILD b/libre/netsurf-libre/PKGBUILD
new file mode 100644
index 000000000..d3c6463a2
--- /dev/null
+++ b/libre/netsurf-libre/PKGBUILD
@@ -0,0 +1,124 @@
+# $Id: PKGBUILD 95886 2013-08-18 11:31:23Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
+# Contributor: Georgij Kondratjev <smpuj@bk.ru>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
+
+_pkgname=netsurf
+pkgname=netsurf-libre
+pkgver=3.0
+pkgrel=4
+pkgdesc='Lightweight and fast web browser, without non-privacy search providers'
+arch=('x86_64' 'i686' 'mips64el')
+url='http://www.netsurf-browser.org/'
+license=('MIT' 'GPL2')
+replaces=$_pkgname
+conflicts=$_pkgname
+provides=$_pkgname=$pkgver
+depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss' 'libwebp' 'libdom' 'lcms') # 'libharu' 'gstreamer0.10'
+makedepends=('js' 're2c' 'gendesk' 'netsurf-buildsystem' 'libglade' 'addinclude')
+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")
+sha256sums=('f0dbcc5d80bf03d706aa8b28a322aa7f169a40813848c2d1505691f6e2c7ef00'
+            '7c6a48d3cc3e9a3e3a51b532ddf60f7697e97bf8b61a6d3b2ced1a2e89fbccc6')
+
+prepare() {
+  cd "$_pkgname-$pkgver"
+
+  # remove non-privacy search providers
+  sed -i '\|Google|d
+          \|Yahoo|d
+          \|Bing|d
+          \|Business.com|d
+          \|Omgili|d
+          \|BBC News|d
+          \|Ubuntu Packages|d
+          \|Ask[.]com|d
+          \|Answers.com|d
+          \|Youtube|d
+          \|AeroMp3|d
+          \|AOL|d
+          \|Baidu|d
+          \|Amazon|d
+          \|Ebay|d
+          \|IMDB|d
+          \|ESPN|d
+          \|Aminet|d
+          \|OS4Depot|d
+          s|DuckDuckGo|DuckDuckGo HTML|
+          s|duckduckgo[.]com|duckduckgo.com/html|
+          s|duckduckgo[.]com/html/favicon.ico|duckduckgo.com/favicon.ico|
+          s|seeks-project.info|seeks.fr|g
+         ' gtk/res/SearchEngines \
+           \!NetSurf/Resources/SearchEngines \
+           amiga/resources/SearchEngines
+  sed -i '\|readable name such as| s|google|duckduckgo|
+          \|readable name such as| s|yahoo|seeks|
+          \|host address such as www[.]google[.]com| s|google[.]com|duckduckgo.com/html|
+          s|google[.]com?search=%s|duckduckgo.com/html/?q=%s|
+          \|return strdup| s|google[.]com|duckduckgo.com/html|
+          \|return strdup| s|google|duckduckgo|
+          \|return strdup| s|duckduckgo[.]com/html/favicon[.]ico|duckduckgo.com/favicon.ico|
+          s|www[.]google[.]com/search?q=%s|duckduckgo.com/html/?q=%s|
+         ' desktop/searchweb.c
+  sed -i 's|google[.][.a-z]\{0,6\}/search|duckduckgo.com/html/search|
+          s|Google-Suche|DuckDuckGo HTML|
+          s|Google Search|DuckDuckGo HTML|
+          s|Ricerca Google|DuckDuckGo HTML|
+          s|Google検索|DuckDuckGo HTML|
+          \|BBC News|d
+          \|Reuters|d
+          \|CNN|d
+          \|Slashdot|d
+          \|Ars Technica|d
+          \|The Register|d
+          \|W3C|d
+          s|google[.][.a-z]\{0,6\}|duckduckgo.com/html|
+          s|Google|DuckDuckGo HTML|
+          s|[.a-z]\{0,4\}yahoo[.]co[.a-z]\{0,4\}|www.seeks.fr|
+          s|Yahoo!|Seeks|
+          \|IMDB|d
+          s|The Icon Bar|Creative Commons|
+          s|www[.]iconbar[.]com|creativecommons.org|
+          s|ROOL|Dictionary.com|
+          s|www[.]riscosopen[.]org|dictionary.reference.com|
+          \|riscos.info|d
+         ' \!NetSurf/Resources/de/welcome.html\,faf \
+           \!NetSurf/Resources/en/welcome.html\,faf \
+           \!NetSurf/Resources/it/welcome.html\,faf \
+           \!NetSurf/Resources/ja/welcome.html\,faf
+
+  addinclude image/rsvg.c stdio
+  addinclude image/mng.c stdio
+  addinclude image/png.c stdio
+
+  gendesk --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'
+}
+
+build() {
+  cd "$_pkgname-$pkgver"
+
+  make \
+    PREFIX=/usr \
+    TARGET=gtk \
+    NETSURF_USE_WEBP=YES \
+    NETSURF_USE_VIDEO=NO \
+    NETSURF_USE_MOZILLA_JS=YES \
+    NETSURF_USE_HARU_PDF=NO
+}
+
+package() {
+  cd "$_pkgname-$pkgver"
+
+  make install PREFIX=/usr DESTDIR="$pkgdir"
+  install -Dm644 "../$_pkgname.png" "$pkgdir/usr/share/pixmaps/$_pkgname.png"
+  install -Dm644 "$_pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$_pkgname.desktop"
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$_pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/netsurf-libre/netsurf.install b/libre/netsurf-libre/netsurf.install
new file mode 100644
index 000000000..98f3ea190
--- /dev/null
+++ b/libre/netsurf-libre/netsurf.install
@@ -0,0 +1,14 @@
+post_upgrade() {
+  #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_install() {
+  post_upgrade
+}
+
+post_remove() {
+  post_upgrade
+}
+
+# vim:set ts=2 sw=2 et: