summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/cgminer-libre/PKGBUILD21
-rw-r--r--libre/ghostscript-libre/PKGBUILD8
-rw-r--r--libre/gnu-ghostscript/PKGBUILD4
-rw-r--r--libre/linux-libre-lts-kmod-alx/PKGBUILD4
-rw-r--r--libre/linux-libre-lts/PKGBUILD10
-rw-r--r--libre/qupzilla-libre/PKGBUILD22
-rw-r--r--libre/qupzilla-libre/libre.patch89
-rw-r--r--libre/qupzilla-libre/searchenginesmanager.cpp.sed19
-rw-r--r--libre/qupzilla-libre/speeddial.cpp.sed4
-rw-r--r--libre/qupzilla-libre/start.html.sed1
-rw-r--r--nonprism/gnome-online-accounts-nonprism/PKGBUILD21
-rw-r--r--nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install1
-rw-r--r--nonprism/gnome-online-accounts-nonprism/imap-smtp.patch20
-rw-r--r--nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch88
-rw-r--r--pcr/tanglet/PKGBUILD16
-rw-r--r--pcr/tanglet/tanglet.install2
16 files changed, 81 insertions, 249 deletions
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index ecd2ace16..6e992807c 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 96190 2013-08-21 13:06:15Z fyan $
+# $Id: PKGBUILD 96553 2013-08-31 16:26:33Z fyan $
# Maintainer: Felix Yan <felixonmars@gmail.com>
# Contributor: monson <holymonson@gmail.com>
# Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
pkgname=cgminer-libre
_pkgflag=libre
-pkgver=3.4.0
+pkgver=3.4.1
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'
@@ -28,13 +28,22 @@ backup=("etc/conf.d/${pkgname%-$_pkgflag}" "etc/${pkgname%-$_pkgflag}.conf")
build() {
cd "$srcdir/${pkgname%-$_pkgflag}-$pkgver"
- # Use in-tree jansson since it is not compatible with jansson 2.0
- #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac
+ # We have latest jansson and libusb - just use them
+ sed "s|ac_subdirs_all='compat/libusb\-1.0'||" -i ./configure
+ sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
+ sed 's|LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"|LIBUSB_LIBS=-lusb-1.0|' -i ./configure
+ sed 's|JANSSON_LIBS="compat/jansson/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
+ sed 's|compat/Makefile compat/jansson/Makefile||' -i ./configure
+
+ sed 's|JANSSON_INCLUDES = -I$(top_srcdir)/compat/jansson||' -i ./Makefile.in
+ sed 's|USBUTILS_INCLUDES = -I$(top_srcdir)/compat/libusb\-1.0/libusb|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' -i ./Makefile.in
+ sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in
+
+ rm -r compat
# Here you may want to use custom CFLAGS
#export CFLAGS="-O2 -march=native -mtune=native -msse2"
- #./autogen.sh
./configure \
--prefix=/usr \
--enable-scrypt \
@@ -61,6 +70,6 @@ package() {
install -Dm644 ${pkgname%-$_pkgflag}.conf "$pkgdir"/etc/${pkgname%-$_pkgflag}.conf
}
-sha512sums=('2f308c9285755b62608da4a6be3942d08b6cfff218238dbb4c15da7d02c8f2ac46cd7a9fbd69b7a46faa11962a937ba6327aa03852c291e69ff6158e50c1e5b6'
+sha512sums=('db648f18002ce558454fa0e4aa948146dcaeb473728c15503c8e908fc26507df25602edc5b8295cf578327bf43f99f9846d9580f9c3b4b08b03a0ca24da8f15c'
'99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
'3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD
index 63958664e..d339089af 100644
--- a/libre/ghostscript-libre/PKGBUILD
+++ b/libre/ghostscript-libre/PKGBUILD
@@ -1,11 +1,13 @@
-# $Id: PKGBUILD 193535 2013-08-22 17:59:22Z andyrtr $
+# $Id: PKGBUILD 193812 2013-09-02 09:41:54Z andyrtr $
# Maintainer: AndyRTR <andyrtr@archlinux.org>
# Maintainer (Parabola): Joshua Haase <hahj87@gmail.com>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
+### !!! rebuild groff from core that picks up hardcoding the GS versioned font path !!! ###
+
_pkgname=ghostscript
pkgname=ghostscript-libre
-pkgver=9.09
+pkgver=9.10
pkgrel=1
pkgdesc="An interpreter for the PostScript language, without nonfree files"
arch=('i686' 'x86_64' 'mips64el')
@@ -21,7 +23,7 @@ provides=("ghostscript=$pkgver")
url="http://www.ghostscript.com/"
source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2)
options=('!libtool' '!makeflags')
-md5sums=('4f47c29daae8e567ebdef842b7e0f8ea')
+md5sums=('7179bb1ed4f6f453147e6f7e1f210ce8')
build() {
cd ghostscript-${pkgver}
diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD
index 6d44a7646..0c124d528 100644
--- a/libre/gnu-ghostscript/PKGBUILD
+++ b/libre/gnu-ghostscript/PKGBUILD
@@ -2,10 +2,10 @@
_pkgname=ghostscript
pkgname=gnu-ghostscript
-_gspkgver=9.09 # ghostscript package version
+_gspkgver=9.10 # ghostscript package version
_pkgver=9.06
pkgver=9.06.0
-pkgrel=5
+pkgrel=6
pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers"
arch=('i686' 'x86_64' 'mips64el')
license=('GPL3')
diff --git a/libre/linux-libre-lts-kmod-alx/PKGBUILD b/libre/linux-libre-lts-kmod-alx/PKGBUILD
index c6262a0dc..22ddcf9a0 100644
--- a/libre/linux-libre-lts-kmod-alx/PKGBUILD
+++ b/libre/linux-libre-lts-kmod-alx/PKGBUILD
@@ -1,12 +1,12 @@
# Maintainer: André Silva <emulatorman@lavabit.com>
-_kernver=3.0.93
+_kernver=3.0.94
_kernrel=1
pkgname=('linux-libre-lts-kmod-alx')
_version=v3.9-rc4
_pkgver=3.9-rc4-2-su
pkgver=3.9rc4.2
-pkgrel=15
+pkgrel=16
pkgdesc='Atheros alx ethernet device driver for Linux-libre-lts kernel'
arch=('i686' 'x86_64')
url='http://www.linuxfoundation.org/collaborate/workgroups/networking/alx'
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index bfe0c4000..e1fa76aaf 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193507 2013-08-21 13:08:50Z tpowa $
+# $Id: PKGBUILD 193759 2013-08-30 10:08:14Z andyrtr $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
# Maintainer: Thomas Baechler <thomas@archlinux.org>
# Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
@@ -8,10 +8,10 @@
pkgbase=linux-libre-lts # Build stock -LIBRE-LTS kernel
#pkgbase=linux-libre-custom # Build kernel with a different name
_basekernel=3.0
-_sublevel=93
+_sublevel=94
pkgver=${_basekernel}.${_sublevel}
pkgrel=1
-_lxopkgver=${_basekernel}.93 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.94 # nearly always the same as pkgver
arch=('i686' 'x86_64' 'mips64el')
url="http://linux-libre.fsfla.org/"
license=('GPL2')
@@ -33,7 +33,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
'module-init-wait-3.0.patch'
"http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu1_0loongsonlibre_mipsel.tar.bz2")
md5sums=('f30a562307b6f71204370fcd33756466'
- '0d900fb04812ca03cd2a6de094cdcc04'
+ 'f488335cb6f6cbae9dd5d07d31a532b3'
'7373cc3ac66342156a7fc32af8577b46'
'b7229f80282337979514f9640a969ff5'
'c072b17032e80debc6a8626299245d46'
@@ -45,7 +45,7 @@ md5sums=('f30a562307b6f71204370fcd33756466'
'f36222e7ce20c8e4dc27376f9be60f6c'
'670931649c60fcb3ef2e0119ed532bd4'
'8a71abc4224f575008f974a099b5cf6f'
- '0b0f582f9736f7d99d75b5f67cb56dfc')
+ 'f7faae4e260abb9dceb30d7b233d355d')
if [ "$CARCH" != "mips64el" ]; then
# don't use the Loongson-specific patches on non-mips64el arches.
unset source[${#source[@]}-1]
diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD
index 75945986a..d5bab2cde 100644
--- a/libre/qupzilla-libre/PKGBUILD
+++ b/libre/qupzilla-libre/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 90358 2013-05-11 23:22:13Z speps $
+# $Id: PKGBUILD 96569 2013-09-01 16:36:10Z speps $
# Maintainer: speps <speps at aur dot archlinux dot org>
# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
_name=QupZilla
_pkgname=qupzilla
pkgname=qupzilla-libre
-pkgver=1.4.3
-pkgrel=1.2
+pkgver=1.4.4
+pkgrel=1
pkgdesc="Cross-platform QtWebKit browser, with DuckDuckGo HTML support"
arch=(i686 x86_64 mips64el)
url="http://www.qupzilla.com/"
@@ -18,15 +18,21 @@ replaces=$_pkgname
conflicts=$_pkgname
provides=$_pkgname=$pkgver
source=("$_pkgname-$pkgver.tar.gz::https://github.com/$_name/$_pkgname/tarball/v$pkgver"
- 'libre.patch')
-md5sums=('20187fcce11dbba876e1ee7dc5e32583'
- '20c8304eb790cda5491078bf5bf71d49')
+ 'searchenginesmanager.cpp.sed'
+ 'speeddial.cpp.sed'
+ 'start.html.sed')
+md5sums=('cfbf5cd23d184275c389c79a39a28631'
+ '1d926e97a5b287d40fb695f6516f2a06'
+ '0f166fa102af975b3b8ac030d477e9b8'
+ '77120a0c39ba8254e5b2c273910f029a')
prepare() {
cd "$srcdir/$_name-$_pkgname-"*
- # remove Google, Youtube and Facebook support, replaces it to DDG HTML
- patch -Np1 -i $srcdir/libre.patch
+ # remove Google and Youtube support, replaces it to DDG HTML
+ 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() {
diff --git a/libre/qupzilla-libre/libre.patch b/libre/qupzilla-libre/libre.patch
deleted file mode 100644
index 6db34dd8f..000000000
--- a/libre/qupzilla-libre/libre.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/src/lib/opensearch/searchenginesmanager.cpp b/src/lib/opensearch/searchenginesmanager.cpp
-index 72ae7d4..cb42795 100644
---- a/src/lib/opensearch/searchenginesmanager.cpp
-+++ b/src/lib/opensearch/searchenginesmanager.cpp
-@@ -55,8 +55,8 @@ SearchEnginesManager::SearchEnginesManager()
- {
- Settings settings;
- settings.beginGroup("SearchEngines");
-- m_startingEngineName = settings.value("activeEngine", "Google").toString();
-- m_defaultEngineName = settings.value("DefaultEngine", "Google").toString();
-+ m_startingEngineName = settings.value("activeEngine", "DuckDuckGo HTML").toString();
-+ m_defaultEngineName = settings.value("DefaultEngine", "DuckDuckGo HTML").toString();
- settings.endGroup();
-
- connect(this, SIGNAL(enginesChanged()), this, SLOT(scheduleSave()));
-@@ -126,13 +126,6 @@ QUrl SearchEnginesManager::searchUrl(const QString &string)
-
- void SearchEnginesManager::restoreDefaults()
- {
-- Engine google;
-- google.name = "Google";
-- google.icon = QIcon(":icons/sites/google.png");
-- google.url = "http://www.google.com/search?client=qupzilla&q=%s";
-- google.shortcut = "g";
-- google.suggestionsUrl = "http://suggestqueries.google.com/complete/search?output=firefox&q=%s";
--
- Engine wiki;
- wiki.name = "Wikipedia (en)";
- wiki.icon = QIcon(":/icons/sites/wikipedia.png");
-@@ -140,25 +133,16 @@ void SearchEnginesManager::restoreDefaults()
- wiki.shortcut = "w";
- wiki.suggestionsUrl = "http://en.wikipedia.org/w/api.php?action=opensearch&search=%s&namespace=0";
-
-- Engine yt;
-- yt.name = "YouTube";
-- yt.icon = QIcon(":/icons/sites/youtube.png");
-- yt.url = "http://www.youtube.com/results?search_query=%s&search=Search";
-- yt.shortcut = "yt";
-- yt.suggestionsUrl = "http://suggestqueries.google.com/complete/search?ds=yt&output=firefox&q=%s";
--
- Engine duck;
-- duck.name = "DuckDuckGo";
-+ duck.name = "DuckDuckGo HTML";
- duck.icon = QIcon(":/icons/sites/duck.png");
-- duck.url = "https://duckduckgo.com/?q=%s&t=qupzilla";
-+ duck.url = "https://duckduckgo.com/html/?q=%s&t=qupzilla";
- duck.shortcut = "d";
-
-- addEngine(google);
- addEngine(wiki);
-- addEngine(yt);
- addEngine(duck);
-
-- m_defaultEngine = google;
-+ m_defaultEngine = duck;
-
- emit enginesChanged();
- }
-diff --git a/src/lib/plugins/speeddial.cpp b/src/lib/plugins/speeddial.cpp
-index 2039921..52afa22 100644
---- a/src/lib/plugins/speeddial.cpp
-+++ b/src/lib/plugins/speeddial.cpp
-@@ -54,11 +54,10 @@ void SpeedDial::loadSettings()
- settings.endGroup();
-
- if (allPages.isEmpty()) {
-- allPages = "url:\"http://www.google.com\"|title:\"Google\";"
-+ allPages = "url:\"https://duckduckgo.com/html\"|title:\"DuckDuckGo HTML\";"
- "url:\"http://www.qupzilla.com\"|title:\"QupZilla\";"
- "url:\"http://blog.qupzilla.com\"|title:\"QupZilla Blog\";"
-- "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";"
-- "url:\"https://facebook.com\"|title:\"Facebook\";";
-+ "url:\"https://github.com/QupZilla/qupzilla\"|title:\"QupZilla GitHub\";";
- }
- changed(allPages);
-
-diff --git a/src/lib/data/html/start.html b/src/lib/data/html/start.html
-index 0e48ed2..eb7d793 100644
---- a/src/lib/data/html/start.html
-+++ b/src/lib/data/html/start.html
-@@ -19,7 +19,7 @@ a {color: #1a4ba4;text-decoration: none;font-weight: bold;}
-
- <img src="%ABOUT-IMG%">
- %PRIVATE-BROWSING%
--<form action="https://duckduckgo.com/" method="GET">
-+<form action="https://duckduckgo.com/html" method="GET">
- <input type="hidden" name="t" value="qupzilla" />
- <input class="line" id="inp" class="question" name="q"/> <br/>
- <input class="submit" type="submit" value="%BUTTON-LABEL%">
diff --git a/libre/qupzilla-libre/searchenginesmanager.cpp.sed b/libre/qupzilla-libre/searchenginesmanager.cpp.sed
new file mode 100644
index 000000000..76011d058
--- /dev/null
+++ b/libre/qupzilla-libre/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-libre/speeddial.cpp.sed b/libre/qupzilla-libre/speeddial.cpp.sed
new file mode 100644
index 000000000..b8f591e87
--- /dev/null
+++ b/libre/qupzilla-libre/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-libre/start.html.sed b/libre/qupzilla-libre/start.html.sed
new file mode 100644
index 000000000..f59a65979
--- /dev/null
+++ b/libre/qupzilla-libre/start.html.sed
@@ -0,0 +1 @@
+\|<form action="https://duckduckgo[.]com/" method="GET">| s|duckduckgo[.]com|duckduckgo.com/html|
diff --git a/nonprism/gnome-online-accounts-nonprism/PKGBUILD b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
index 7b541c715..d91e396f5 100644
--- a/nonprism/gnome-online-accounts-nonprism/PKGBUILD
+++ b/nonprism/gnome-online-accounts-nonprism/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id$
+# $Id: PKGBUILD 193763 2013-08-30 13:15:23Z heftig $
# Maintainer: Ionut Biru <ibiru@archlinux.org>
# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
_pkgname=gnome-online-accounts
pkgname=gnome-online-accounts-nonprism
-pkgver=3.8.2
-pkgrel=2.1
+pkgver=3.8.3
+pkgrel=1
pkgdesc="GNOME service to access online accounts, without support for unsafe and dangerous for privacy protocols"
arch=(i686 x86_64 mips64el)
url="http://www.gnome.org"
@@ -17,19 +17,8 @@ conflicts=$_pkgname
replaces=($_pkgname $pkgname-coherence)
options=(!libtool)
install=$_pkgname.install
-source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz
- imap-smtp.patch
- smtp-auth-plain.patch)
-sha256sums=('12611a002043c8acc29e9800ec009e3e19736bdb6237d246e848d7c7909fe826'
- '2b413d1f401647bd143b7dc6dd4b6d6660ff47ef9a11ccbc691b7c13de5cba69'
- 'e7250be7c078053345699250433b7164751d3e457155bd35508c7d1660f459be')
-
-prepare() {
- cd $_pkgname-$pkgver
- # Upstream 3.8 branch
- patch -Np1 -i ../imap-smtp.patch
- patch -Np1 -i ../smtp-auth-plain.patch
-}
+source=(http://download.gnome.org/sources/$_pkgname/${pkgver:0:3}/$_pkgname-$pkgver.tar.xz)
+sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b')
build() {
cd $_pkgname-$pkgver
diff --git a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
index ae4eb5fa7..525ecff63 100644
--- a/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
+++ b/nonprism/gnome-online-accounts-nonprism/gnome-online-accounts.install
@@ -9,4 +9,3 @@ post_upgrade() {
post_remove() {
post_install
}
-
diff --git a/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch b/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch
deleted file mode 100644
index 7213c8d1e..000000000
--- a/nonprism/gnome-online-accounts-nonprism/imap-smtp.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From 034da0871ad78629f9d0df618be494dbb19157e4 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Tue, 18 Jun 2013 10:35:42 +0000
-Subject: imap-smtp: Prevent error messages from expanding the dialog
-
----
-diff --git a/src/goabackend/goaimapsmtpprovider.c b/src/goabackend/goaimapsmtpprovider.c
-index d10a9d8..841327d 100644
---- a/src/goabackend/goaimapsmtpprovider.c
-+++ b/src/goabackend/goaimapsmtpprovider.c
-@@ -669,6 +669,7 @@ create_account_details_ui (GoaProvider *provider,
-
- data->cluebar_label = gtk_label_new ("");
- gtk_label_set_line_wrap (GTK_LABEL (data->cluebar_label), TRUE);
-+ gtk_label_set_max_width_chars (GTK_LABEL (data->cluebar_label), 36);
- gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (data->cluebar))),
- data->cluebar_label);
-
---
-cgit v0.9.2
diff --git a/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch b/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch
deleted file mode 100644
index c6782d0f6..000000000
--- a/nonprism/gnome-online-accounts-nonprism/smtp-auth-plain.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 2210bf547dc35adacbc95c0dcf4abe75a73a8368 Mon Sep 17 00:00:00 2001
-From: Debarshi Ray <debarshir@gnome.org>
-Date: Tue, 18 Jun 2013 15:27:55 +0000
-Subject: smtp-auth-plain: Handle multiline SMTP greetings
-
-Fixes: https://bugzilla.gnome.org/702263
----
-diff --git a/src/goabackend/goasmtpauthplain.c b/src/goabackend/goasmtpauthplain.c
-index bb783bd..77324cf 100644
---- a/src/goabackend/goasmtpauthplain.c
-+++ b/src/goabackend/goasmtpauthplain.c
-@@ -167,6 +167,40 @@ smtp_auth_plain_check_454 (const gchar *response, GError **error)
-
- /* ---------------------------------------------------------------------------------------------------- */
-
-+static gboolean
-+smtp_auth_plain_check_greeting (GDataInputStream *input, GCancellable *cancellable, GError **error)
-+{
-+ gboolean ret;
-+ gchar *response;
-+
-+ response = NULL;
-+ ret = FALSE;
-+
-+ greeting_again:
-+ response = g_data_input_stream_read_line (input, NULL, cancellable, error);
-+ if (response == NULL)
-+ goto out;
-+ g_debug ("< %s", response);
-+ if (smtp_auth_plain_check_421 (response, error))
-+ goto out;
-+ if (smtp_auth_plain_check_not_220 (response, error))
-+ goto out;
-+
-+ if (response[3] == '-')
-+ {
-+ g_clear_pointer (&response, g_free);
-+ goto greeting_again;
-+ }
-+
-+ ret = TRUE;
-+
-+ out:
-+ g_free (response);
-+ return ret;
-+}
-+
-+/* ---------------------------------------------------------------------------------------------------- */
-+
- static gchar *
- smtp_auth_plain_get_domain (GoaSmtpAuthPlain *auth,
- GError **error)
-@@ -563,15 +597,8 @@ goa_smtp_auth_plain_run_sync (GoaMailAuth *_auth,
-
- if (!auth->greeting_absent)
- {
-- response = g_data_input_stream_read_line (input, NULL, cancellable, error);
-- if (response == NULL)
-- goto out;
-- g_debug ("< %s", response);
-- if (smtp_auth_plain_check_421 (response, error))
-+ if (!smtp_auth_plain_check_greeting (input, cancellable, error))
- goto out;
-- if (smtp_auth_plain_check_not_220 (response, error))
-- goto out;
-- g_clear_pointer (&response, g_free);
- }
-
- /* Send EHLO */
-@@ -685,15 +712,8 @@ goa_smtp_auth_plain_starttls_sync (GoaMailAuth *_auth,
-
- /* Check the greeting */
-
-- response = g_data_input_stream_read_line (input, NULL, cancellable, error);
-- if (response == NULL)
-- goto out;
-- g_debug ("< %s", response);
-- if (smtp_auth_plain_check_421 (response, error))
-+ if (!smtp_auth_plain_check_greeting (input, cancellable, error))
- goto out;
-- if (smtp_auth_plain_check_not_220 (response, error))
-- goto out;
-- g_clear_pointer (&response, g_free);
-
- /* Send EHLO */
-
---
-cgit v0.9.2
diff --git a/pcr/tanglet/PKGBUILD b/pcr/tanglet/PKGBUILD
index 23e20cd6c..a8114ba62 100644
--- a/pcr/tanglet/PKGBUILD
+++ b/pcr/tanglet/PKGBUILD
@@ -1,23 +1,23 @@
-# Maintainer (Arch): Graeme Gott <graeme@gottcode.org>
-# Maintainer (Parabola): Alon Ivtsan <alonivtsan@lavabit.com>
+# Maintainer (AUR): Graeme Gott <graeme@gottcode.org>
+# Maintainer: Alon Ivtsan <alonivtsan@lavabit.com>
# Based on https://aur.archlinux.org/packages.php?ID=32311
pkgname=tanglet
-pkgver=1.2.1
-pkgrel=3
+pkgver=1.2.2
+pkgrel=1
pkgdesc="A single player word finding game based on Boggle."
arch=('i686' 'x86_64')
url="http://gottcode.org/${pkgname}/"
license=('GPL3')
-depends=('qt4')
+depends=('qt5-base')
install=${pkgname}.install
source=(http://gottcode.org/${pkgname}/${pkgname}-${pkgver}-src.tar.bz2)
-md5sums=('109ad08a03cc64808fa2caad6c3a4a7c')
-sha256sums=('94f4c5c76020ec1fe502ff076fbe5471e497d4b7bcabd1e9059e1022d1ce80c8')
+md5sums=('584e50d01323c0686ff094195eba4341')
+sha256sums=('c90d5c36b7e6cca54cdc001c7eecfb333795add16e6ae01f100026c61f4a84da')
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
- qmake-qt4 PREFIX=/usr
+ qmake-qt5 PREFIX=/usr
make
}
diff --git a/pcr/tanglet/tanglet.install b/pcr/tanglet/tanglet.install
index e70c054ec..81f2ba659 100644
--- a/pcr/tanglet/tanglet.install
+++ b/pcr/tanglet/tanglet.install
@@ -1,5 +1,5 @@
post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
}
post_upgrade() {