diff options
271 files changed, 13308 insertions, 5473 deletions
diff --git a/community/aegisub/PKGBUILD b/community/aegisub/PKGBUILD index 43818fe7c..b9f706c40 100755 --- a/community/aegisub/PKGBUILD +++ b/community/aegisub/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 96068 2013-08-19 20:07:28Z eric $ +# $Id: PKGBUILD 96598 2013-09-02 08:35:43Z alucryd $ # Maintainer: Maxime Gauduin <alucryd@gmail.com> # Contributor: kozec <kozec@kozec.com> # Contributor: Limao Luo <luolimao+AUR@gmail.com> pkgname=aegisub pkgver=3.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="A general-purpose subtitle editor with ASS/SSA support" arch=('i686' 'x86_64' 'mips64el') url="http://www.aegisub.org" license=('GPL' 'BSD') depends=('desktop-file-utils' 'ffmpegsource' 'fftw' 'hicolor-icon-theme' 'hunspell' 'lua51' 'wxgtk2.9') makedepends=('mesa') -install=aegisub.install +install="${pkgname}.install" source=("http://ftp.aegisub.org/pub/releases/${pkgname}-${pkgver}.tar.xz" 'wxgtk2.9.5.patch') sha256sums=('7d5d8b94da02278b3327f24dd546c0c897c4b369bd2da9e094dc60371422019a' - 'b3dc9f094d23e6f38a7a03dc3692056bd9e09095dab8385d7f2fd7c0e73e19d2') + '8aed8aaf4773e4a315f9336d3ea4af2c46b9e84c4e651c202e0a70a6cd9e499c') prepare() { cd ${pkgname}/${pkgname} @@ -29,7 +29,7 @@ build() { export ACLOCAL=aclocal export AUTOMAKE=automake - ./autogen.sh --prefix=/usr --without-{portaudio,openal,oss} --with-wxdir=/usr/include/wx-2.9 --with-wx-config=/usr/bin/wx-config-2.9 + ./autogen.sh --prefix='/usr' --without-{portaudio,openal,oss} --with-wxdir='/usr/include/wx-2.9' --with-wx-config='/usr/bin/wx-config-2.9' make } diff --git a/community/aegisub/wxgtk2.9.5.patch b/community/aegisub/wxgtk2.9.5.patch index 5c0b805ff..b50fac01b 100644 --- a/community/aegisub/wxgtk2.9.5.patch +++ b/community/aegisub/wxgtk2.9.5.patch @@ -1,14 +1,3 @@ -From ca8036d425bf59020b476259e7857e8c67ebb6ba Mon Sep 17 00:00:00 2001 -From: Maxime Gauduin <alucryd@gmail.com> -Date: Mon, 12 Aug 2013 05:20:41 +0200 -Subject: [PATCH] wxStandardPaths is protected as of wxgtk 2.9.5 - ---- - aegisub/src/utils.cpp | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/aegisub/src/utils.cpp b/aegisub/src/utils.cpp -index 70c9ea1..f72593d 100644 --- a/aegisub/src/utils.cpp +++ b/aegisub/src/utils.cpp @@ -121,8 +121,7 @@ void RestartAegisub() { @@ -31,6 +20,22 @@ index 70c9ea1..f72593d 100644 #endif } --- -1.8.3.4 - +--- a/aegisub/src/menu.cpp ++++ b/aegisub/src/menu.cpp +@@ -457,11 +457,11 @@ namespace menu { + window->Bind(wxEVT_COMMAND_MENU_SELECTED, &CommandManager::OnMenuClick, &menu->cm); + window->SetMenuBar(menu.get()); + +-#ifdef __WXGTK__ +- // GTK silently swallows keypresses for accelerators whose associated +- // menu items are disabled. As we don't update the menu until it's +- // opened, this means that conditional hotkeys don't work if the menu +- // hasn't been opened since they became valid. ++#if defined(__WXGTK__) && !wxCHECK_VERSION(2, 9, 5) ++ // Older versions of wxGTK silently swallow keypresses for accelerators ++ // whose associated menu items are disabled. As we don't update the ++ // menu until it's opened, this means that conditional hotkeys don't ++ // work if the menu hasn't been opened since they became valid. + // + // To work around this, we completely disable accelerators from menu + // item. wxGTK doesn't expose any way to do this other that at wx diff --git a/community/chmsee/PKGBUILD b/community/chmsee/PKGBUILD index d10d3b141..d5030ee63 100644 --- a/community/chmsee/PKGBUILD +++ b/community/chmsee/PKGBUILD @@ -1,34 +1,34 @@ -# $Id: PKGBUILD 93170 2013-06-27 01:34:18Z foutrelis $ +# $Id: PKGBUILD 96436 2013-08-28 21:03:26Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: dionydonny <dionydonny@gmail.com> # Contributor: Ermanno <erm67@yahoo.it> pkgname=chmsee -pkgver=2.0.1 +pkgver=2.0.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc="A chm (MS HTML help file format) viewer based on xulrunner." url="http://chmsee.googlecode.com/" license=('GPL') -depends=('xulrunner>18.0' 'xulrunner<23.0' 'chmlib' 'desktop-file-utils') +depends=('xulrunner>21.0' 'xulrunner<24.0' 'chmlib' 'desktop-file-utils') makedepends=('python2') #source=(chmsee-$pkgver.tar.gz::https://github.com/jungleji/chmsee/tarball/v$pkgver #source=(https://github.com/jungleji/chmsee/archive/b2a3c2ad32bfe9db067665ea1928d7e130d1b5e7.zip source=(https://chmsee.googlecode.com/files/${pkgname}-${pkgver}.tar.gz chmsee) install=chmsee.install -md5sums=('08f813d65ed2a9e3af8ff1092650d0a5' +md5sums=('c6a6ce009395c72ecf0530500ecda37c' '1787edd1de8aa75bd9fa75a5ab319e85') build() { cd ${srcdir}/chmsee-*/src cp Makefile.arch Makefile - sed -i -e 's/17.*/18.0/g' ../application.ini - sed -i -e 's/21.*/22.*/g' ../application.ini + #sed -i -e 's/17.*/18.0/g' ../application.ini + #sed -i -e 's/21.*/22.*/g' ../application.ini # xpcom has been merged into xul in xulrunner 22.0 - sed -i -e 's/-lxpcom/-lxul/' common.mk + # sed -i -e 's/-lxpcom/-lxul/' common.mk make -j1 } diff --git a/community/cinnamon-screensaver/PKGBUILD b/community/cinnamon-screensaver/PKGBUILD index 0fdc354ef..7b0cfa99c 100644 --- a/community/cinnamon-screensaver/PKGBUILD +++ b/community/cinnamon-screensaver/PKGBUILD @@ -5,7 +5,7 @@ pkgname=cinnamon-screensaver pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="Screensaver designed to integrate well with the Cinnamon desktop." arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -15,15 +15,13 @@ depends=('cinnamon' 'gnome-screensaver') makedepends=('intltool' 'gnome-common') options=(!emptydirs) source=($pkgname-$pkgver.tar.gz::https://github.com/linuxmint/cinnamon-screensaver/archive/$pkgver.tar.gz - cinnamon-screensaver.desktop - cinnamon2d-screensaver.desktop cinnamon-screensaver.pam - fix-dbus-compatibility.patch) + fix-dbus-compatibility.patch + lock_screen_on_suspend.patch) sha256sums=('e85722d5af2ecbed98f50909285b335d7635214bf8cada49964f60bb5d1339c1' - '2f29a72991deb5cc2b44da06f49d1115148fee6a0a22b1abfecee1c1661abcaa' - '335df8f2fb270484829d94995622521f0a42a12d6887f7de827db34fc81f583a' 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda' - 'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6') + 'eebd1d056c21d2d3f60fb954677b9214fd1d575ed1c2bbb56326cedf41a39eb6' + '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8') build() { cd $pkgname-$pkgver @@ -32,6 +30,9 @@ build() { # Fix compatibility with gnome-screensaver's D-Bus interface and various fixes patch -Np1 -i ${srcdir}/fix-dbus-compatibility.patch + # Lock screen on suspend with systemd + patch -Np1 -i ${srcdir}/lock_screen_on_suspend.patch + ./autogen.sh --prefix=/usr --sysconfdir=/etc \ --libexecdir=/usr/lib/cinnamon-screensaver \ --localstatedir=/var \ @@ -48,6 +49,12 @@ package() { rm "$pkgdir"/usr/bin/gnome-screensaver{,-command} # Autostart only in Cinnamon - install -m644 "$srcdir/cinnamon-screensaver.desktop" "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" - install -m644 "$srcdir/cinnamon2d-screensaver.desktop" "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop" + cp "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" \ + "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop" + sed -i 's/^OnlyShowIn=.*/OnlyShowIn=GNOME;/' \ + "$pkgdir"/etc/xdg/autostart/cinnamon{,2d}-screensaver.desktop + echo 'AutostartCondition=GNOME3 if-session cinnamon' \ + >> "$pkgdir/etc/xdg/autostart/cinnamon-screensaver.desktop" + echo 'AutostartCondition=GNOME3 if-session cinnamon2d' \ + >> "$pkgdir/etc/xdg/autostart/cinnamon2d-screensaver.desktop" } diff --git a/community/cinnamon-screensaver/cinnamon-screensaver.desktop b/community/cinnamon-screensaver/cinnamon-screensaver.desktop deleted file mode 100644 index 75c81ca26..000000000 --- a/community/cinnamon-screensaver/cinnamon-screensaver.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Cinnamon Screensaver -Comment=Launch screensaver and locker program -Icon=preferences-desktop-screensaver -Exec=cinnamon-screensaver -OnlyShowIn=GNOME; -AutostartCondition=GNOME3 if-session cinnamon -NoDisplay=true -X-GNOME-Autostart-Phase=Application -X-GNOME-Autostart-Notify=true diff --git a/community/cinnamon-screensaver/cinnamon2d-screensaver.desktop b/community/cinnamon-screensaver/cinnamon2d-screensaver.desktop deleted file mode 100644 index d9d50012c..000000000 --- a/community/cinnamon-screensaver/cinnamon2d-screensaver.desktop +++ /dev/null @@ -1,11 +0,0 @@ -[Desktop Entry] -Type=Application -Name=Cinnamon Screensaver -Comment=Launch screensaver and locker program -Icon=preferences-desktop-screensaver -Exec=cinnamon-screensaver -OnlyShowIn=GNOME; -AutostartCondition=GNOME3 if-session cinnamon2d -NoDisplay=true -X-GNOME-Autostart-Phase=Application -X-GNOME-Autostart-Notify=true diff --git a/community/cinnamon-screensaver/lock_screen_on_suspend.patch b/community/cinnamon-screensaver/lock_screen_on_suspend.patch new file mode 100644 index 000000000..5c273c70e --- /dev/null +++ b/community/cinnamon-screensaver/lock_screen_on_suspend.patch @@ -0,0 +1,51 @@ +From f8f9beb6a3bf81240d36bfec43e5db9b102ea91e Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martinpitt@gnome.org> +Date: Wed, 1 May 2013 10:55:49 -0700 +Subject: [PATCH] Lock screen on suspend + +Listen for logind's PrepareForSleep signal, and lock the screen (if configured +to do so). This mirrors what gnome-shell's screensaver does. +--- + src/gs-listener-dbus.c | 28 ++++++++++++++++++++++++++++ + src/gs-listener-dbus.h | 1 + + src/gs-monitor.c | 20 ++++++++++++++++++++ + 3 files changed, 49 insertions(+) + +diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c +index 7f718fa..49586fd 100644 +--- a/src/gs-listener-dbus.c ++++ b/src/gs-listener-dbus.c +@@ -871,6 +872,17 @@ listener_dbus_handle_system_message (DBusConnection *connection, + } + + return DBUS_HANDLER_RESULT_HANDLED; ++ } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_INTERFACE, "PrepareForSleep")) { ++ gboolean active; ++ if (dbus_message_get_args (message, NULL, ++ DBUS_TYPE_BOOLEAN, &active, ++ DBUS_TYPE_INVALID) && active) { ++ gs_debug ("systemd notified that system is about to sleep"); ++ g_signal_emit (listener, signals [LOCK], 0); ++ } else { ++ gs_debug ("cannot parse PrepareForSleep"); ++ } ++ return DBUS_HANDLER_RESULT_HANDLED; + } else if (dbus_message_is_signal (message, DBUS_INTERFACE_PROPERTIES, "PropertiesChanged")) { + + if (_listener_message_path_is_our_session (listener, message)) { +@@ -1370,6 +1392,12 @@ gs_listener_acquire (GSListener *listener, + ",interface='"DBUS_INTERFACE_PROPERTIES"'" + ",member='PropertiesChanged'", + NULL); ++ dbus_bus_add_match (listener->priv->system_connection, ++ "type='signal'" ++ ",sender='"SYSTEMD_LOGIND_SERVICE"'" ++ ",interface='"SYSTEMD_LOGIND_INTERFACE"'" ++ ",member='PrepareForSleep'", ++ NULL); + + return (res != -1); + } +-- +1.8.1.2 + diff --git a/community/codeblocks/PKGBUILD b/community/codeblocks/PKGBUILD index 3094044db..9cceeb3ae 100644 --- a/community/codeblocks/PKGBUILD +++ b/community/codeblocks/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94017 2013-07-13 12:31:23Z svenstaro $ +# $Id: PKGBUILD 96531 2013-08-31 09:00:41Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Robert Hollencamp <rhollencamp@gmail.com> # Contributor: Daniel J Griffiths <griffithsdj@inbox.com> @@ -6,7 +6,7 @@ pkgname=codeblocks pkgver=12.11 -pkgrel=3 +pkgrel=4 pkgdesc='Open source and cross-platform C/C++ IDE' arch=('i686' 'x86_64' 'mips64el') url='http://www.codeblocks.org' diff --git a/community/codeblocks/codeblocks.install b/community/codeblocks/codeblocks.install index 04d31f75b..bc2b14aff 100644 --- a/community/codeblocks/codeblocks.install +++ b/community/codeblocks/codeblocks.install @@ -2,7 +2,7 @@ pkgname=codeblocks post_install() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime + update-mime-database usr/share/mime &>/dev/null update-desktop-database -q ln -s /usr/lib/libwxflatnotebook.so /usr/lib/libwxflatnotebook.so.0 ln -s /usr/lib/libwxchartctrl.so /usr/lib/libwxchartctrl.so.0 @@ -21,6 +21,6 @@ post_upgrade() { pre_remove() { gtk-update-icon-cache -q -t -f usr/share/icons/hicolor - update-mime-database usr/share/mime + update-mime-database usr/share/mime &>/dev/null update-desktop-database -q } diff --git a/community/darkhttpd/PKGBUILD b/community/darkhttpd/PKGBUILD index 247f77f7e..d9bc86e41 100644 --- a/community/darkhttpd/PKGBUILD +++ b/community/darkhttpd/PKGBUILD @@ -1,26 +1,37 @@ -# $Id: PKGBUILD 91852 2013-05-28 17:25:58Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer: Vesa Kaihlavirta <vegai@iki.fi> - pkgname=darkhttpd pkgver=1.9 -pkgrel=2 -pkgdesc="A small, static webserver" +pkgrel=4 +pkgdesc="A small and secure static webserver" arch=('i686' 'x86_64' 'mips64el') url="http://dmr.ath.cx/net/darkhttpd/" license=('BSD') depends=('glibc') -source=($url/$pkgname-$pkgver.tar.bz2) -md5sums=('156f239af542028c3fb5c2248aa0db8d') +source=("$url/$pkgname-$pkgver.tar.bz2" + 'darkhttpd.service' + 'darkhttpd.socket') +sha256sums=('33ef622069dc167bcf85e46482388f2d6555e25796f64a6c5b215d939f2b41c8' + 'a93af5e470c4d7363468b9a43a9a15b6c18f0fdf19495ce5555f3debca0d958b' + '3a5ad507b72c0c37e3255a70a5dcd8c8c79b728efd07a2dc2f6786f9b9cc3c1b') +sha256sums=('33ef622069dc167bcf85e46482388f2d6555e25796f64a6c5b215d939f2b41c8' + 'c0c8885682aca80474986080b5426f73dbf37237d02e3fc9035ac72ba74cdb1b' + '3a5ad507b72c0c37e3255a70a5dcd8c8c79b728efd07a2dc2f6786f9b9cc3c1b') build() { - cd $srcdir/$pkgname-$pkgver + cd "$srcdir/$pkgname-$pkgver" make } package() { - cd $srcdir/$pkgname-$pkgver - install -D $srcdir/$pkgname-$pkgver/darkhttpd $pkgdir/usr/bin/darkhttpd - mkdir -p $pkgdir/usr/share/licenses/$pkgname - head -n 18 darkhttpd.c >$pkgdir/usr/share/licenses/$pkgname/license + cd "$srcdir/$pkgname-$pkgver" + + # install darkhttpd: + install -Dm755 "$srcdir/$pkgname-$pkgver/darkhttpd" "$pkgdir/usr/bin/darkhttpd" + + # install systemd files: + install -Dm644 "$srcdir/darkhttpd.service" "$pkgdir/usr/lib/systemd/system/darkhttpd.service" + install -Dm644 "$srcdir/darkhttpd.socket" "$pkgdir/usr/lib/systemd/system/darkhttpd.socket" + + # install license" + install -d "$pkgdir/usr/share/licenses/$pkgname" + head -n 18 darkhttpd.c > "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/darkhttpd/darkhttpd.service b/community/darkhttpd/darkhttpd.service new file mode 100644 index 000000000..c4b338559 --- /dev/null +++ b/community/darkhttpd/darkhttpd.service @@ -0,0 +1,9 @@ +[Unit] +Description=Darkhttpd Webserver + +[Service] +ExecStart=/usr/bin/darkhttpd /srv/http --daemon --uid nobody --gid nobody --chroot +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/community/darkhttpd/darkhttpd.socket b/community/darkhttpd/darkhttpd.socket new file mode 100644 index 000000000..8277e7d02 --- /dev/null +++ b/community/darkhttpd/darkhttpd.socket @@ -0,0 +1,9 @@ +[Unit] +Conflicts=darkhttpd.service + +[Socket] +ListenStream=80 +Accept=no + +[Install] +WantedBy=sockets.target diff --git a/community/dbmail/PKGBUILD b/community/dbmail/PKGBUILD index ece9a4ea0..289da9ffe 100644 --- a/community/dbmail/PKGBUILD +++ b/community/dbmail/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96159 2013-08-20 15:00:35Z spupykin $ +# $Id: PKGBUILD 96628 2013-09-02 14:22:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sebastian Faltoni <sebastian.faltoni@gmail.com> pkgname=dbmail -pkgver=3.1.3 +pkgver=3.1.4 pkgrel=1 pkgdesc="Fast and scalable sql based mail services" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ source=(http://www.dbmail.org/download/3.1/dbmail-${pkgver/_/-}.tar.gz dbmail-lmtpd.xinetd dbmail-pop3d.xinetd dbmail-timsieved.xinetd) -md5sums=('0cce94b687226dde3cbcbaddc8e5a76c' +md5sums=('0090bb7998469e963d2eb49b7d16ea3f' 'c4b5793c5422b62a675d4c66ff7e9300' '5a6297cb03c8d0b424f978ea1d7402de' '070db88538af9833f003f4cb516d337b' diff --git a/community/devil/PKGBUILD b/community/devil/PKGBUILD index fb69dc325..44ef5c3c4 100644 --- a/community/devil/PKGBUILD +++ b/community/devil/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90014 2013-05-06 19:36:37Z foutrelis $ +# $Id: PKGBUILD 96404 2013-08-28 00:08:35Z eric $ # Maintainer: Laurent Carlier <lordheavym@gmail.org> # Contributor: damir <damir@archlinux.org> # Contributor: TheHoff <forums> pkgname=devil pkgver=1.7.8 -pkgrel=16 +pkgrel=17 pkgdesc="Library for reading several different image formats" arch=('i686' 'x86_64' 'mips64el') url="http://openil.sourceforge.net/" diff --git a/community/directfb/PKGBUILD b/community/directfb/PKGBUILD index 91e856541..499c7456e 100644 --- a/community/directfb/PKGBUILD +++ b/community/directfb/PKGBUILD @@ -1,24 +1,25 @@ -# $Id: PKGBUILD 90017 2013-05-06 19:36:41Z foutrelis $ +# $Id: PKGBUILD 96481 2013-08-30 15:29:14Z spupykin $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=directfb -pkgver=1.6.3 -pkgrel=2 +pkgver=1.7.0 +pkgrel=1 pkgdesc="A thin library that provides hardware graphics acceleration, input device handling and abstraction, integrated windowing system on top of the Linux Framebuffer Device" arch=('i686' 'x86_64' 'mips64el') url="http://www.directfb.org" license=('LGPL') -depends=('gcc-libs' 'libjpeg' 'sdl' 'libpng' 'freetype2') +depends=('gcc-libs' 'libjpeg' 'sdl' 'libpng' 'freetype2' 'libdrm' 'libgl' 'mesa') options=('!libtool') source=(http://www.directfb.org/downloads/Core/DirectFB-${pkgver%.*}/DirectFB-${pkgver}.tar.gz) -sha1sums=('0433c5999044ec9701481a92e50c0760cdb50c41') +sha1sums=('095852479098a55be2b0c6a0250af4159ee16e7c') build() { cd DirectFB-${pkgver} ./configure --prefix=/usr --sysconfdir=/etc --enable-static \ --enable-zlib --enable-x11 --enable-sdl --disable-vnc --disable-osx \ - --enable-video4linux2 --enable-voodoo + --enable-video4linux2 --enable-voodoo \ + --enable-mesa --enable-drmkms make } diff --git a/community/dspam/PKGBUILD b/community/dspam/PKGBUILD index 004e16c46..226f19ddc 100644 --- a/community/dspam/PKGBUILD +++ b/community/dspam/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90661 2013-05-13 14:22:46Z spupykin $ +# $Id: PKGBUILD 96455 2013-08-29 15:08:36Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: William Rea <sillywilly@gmail.com> pkgname=dspam pkgver=3.10.2 -pkgrel=5 +pkgrel=7 pkgdesc="A scalable, open-source statistical anti-spam filter" arch=('i686' 'x86_64' 'mips64el') url="http://dspam.nuclearelephant.com/" @@ -39,7 +39,7 @@ build() { --enable-split-configuration --enable-syslog --enable-clamav \ --with-dspam-home=/var/lib/dspam --with-logdir=/var/log/dspam --with-logfile=/var/log/dspam/dspam.log \ --with-mysql-includes=/usr/include/mysql --with-mysql-libraries=/usr/lib \ - --with-storage-driver="mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv,hash_drv" --enable-preferences-extension" + --with-storage-driver="hash_drv,mysql_drv,libdb4_drv,pgsql_drv,sqlite3_drv" --enable-preferences-extension" cd $srcdir/$pkgname-$pkgver [ $NOEXTRACT -eq 1 ] || ./configure --prefix=/usr --sysconfdir=/etc/dspam --localstatedir=/var ${OPTS} @@ -65,7 +65,7 @@ package() { -e 's:^#*\(ServerPID[\t ]\{1,\}\).*:\1/run/dspam/dspam.pid:gI' \ -i $pkgdir/etc/dspam/dspam.conf - sed -i 's|/var/lib/mysql/mysql.sock|/tmp/mysql.sock|' $pkgdir/etc/dspam/dspam.conf + sed -i 's|/var/lib/mysql/mysql.sock|/run/mysqld/mysqld.sock|' $pkgdir/etc/dspam/dspam.conf cp -r src/tools.mysql_drv/*.sql $pkgdir/usr/share/dspam/mysql cp -r src/tools.pgsql_drv/*.sql $pkgdir/usr/share/dspam/pgsql diff --git a/community/dspam/dspam.install b/community/dspam/dspam.install index 4eac46ede..0cdd54772 100644 --- a/community/dspam/dspam.install +++ b/community/dspam/dspam.install @@ -5,8 +5,10 @@ post_install() { useradd -c "DSPAM Daemon" -u 115 -d /var/lib/dspam -g dspam -s /bin/false dspam \ && echo "done." passwd -l dspam &>/dev/null - chown root:dspam usr/bin/dspamc - chmod g+s usr/bin/dspamc + chown root:dspam usr/bin/dspam{,c} + chown -R root:dspam etc/dspam + chmod g+rs usr/bin/dspam{,c} + systemd-tmpfiles --create dspam.conf cat << EOF >>> To populate the DSPAM database, you need to follow several steps. @@ -23,15 +25,17 @@ cat << EOF >>> Enter the password you set in the previous step, and the database should be populated. >>> Remember to edit /etc/dspam/dspam.conf accordenly ->>> If you want to use the postgresql, sqlite3 or Berekely DB4 backends, +>>> If you want to use the postgresql, sqlite3 or Berekely DB4 backends, >>> read the documentation >>> EOF } post_upgrade() { - chown root:dspam usr/bin/dspamc + chown root:dspam usr/bin/dspam{,c} + chown -R root:dspam etc/dspam chmod g+s usr/bin/dspamc + systemd-tmpfiles --create dspam.conf } post_remove() { diff --git a/community/ekg2/PKGBUILD b/community/ekg2/PKGBUILD index a15bad499..8e6fd4c8c 100644 --- a/community/ekg2/PKGBUILD +++ b/community/ekg2/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94920 2013-08-01 07:01:09Z bpiotrowski $ +# $Id: PKGBUILD 96537 2013-08-31 09:41:14Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Mateusz Herych <heniekk@gmail.com> pkgname=ekg2 pkgver=0.3.1 -pkgrel=7 +pkgrel=8 pkgdesc='Ncurses based Jabber, Gadu-Gadu, Tlen and IRC client' arch=('i686' 'x86_64' 'mips64el') url="http://ekg2.org/" @@ -16,7 +16,7 @@ optdepends=('xosd: xosd support' source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-$pkgver.tar.gz ekg2-0.3.1-giflib5.patch) md5sums=('68fc05b432c34622df6561eaabef5a40' - 'f3b6979e9b8705b0b9c7efd3f3a808fd') + 'e5855316bf7e9b456ebabb7cb9340e98') prepare() { cd $pkgname-$pkgver diff --git a/community/ekg2/ekg2-0.3.1-giflib5.patch b/community/ekg2/ekg2-0.3.1-giflib5.patch index f0e6885c0..d11b1ecec 100644 --- a/community/ekg2/ekg2-0.3.1-giflib5.patch +++ b/community/ekg2/ekg2-0.3.1-giflib5.patch @@ -1,12 +1,30 @@ diff -rupN a/plugins/gg/commands.c b/plugins/gg/commands.c --- a/plugins/gg/commands.c 2011-03-17 18:08:11.000000000 +0100 -+++ b/plugins/gg/commands.c 2013-07-29 18:45:51.296790942 +0200 -@@ -1034,7 +1034,7 @@ static int token_gif_load (char *fname, ++++ b/plugins/gg/commands.c 2013-08-31 11:31:42.521377436 +0200 +@@ -1029,14 +1029,15 @@ static int token_gif_load (char *fname, + GifFileType *file; + int fd; + fd = open(fname, O_RDONLY); ++ int giferror; + if (fd == -1) { + snprintf(errbuf, sizeof(errbuf), "open(%s): %m", fname); goto err; } - if (!(file = DGifOpenFileHandle(fd))) { -+ if (!(file = DGifOpenFileHandle(fd, NULL))) { ++ if (!(file = DGifOpenFileHandle(fd, giferror))) { snprintf(errbuf, sizeof(errbuf), "DGifOpenFileHandle(): %d", - GifLastError()); +- GifLastError()); ++ GifErrorString(giferror)); goto err2; + } + +@@ -1046,7 +1047,7 @@ static int token_gif_load (char *fname, + } + + if (DGifSlurp(file) != GIF_OK) { +- snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifLastError()); ++ snprintf(errbuf, sizeof(errbuf), "DGifSlurp(): %d", GifErrorString(GIF_ERROR)); + goto err3; + } + diff --git a/community/fb-client/PKGBUILD b/community/fb-client/PKGBUILD index b90d1b60f..a3977275c 100644 --- a/community/fb-client/PKGBUILD +++ b/community/fb-client/PKGBUILD @@ -1,16 +1,16 @@ # Maintainer: Florian "Bluewind" Pritz <flo@xssn.at> pkgname=fb-client -pkgver=1.2 +pkgver=1.3.0 pkgrel=1 pkgdesc="Client for paste.xinu.at" arch=('i686' 'x86_64' 'mips64el') url="http://paste.xinu.at" license=('GPL3') -depends=('curl') +depends=('curl' 'bash') optdepends=('xclip: for automatically copying the URL into the clipboard') source=(http://paste.xinu.at/data/client/fb-$pkgver.tar.gz{,.sig}) -md5sums=('2033c547bd44a27d464fa61065f29a77' +md5sums=('e715b53883a7f9e3fc5942c78618dbdf' 'SKIP') build() { diff --git a/community/fcron/PKGBUILD b/community/fcron/PKGBUILD index cf512694c..a7fe33a33 100644 --- a/community/fcron/PKGBUILD +++ b/community/fcron/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 91897 2013-05-29 00:39:11Z seblu $ +# $Id: PKGBUILD 96423 2013-08-28 15:04:05Z seblu $ # Contributor: Giorgio Lando <lando at imap dot cc> # Contributor: Sergej Pupykin # Contributor: Thomas Bächler @@ -7,13 +7,17 @@ pkgname=fcron pkgver=3.1.2 -pkgrel=7 +pkgrel=8 pkgdesc='Feature-rich cron implementation' arch=(i686 x86_64 mips64el) url='http://fcron.free.fr' license=('GPL') depends=('pam' 'run-parts') -makedepends=('smtp-forwarder' 'vi') +makedepends=('smtp-forwarder' 'vi' 'fcron') +# use fcron as recursive deps to have user fcron installed during installation +# else add the following in build chroot +# groupadd -g 23 fcron +# useradd -r -d /var/spool/fcron -u 23 -g 23 fcron optdepends=('smtp-forwarder: to send mails from cron jobs' 'vi: default editor for fcrontab') provides=('cron') @@ -30,13 +34,14 @@ md5sums=('36bf213e15f3a480f2274f8e46cced0a' build() { cd $pkgname-$pkgver + # Don't use --username=root and --groupname=root, this completly break + # fcron security and allow local root escalation. + # Thanks to Anh K. Huynh <kyanh@theslinux.org> for reporting it. ./configure --prefix=/usr \ --sbindir=/usr/bin \ --sysconfdir=/etc/fcron \ --with-answer-all=no \ --with-boot-install=no \ - --with-username=root \ - --with-groupname=root \ --datarootdir=/usr/share \ --datadir=/usr/share \ --with-docdir=/usr/share/doc \ @@ -44,22 +49,20 @@ build() { --with-systemdsystemunitdir=/usr/lib/systemd/system \ --with-piddir=/run \ --with-editor=/usr/bin/vi \ - --with-sendmail=/usr/sbin/sendmail + --with-sendmail=/usr/bin/sendmail make } package() { cd $pkgname-$pkgver - make DESTDIR="$pkgdir/" install - install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcron.pam" "$pkgdir/etc/pam.d/fcron" - - install -D -m644 "$srcdir/$pkgname-$pkgver/files/fcrontab.pam" "$pkgdir/etc/pam.d/fcrontab" + install -Dm644 files/fcron.pam "$pkgdir/etc/pam.d/fcron" + install -Dm644 files/fcrontab.pam "$pkgdir/etc/pam.d/fcrontab" # Install a default fcrontab so that fcron can completely replace dcron # We doesn't use binary format which is incompatible between arch and may cause crash # We regenerate the binary format at each update - install -D -m640 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" + install -Dm640 "$srcdir/systab.orig" "$pkgdir/var/spool/fcron/systab.orig" # Add cron.* directories install -d -m755 "$pkgdir/etc/cron.daily" diff --git a/community/fcron/fcron.install b/community/fcron/fcron.install index f7b0abddf..eda215a44 100644 --- a/community/fcron/fcron.install +++ b/community/fcron/fcron.install @@ -1,5 +1,8 @@ # arg 1: the new package version post_install() { + # we need a dedicated fcron user + getent group fcron >/dev/null || groupadd -g 23 fcron + getent passwd fcron >/dev/null || useradd -r -d /var/spool/fcron -u 23 -g 23 fcron # Generate binary format which is incompatible between arch fcrontab -z -u systab &>/dev/null } @@ -8,6 +11,34 @@ post_install() { # arg 2: the old package version post_upgrade() { post_install "$1" + if (( $(vercmp $2 3.1.2-8) < 0 )); then + echo 'Previous versions of fcron allow root priviledge escalation by using' + echo 'runas option in crontabs. fcron check rights at crontab compilation.' + echo 'Thus, the migration script will recreate the binary crontabs' + echo 'for you (with all side effects) and fix the files rights.' + # fix invalid etc files + for _f in /etc/fcron/fcron.{conf,allow,deny}; do + [[ -e $_f ]] || continue + chown root:fcron "$_f" + chmod 640 "$_f" + done + # fix invalid spool directory + chown fcron:fcron /var/spool/fcron + chmod 770 /var/spool/fcron + # regen user fcron files + cd /var/spool/fcron + for _f in *; do + if [[ "${_f%.orig}" != "$_f" ]]; then + chgrp fcron "$_f" + fcrontab -z -u "${_f%.orig}" &>/dev/null + fi + done + fi +} + +post_remove() { + userdel fcron &>/dev/null + groupdel fcron &>/dev/null } # vim:set ts=2 sw=2 et: diff --git a/community/geos/PKGBUILD b/community/geos/PKGBUILD index 08b44619c..ead6223e9 100644 --- a/community/geos/PKGBUILD +++ b/community/geos/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 88623 2013-04-20 17:34:23Z jlichtblau $ +# $Id: PKGBUILD 96649 2013-09-02 18:54:25Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org # Contributor: William Rea <sillywilly@gmail.com> # Contributor: Alexander Rødseth <rodseth@gmail.com> pkgname=geos -pkgver=3.3.8 +pkgver=3.4.2 pkgrel=1 pkgdesc="C++ port of the Java Topology Suite" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('gcc-libs' 'bash') options=('!libtool' '!emptydirs') changelog=$pkgname.changelog source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('ebecd4d1a71bcc28e5e883296cd8c52a80d5596335e74728f320989734fa503b') +sha256sums=('15e8bfdf7e29087a957b56ac543ea9a80321481cef4d4f63a7b268953ad26c53') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/geos/geos.changelog b/community/geos/geos.changelog index a230f5fcf..2592a89c3 100644 --- a/community/geos/geos.changelog +++ b/community/geos/geos.changelog @@ -1,3 +1,6 @@ +2013-09-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * geos 3.4.1-1 + 2013-04-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * geos 3.3.8-1 diff --git a/community/glfw/PKGBUILD b/community/glfw/PKGBUILD index 61a452b02..7b0cecc9e 100644 --- a/community/glfw/PKGBUILD +++ b/community/glfw/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93104 2013-06-24 11:26:57Z svenstaro $ +# $Id: PKGBUILD 96501 2013-08-30 19:17:19Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: philefou <tuxication AT gmail DOT com> # Contributor: lindquist <tomas@famolsen.dk> @@ -7,8 +7,8 @@ # Contributor: SpepS <dreamspepser at yahoo dot it> pkgname=glfw -pkgver=3.0.1 -pkgrel=2 +pkgver=3.0.2 +pkgrel=1 pkgdesc="A free, open source, portable framework for OpenGL application development" arch=('i686' 'x86_64' 'mips64el') url="http://www.glfw.org/" @@ -16,7 +16,7 @@ license=('custom:ZLIB') depends=('libgl' 'libxrandr' 'glu' 'xorg-xinput') makedepends=('mesa' 'cmake' 'doxygen') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2") -md5sums=('b67fa7191e9cff0cf0caa7f16f80c658') +md5sums=('35a3ef5e0a8137e6984c5fb892edb06c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch index 92f317cea..c06949310 100644 --- a/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch +++ b/community/gnome-panel/0001-Add-the-GNOME-Flashback-session.patch @@ -76,7 +76,7 @@ index 0000000..c012c58 @@ -0,0 +1,3 @@ +[GNOME Session] +_Name=GNOME Flashback -+RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;nautilus-classic;notification-daemon;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; ++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;metacity;notification-daemon;polkit-gnome-authentication-agent-1;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; diff --git a/po/POTFILES.in b/po/POTFILES.in index bc65c4c..a6aa6c7 100644 --- a/po/POTFILES.in diff --git a/community/gnome-panel/PKGBUILD b/community/gnome-panel/PKGBUILD index 46b671006..4740091d5 100644 --- a/community/gnome-panel/PKGBUILD +++ b/community/gnome-panel/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 90851 2013-05-14 21:40:37Z andrea $ +# $Id: PKGBUILD 96624 2013-09-02 13:22:45Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgbase=gnome-panel pkgname=('gnome-panel' 'gnome-flashback-session') pkgver=3.6.2 -pkgrel=6 +pkgrel=7 arch=('i686' 'x86_64' 'mips64el') license=('GPL') pkgdesc="Legacy GNOME panel" @@ -25,7 +25,7 @@ sha256sums=('a41c45c5512e796b8602ce50bf0d205993eab364c860aae31afa582d77b77079' '3a67f4b07a7dd356fad6b40a43983f3945123ed40080eb153396a481b34efc0c' 'e3298c62bc577969817c5d6752be83a5129004fd344e4f7998a0d8aa61874305' '9d742f675d9e09a032bfe00e0523a4ef7e234589a74a6086243bf335ce212775' - '9db0d1dadd2183777ed39e84caca1096a857897bbcf0e18ad599996dd397f1e0' + '79b6aab33bde167446ddea7f5c1a815dee150ba4a0678577464acbd2ba4a7504' '6828c097505d2dbbf465ed7ff694adbd646a0af2105c8dd864d1061bf0afea71') build() { @@ -69,7 +69,7 @@ package_gnome-flashback-session() { pkgdesc="Shell for Gnome 3 which was initially called Gnome Fallback" url="https://live.gnome.org/GnomeFlashback" depends=('gnome-screensaver' 'gnome-panel' 'gnome-session' 'gnome-settings-daemon' - 'gnome-settings-daemon-compat' 'gnome-themes-standard' 'metacity' 'nautilus' + 'gnome-settings-daemon-compat' 'gnome-themes-standard' 'metacity' 'notification-daemon' 'polkit-gnome') install= diff --git a/community/gnome-screensaver/PKGBUILD b/community/gnome-screensaver/PKGBUILD index 64d9a6cd9..5e75a441d 100644 --- a/community/gnome-screensaver/PKGBUILD +++ b/community/gnome-screensaver/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 93459 2013-07-03 14:24:20Z bgyorgy $ +# $Id: PKGBUILD 96399 2013-08-27 14:10:08Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> # Contributor: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver pkgver=3.6.1 -pkgrel=4 +pkgrel=5 pkgdesc="Legacy GNOME screensaver" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -17,11 +17,13 @@ optdepends=('gnome-themes-standard: default background') source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-screensaver.pam move-desktop-file.patch - fix-autoconf.patch) + fix-autoconf.patch + lock_screen_on_suspend.patch) sha256sums=('f39b78d4f7fed748c7f0a31d694112fb907c6d3c4e63db22eb858df07e962cd0' 'b6ea9e2eb586d94bcabb617a8f1c2958111df87afdbb51f645882bccdc15cbda' '4bb96f62aa069c83b629204a79a3f63b146bcaf773569aee8b5dd23fbcd88974' - 'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb') + 'c4da9c18b543ecbc781c1f103321b324a855bdd0979fd36b437f6033736ad4bb' + '516c479558576c6c5a2509abfcbf4fdafb5953d252e7a4ab972f9db6137daca8') build() { cd "$pkgname-$pkgver" @@ -32,6 +34,9 @@ build() { # Fix build patch -Np1 -i "$srcdir/fix-autoconf.patch" + # Lock screen on suspend with systemd + patch -Np1 -i "$srcdir/lock_screen_on_suspend.patch" + autoreconf -fi ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir=/usr/lib/$pkgname \ --with-mit-ext diff --git a/community/gnome-screensaver/lock_screen_on_suspend.patch b/community/gnome-screensaver/lock_screen_on_suspend.patch new file mode 100644 index 000000000..5c273c70e --- /dev/null +++ b/community/gnome-screensaver/lock_screen_on_suspend.patch @@ -0,0 +1,51 @@ +From f8f9beb6a3bf81240d36bfec43e5db9b102ea91e Mon Sep 17 00:00:00 2001 +From: Martin Pitt <martinpitt@gnome.org> +Date: Wed, 1 May 2013 10:55:49 -0700 +Subject: [PATCH] Lock screen on suspend + +Listen for logind's PrepareForSleep signal, and lock the screen (if configured +to do so). This mirrors what gnome-shell's screensaver does. +--- + src/gs-listener-dbus.c | 28 ++++++++++++++++++++++++++++ + src/gs-listener-dbus.h | 1 + + src/gs-monitor.c | 20 ++++++++++++++++++++ + 3 files changed, 49 insertions(+) + +diff --git a/src/gs-listener-dbus.c b/src/gs-listener-dbus.c +index 7f718fa..49586fd 100644 +--- a/src/gs-listener-dbus.c ++++ b/src/gs-listener-dbus.c +@@ -871,6 +872,17 @@ listener_dbus_handle_system_message (DBusConnection *connection, + } + + return DBUS_HANDLER_RESULT_HANDLED; ++ } else if (dbus_message_is_signal (message, SYSTEMD_LOGIND_INTERFACE, "PrepareForSleep")) { ++ gboolean active; ++ if (dbus_message_get_args (message, NULL, ++ DBUS_TYPE_BOOLEAN, &active, ++ DBUS_TYPE_INVALID) && active) { ++ gs_debug ("systemd notified that system is about to sleep"); ++ g_signal_emit (listener, signals [LOCK], 0); ++ } else { ++ gs_debug ("cannot parse PrepareForSleep"); ++ } ++ return DBUS_HANDLER_RESULT_HANDLED; + } else if (dbus_message_is_signal (message, DBUS_INTERFACE_PROPERTIES, "PropertiesChanged")) { + + if (_listener_message_path_is_our_session (listener, message)) { +@@ -1370,6 +1392,12 @@ gs_listener_acquire (GSListener *listener, + ",interface='"DBUS_INTERFACE_PROPERTIES"'" + ",member='PropertiesChanged'", + NULL); ++ dbus_bus_add_match (listener->priv->system_connection, ++ "type='signal'" ++ ",sender='"SYSTEMD_LOGIND_SERVICE"'" ++ ",interface='"SYSTEMD_LOGIND_INTERFACE"'" ++ ",member='PrepareForSleep'", ++ NULL); + + return (res != -1); + } +-- +1.8.1.2 + diff --git a/community/gnustep-base/PKGBUILD b/community/gnustep-base/PKGBUILD index b537d6626..be49f8bec 100644 --- a/community/gnustep-base/PKGBUILD +++ b/community/gnustep-base/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90154 2013-05-07 13:34:08Z spupykin $ +# $Id: PKGBUILD 96475 2013-08-30 14:07:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: Sebastian Sareyko <public@nooms.de> pkgname=gnustep-base -pkgver=1.24.4 +pkgver=1.24.5 pkgrel=1 pkgdesc="The GNUstep base package" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ conflicts=('gnustep-base-svn') groups=('gnustep-core') options=('!emptydirs' '!makeflags') source=(ftp://ftp.gnustep.org/pub/gnustep/core/$pkgname-$pkgver.tar.gz) -md5sums=('b300f3e6f9c27705226b741c8c018038') +md5sums=('df4e9786c6845d091a677b55d4e2c7c3') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 95e355016..674f2de25 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95534 2013-08-13 13:02:46Z arodseth $ +# $Id: PKGBUILD 96615 2013-09-02 10:55:16Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -8,11 +8,9 @@ # Contributor: Mike Rosset <mike.rosset@gmail.com> # Contributor: Daniel YC Lin <dlin.tw@gmail.com> -# TODO: Create split packages for the crosscompilation versions. Maybe. - pkgname=go pkgver=1.1.2 -pkgrel=1 +pkgrel=2 epoch=2 pkgdesc='Compiler and tools for the Go programming language from Google' arch=('x86_64' 'i686') @@ -24,23 +22,27 @@ options=('!strip') install="$pkgname.install" backup=('usr/lib/go/bin') -#if [ "$CARCH" == 'x86_64' ]; then -# source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" -# "$pkgname.sh") -# sha256sums=('ad583ff91bd2955fc48d24001785587e3c3b5ce5c09e4971a37028db4c3f6a98' -# '36202a833faeb8ea10760557a1e221025288480bdeebf776c8b610014aadc181') -#else +if [ "$CARCH" == 'x86_64' ]; then + source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-amd64.tar.gz" + "$pkgname.sh") + sha256sums=('ad583ff91bd2955fc48d24001785587e3c3b5ce5c09e4971a37028db4c3f6a98' + '36202a833faeb8ea10760557a1e221025288480bdeebf776c8b610014aadc181') +else source=("http://go.googlecode.com/files/${pkgname}$pkgver.linux-386.tar.gz" "$pkgname.sh") sha256sums=('56f384c973e58c098ec462bcd892a7c1166b9a392461970ddb22d57ed4d495af' '36202a833faeb8ea10760557a1e221025288480bdeebf776c8b610014aadc181') -#fi +fi build() { cd "$srcdir/$pkgname/src" export GOROOT_FINAL=/usr/lib/go + # We don't support SSE2 for i686, since many i686 CPUs don't have that. + # Build this package manually, build Go from AUR or use x86_64 instead. + export GO386=387 + # Enable ARM crosscompilation for linux export GOOS=linux export GOARCH=arm @@ -59,6 +61,8 @@ build() { check() { cd "$srcdir/$pkgname" + export GO386=387 + export GOOS=linux if [ "$CARCH" == 'x86_64' ]; then export GOARCH=amd64 diff --git a/community/gpicview/PKGBUILD b/community/gpicview/PKGBUILD index 4f6826bff..7abcc842a 100644 --- a/community/gpicview/PKGBUILD +++ b/community/gpicview/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 69882 2012-04-25 13:40:48Z bpiotrowski $ +# $Id: PKGBUILD 96672 2013-09-02 21:26:05Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> pkgname=gpicview pkgver=0.2.3 -pkgrel=1.1 +pkgrel=2 pkgdesc="lightweight image viewer" arch=('i686' 'x86_64' 'mips64el') license=('GPL2') @@ -15,8 +15,20 @@ depends=('gtk2' 'desktop-file-utils') install=$pkgname.install makedepends=('pkgconfig' 'intltool') optdepends=('librsvg: For SVG support') -source=(http://ftp.de.debian.org/debian/pool/main/g/$pkgname/${pkgname}_${pkgver}.orig.tar.xz) -md5sums=('0f1275b5b0ca66e48963a7ccda8a5019') +source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz + fix-scrolling.patch) +md5sums=('bca9ffe1d283ed3dbb13bada7feb7e89' + 'f258a3e703c4daa2f79c0c9f5a625d86') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + + # Fix scrolling (FS#34872) + patch -Np1 -i "$srcdir/fix-scrolling.patch" + + # Apply one main category only (FS#34684) + sed -i '/^Categories=/ s/Utility;//' gpicview.desktop.in +} build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/gpicview/fix-scrolling.patch b/community/gpicview/fix-scrolling.patch new file mode 100644 index 000000000..9323055ad --- /dev/null +++ b/community/gpicview/fix-scrolling.patch @@ -0,0 +1,149 @@ +From 88e76ee77d7271820dfad4b66ea1ca892e1a1ae0 Mon Sep 17 00:00:00 2001 +From: Vadim Ushakov <igeekless@gmail.com> +Date: Fri, 3 Aug 2012 22:43:29 +0800 +Subject: [PATCH] fix scrolling when scale == 1 + +--- + src/image-view.c | 98 ++++++++---------------------------------------------- + 1 files changed, 14 insertions(+), 84 deletions(-) + +diff --git a/src/image-view.c b/src/image-view.c +index cd40e3a..b367f2a 100644 +--- a/src/image-view.c ++++ b/src/image-view.c +@@ -309,65 +309,6 @@ void image_view_paint( ImageView* iv, GdkEventExpose* evt ) + { + // GdkRectangle& rect = rects[i]; + paint( iv, rects + i, GDK_INTERP_NEAREST ); +-#if 0 +- g_debug("dirty dest: x=%d, y=%d, w=%d, h=%d\nx_off=%d, y_off=%d", +- rect.x, rect.y, rect.width, rect.height, iv->img_area.x, iv->img_area.y ); +- +- if( ! gdk_rectangle_intersect( &rect, &iv->img_area, &rect ) ) +- continue; +- +- int dest_x = rect.x; +- int dest_y = rect.y; +- +- rect.x -= img_area.x; +- rect.y -= img_area.y; +- +- GdkPixbuf* src_pix = NULL; +- int src_x, src_y; +- if( iv->scale == 1.0 ) // original size +- { +- src_pix = (GdkPixbuf*)g_object_ref( pix ); +- src_x = rect.x; +- src_y = rect.y; +- } +- else // scaling is needed +- { +- GdkPixbuf* scaled_pix = NULL; +- int src_w, src_h; +- src_x = (int)floor( gdouble(rect.x) / scale + 0.5 ); +- src_y = (int)floor( gdouble(rect.y) / scale + 0.5 ); +- src_w = (int)floor( gdouble(rect.width) / scale + 0.5 ); +- src_h = (int)floor( gdouble(rect.height) / scale + 0.5 ); +- if( src_y > gdk_pixbuf_get_height(pix) ) +- src_y = gdk_pixbuf_get_height(pix); +- if( src_x + src_w > gdk_pixbuf_get_width(pix) ) +- src_w = gdk_pixbuf_get_width(pix) - src_x; +- if( src_y + src_h > gdk_pixbuf_get_height(pix) ) +- src_h = gdk_pixbuf_get_height(pix) - src_y; +- g_debug("orig src: x=%d, y=%d, w=%d, h=%d", +- src_x, src_y, src_w, src_h ); +- +- src_pix = gdk_pixbuf_new_subpixbuf( pix, src_x, src_y, src_w, src_h ); +- scaled_pix = gdk_pixbuf_scale_simple( src_pix, rect.width, rect.height, interp_type ); +- g_object_unref( src_pix ); +- src_pix = scaled_pix; +- +- src_x = 0; +- src_y = 0; +- } +- +- if( G_LIKELY(src_pix) ) +- { +- gdk_draw_pixbuf( widget->window, +- widget->style->fg_gc[GTK_STATE_NORMAL], +- src_pix, +- src_x, src_y, +- dest_x, dest_y, +- rect.width, rect.height, +- GDK_RGB_DITHER_NORMAL, 0, 0 ); +- g_object_unref( src_pix ); +- } +-#endif + } + g_free( rects ); + +@@ -525,28 +466,29 @@ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type ) + if( ! gdk_rectangle_intersect( invalid_rect, &iv->img_area, &rect ) ) + return; + +- int dest_x = rect.x; +- int dest_y = rect.y; +- +- rect.x -= iv->img_area.x; +- rect.y -= iv->img_area.y; ++ int dest_x; ++ int dest_y; + + GdkPixbuf* src_pix = NULL; +- int src_x, src_y; + if( iv->scale == 1.0 ) // original size + { + src_pix = (GdkPixbuf*)g_object_ref( iv->pix ); +- src_x = rect.x; +- src_y = rect.y; ++ dest_x = iv->img_area.x; ++ dest_y = iv->img_area.y; + } + else // scaling is needed + { ++ dest_x = rect.x; ++ dest_y = rect.y; ++ ++ rect.x -= iv->img_area.x; ++ rect.y -= iv->img_area.y; ++ + GdkPixbuf* scaled_pix = NULL; +- int src_w, src_h; +- src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 ); +- src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 ); +- src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 ); +- src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 ); ++ int src_x = (int)floor( ((gdouble)rect.x) / iv->scale + 0.5 ); ++ int src_y = (int)floor( ((gdouble)rect.y) / iv->scale + 0.5 ); ++ int src_w = (int)floor( ((gdouble)rect.width) / iv->scale + 0.5 ); ++ int src_h = (int)floor( ((gdouble)rect.height) / iv->scale + 0.5 ); + if( src_y > gdk_pixbuf_get_height( iv->pix ) ) + src_y = gdk_pixbuf_get_height( iv->pix ); + if( src_x + src_w > gdk_pixbuf_get_width( iv->pix ) ) +@@ -564,23 +506,11 @@ void paint( ImageView* iv, GdkRectangle* invalid_rect, GdkInterpType type ) + src_pix = scaled_pix; + } + +- src_x = 0; +- src_y = 0; + } + + if( G_LIKELY(src_pix) ) + { + GtkWidget* widget = (GtkWidget*)iv; +-/* +- gdk_draw_pixbuf( widget->window, +- widget->style->fg_gc[GTK_STATE_NORMAL], +- src_pix, +- src_x, src_y, +- dest_x, dest_y, +- rect.width, rect.height, +- GDK_RGB_DITHER_NORMAL, 0, 0 ); +-*/ +- // New function with cairo + cairo_t *cr = gdk_cairo_create (gtk_widget_get_window(widget)); + gdk_cairo_set_source_pixbuf (cr, src_pix, dest_x, dest_y); + cairo_paint (cr); +-- +1.7.4.1 + diff --git a/community/homebank/PKGBUILD b/community/homebank/PKGBUILD index d30e3cff3..affa75351 100644 --- a/community/homebank/PKGBUILD +++ b/community/homebank/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 95287 2013-08-08 19:36:00Z jlichtblau $ +# $Id: PKGBUILD 96645 2013-09-02 18:43:17Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: William Rea <sillywilly@gmail.com> pkgname=homebank -pkgver=4.5.1 +pkgver=4.5.2 pkgrel=1 pkgdesc="Free, easy, personal accounting for everyone" arch=('i686' 'x86_64' 'mips64el') @@ -28,3 +28,4 @@ package() { make DESTDIR="${pkgdir}" install } +sha256sums=('b3318255676a09e7d6f26a8d750f77f40cfeb1b54dffaff8765f14a85f98ae74') diff --git a/community/homebank/homebank.changelog b/community/homebank/homebank.changelog index ff3480d50..2866e49a6 100644 --- a/community/homebank/homebank.changelog +++ b/community/homebank/homebank.changelog @@ -1,3 +1,6 @@ +2013-09-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * homebank 4.5.2-1 + 2013-08-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * homebank 4.5.1-1 diff --git a/community/ht/PKGBUILD b/community/ht/PKGBUILD index 13d46b098..c46f91c22 100644 --- a/community/ht/PKGBUILD +++ b/community/ht/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 83652 2013-02-04 10:01:08Z spupykin $ +# $Id: PKGBUILD 96610 2013-09-02 10:46:09Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: tardo <tardo@nagi-fanboi.net> # Contributor: Simon Morgan <"mra84964@mra.pb.hx".decode('rot-13')> pkgname=ht -pkgver=2.0.21 +pkgver=2.0.22 pkgrel=1 pkgdesc="A file editor/viewer/analyzer for executables" arch=('i686' 'x86_64' 'mips64el') @@ -12,14 +12,17 @@ url="http://hte.sourceforge.net/" license=('GPL') depends=('gcc-libs' 'ncurses' 'lzo2') source=(http://downloads.sourceforge.net/sourceforge/hte/$pkgname-$pkgver.tar.gz) -md5sums=('419a25004421b9455430f523636bdcca') +md5sums=('ccd13f48e8e69f453bda2cb93ffdbfa0') build() { cd $srcdir/$pkgname-$pkgver ./configure --disable-x11-textmode --enable-release --prefix=/usr make - make DESTDIR=$pkgdir install +} +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=$pkgdir install # avoid TeX conflict mv $pkgdir/usr/bin/ht $pkgdir/usr/bin/hte } diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD index 58f13bcc5..b1341ae81 100644 --- a/community/iasl/PKGBUILD +++ b/community/iasl/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 91015 2013-05-17 22:04:55Z lcarlier $ +# $Id: PKGBUILD 96438 2013-08-28 21:10:55Z lcarlier $ # Maintainer : Laurent Carlier <lordheavym@gmail.com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com> pkgname=iasl -pkgver=20130517 +pkgver=20130823 pkgrel=1 pkgdesc="Intel ACPI Source Language compiler" arch=('i686' 'x86_64' 'mips64el') @@ -16,13 +16,13 @@ options=('!makeflags') #install=iasl.install source=(http://acpica.org/sites/acpica/files/acpica-unix-${pkgver}.tar.gz LICENSE) -md5sums=('99fa19c67c8fa95f90cb7ec0f29d6242' +md5sums=('7846a62551352d7dae6f93f8255e9d99' '8615526144f69ea4e870d9bc37df9b29') build() { cd "${srcdir}/acpica-unix-${pkgver}"/generate/unix - sed -i -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' Makefile.config + #sed -i -e 's/_CYGWIN/_LINUX/g' -e 's/-Werror//g' Makefile.config if [[ $CARCH == i686 ]]; then make BITS=32 @@ -41,5 +41,5 @@ package() { install -D -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -md5sums=('7846a62551352d7dae6f93f8255e9d99' +md5sums=('cc7528ecd185ff779c6b58bfede091b2' '8615526144f69ea4e870d9bc37df9b29') diff --git a/community/iftop/PKGBUILD b/community/iftop/PKGBUILD index 508beb19d..4cd95e129 100644 --- a/community/iftop/PKGBUILD +++ b/community/iftop/PKGBUILD @@ -1,20 +1,19 @@ -# $Id: PKGBUILD 92025 2013-05-30 23:36:54Z seblu $ +# $Id: PKGBUILD 96466 2013-08-30 08:54:27Z fyan $ # Maintainer: Daenyth <Daenyth+Arch at gmail dot com> # Contributor: Jeff Mickey <jeff@archlinux.org> # Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org> # Contributor: slubman <slubman@slubman.net> pkgname=iftop -pkgver=0.17 -pkgrel=11 -pkgdesc="iftop does for network usage what top(1) does for CPU usage" +pkgver=1.0pre2 +pkgrel=1 +pkgdesc="Display bandwidth usage on an interface" arch=('i686' 'x86_64' 'mips64el') url="http://www.ex-parrot.com/~pdw/iftop/" license=('GPL') depends=('libpcap' 'ncurses') -options=('!makeflags') +#options=('!makeflags') source=("http://www.ex-parrot.com/~pdw/$pkgname/download/$pkgname-$pkgver.tar.gz") -md5sums=('062bc8fb3856580319857326e0b8752d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -28,3 +27,4 @@ package() { make DESTDIR="$pkgdir" install } +sha512sums=('708172baa00a94671b494f33e7290af9ed4e0f764fabb500187855ee39840e379590274802e9ef360c128e881cfe0cefe7a12a9bfdcf9cfa7ffb49746b02300a') diff --git a/community/iodine/PKGBUILD b/community/iodine/PKGBUILD new file mode 100644 index 000000000..c84453015 --- /dev/null +++ b/community/iodine/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 96596 2013-09-02 07:16:12Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com> +# Contributor: Christian Hesse <mail@eworm.de> +# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com> +# Contributor: nofxx <x@nofxx.com> + +pkgname=iodine +pkgver=0.6.0rc1 +pkgrel=2 +pkgdesc='Tunnel IPv4 data through a DNS server' +arch=('i686' 'x86_64') +url='http://code.kryo.se/iodine' +license=('custom:ISC') +depends=('zlib') +source=("http://code.kryo.se/${pkgname}/${pkgname}-${pkgver/rc/-rc}.tar.gz") + +build() { + cd ${pkgname}-${pkgver/rc/-rc}/ + + make +} + +package() { + cd ${pkgname}-${pkgver/rc/-rc}/ + + make prefix=/usr sbindir=/usr/bin DESTDIR="${pkgdir}" install + install -d "${pkgdir}/usr/share/licenses/iodine" + sed -n '/AUTHORS & LICENSE/,$p' README > "${pkgdir}/usr/share/licenses/iodine/LICENSE" +} + +sha256sums=('dacf950198b68fd1dae09fe980080155b0c75718f581c08e069eee0c1b6c5e60') diff --git a/community/iverilog/PKGBUILD b/community/iverilog/PKGBUILD index 1cb86beee..a2dd806f6 100644 --- a/community/iverilog/PKGBUILD +++ b/community/iverilog/PKGBUILD @@ -4,16 +4,17 @@ # Contributor: Paulo Matias <matias archlinux-br org> pkgname=iverilog -pkgver=0.9.6 +pkgver=0.9.7 pkgrel=1 pkgdesc='Icarus Verilog compiler and simulation tool' arch=('x86_64' 'i686') url='http://iverilog.icarus.com/' +# http://iverilog.wikia.com/wiki/Release_Notes_Icarus_Verilog_0_9 license=('GPL') makedepends=('readline' 'gperf') depends=('bzip2' 'sh' 'gcc-libs' 'zlib') source=("ftp://ftp.icarus.com/pub/eda/verilog/v0.9/verilog-$pkgver.tar.gz") -sha256sums=('25304d5d58d6411fcd1ab94992a505215eea5a6bbd9779c2be2d9d19f38cd54a') +sha256sums=('7a5e72e17bfb4c3a59264d8f3cc4e70a7c49c1307173348fdd44e079388e7454') build() { cd "$srcdir/${pkgname/i}-$pkgver" diff --git a/community/java-rxtx/PKGBUILD b/community/java-rxtx/PKGBUILD new file mode 100644 index 000000000..5aa7bedcc --- /dev/null +++ b/community/java-rxtx/PKGBUILD @@ -0,0 +1,57 @@ +# $Id: PKGBUILD 96587 2013-09-01 23:49:41Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua + +pkgname=java-rxtx +_pkgname=rxtx +pkgver=2.2pre2 +pkgrel=2 +pkgdesc="Java library for serial IO" +arch=('i686' 'x86_64') +url="http://rxtx.qbang.org/" +license=('LGPL') +depends=('glibc' 'java-runtime') +makedepends=('java-environment') +options=('!libtool') +provides=("$_pkgname=$pkgver") +replaces=("$_pkgname") +install=$_pkgname.install +source=(http://rxtx.qbang.org/pub/$_pkgname/$_pkgname-$pkgver.zip + utsrelease.patch + rxtx-2.2-lock.patch + rxtx-2.2-fhs_lock.patch + ttyACM_port.patch) +md5sums=('7eedb18e3f33a427e2b0e9be8ce3f94c' + '2f21ec5eb108f871815242698b6150f1' + '1f7c43d582bfe9daea22d7f7057436da' + 'f4d22d263f45cd1d4db6242dd0ac78ae' + '903a3fe0067d0682dd5f64483c741df6') + +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + + # Fix build + patch -Np1 -i "$srcdir/utsrelease.patch" + + # Fix lockdir patch + patch -Np1 -i "$srcdir/rxtx-2.2-lock.patch" + + # Fix buffer overflow + patch -Np1 -i "$srcdir/rxtx-2.2-fhs_lock.patch" + + # Enable more ports + patch -Np1 -i "$srcdir/ttyACM_port.patch" +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static + make -j1 +} + +package() { + cd "$srcdir/$_pkgname-$pkgver" + mkdir -p "$pkgdir"/usr/{lib,share/java/rxtx} + make JHOME="$pkgdir/usr/share/java/rxtx" RXTX_PATH="$pkgdir/usr/lib" install +} diff --git a/community/java-rxtx/rxtx-2.2-fhs_lock.patch b/community/java-rxtx/rxtx-2.2-fhs_lock.patch new file mode 100644 index 000000000..5ec0685c2 --- /dev/null +++ b/community/java-rxtx/rxtx-2.2-fhs_lock.patch @@ -0,0 +1,13 @@ +--- ./src/SerialImp.c.orig 2011-03-17 14:42:48.946047373 -0500 ++++ ./src/SerialImp.c 2011-03-17 14:46:01.244904859 -0500 +@@ -5291,8 +5291,8 @@ + * + */ + int fd,j; +- char lockinfo[12], message[80]; +- char file[80], *p; ++ char lockinfo[12], message[200]; ++ char file[200], *p; + + j = strlen( filename ); + p = ( char * ) filename + j; diff --git a/community/java-rxtx/rxtx-2.2-lock.patch b/community/java-rxtx/rxtx-2.2-lock.patch new file mode 100644 index 000000000..c418fc4ad --- /dev/null +++ b/community/java-rxtx/rxtx-2.2-lock.patch @@ -0,0 +1,12 @@ +diff -up ./src/SerialImp.h.lock ./src/SerialImp.h +--- ./src/SerialImp.h.lock 2010-11-09 15:59:54.891179571 +0100 ++++ ./src/SerialImp.h 2010-11-09 16:01:12.257819409 +0100 +@@ -158,7 +158,7 @@ struct event_info_struct + # endif /* CMSPAR */ + # + # define DEVICEDIR "/dev/" +-# define LOCKDIR "/var/lock" ++# define LOCKDIR "/var/lock/lockdev" + # define LOCKFILEPREFIX "LCK.." + # define FHS + #endif /* __linux__ */ diff --git a/community/java-rxtx/rxtx.install b/community/java-rxtx/rxtx.install new file mode 100644 index 000000000..e0ddf215d --- /dev/null +++ b/community/java-rxtx/rxtx.install @@ -0,0 +1,3 @@ +post_install() { +echo "Users need to be in 'lock' and 'uucp' groups to connect to devices" +} diff --git a/community/java-rxtx/ttyACM_port.patch b/community/java-rxtx/ttyACM_port.patch new file mode 100644 index 000000000..da133c935 --- /dev/null +++ b/community/java-rxtx/ttyACM_port.patch @@ -0,0 +1,28 @@ +Description: Allows for the enumeration of many additional ports, including ttyACM for Arduino Unos +Author: Scott Howard <showard314@gmail.com> + +Index: rxtx/src/gnu/io/RXTXCommDriver.java +=================================================================== +--- rxtx.orig/src/gnu/io/RXTXCommDriver.java 2010-10-04 23:14:47.236148507 -0400 ++++ rxtx/src/gnu/io/RXTXCommDriver.java 2010-10-04 23:18:56.976108303 -0400 +@@ -574,20 +574,7 @@ + if(osName.equals("Linux")) + { + String[] Temp = { +- "ttyS", // linux Serial Ports + "ttySA", // for the IPAQs +- "ttyUSB", // for USB frobs +- "rfcomm", // bluetooth serial device +- "ttyircomm", // linux IrCommdevices (IrDA serial emu) +- }; +- CandidatePortPrefixes=Temp; +- } +- else if(osName.equals("Linux-all-ports")) +- { +- /* if you want to enumerate all ports ~5000 +- possible, then replace the above with this +- */ +- String[] Temp = { + "comx", // linux COMMX synchronous serial card + "holter", // custom card for heart monitoring + "modem", // linux symbolic link to modem. diff --git a/community/java-rxtx/utsrelease.patch b/community/java-rxtx/utsrelease.patch new file mode 100644 index 000000000..8e6babdd2 --- /dev/null +++ b/community/java-rxtx/utsrelease.patch @@ -0,0 +1,36 @@ +diff -Naur rxtx-2.2pre2.orig/src/I2CImp.c rxtx-2.2pre2/src/I2CImp.c +--- rxtx-2.2pre2.orig/src/I2CImp.c 2007-04-26 07:26:05.000000000 +0200 ++++ rxtx-2.2pre2/src/I2CImp.c 2013-08-10 13:28:54.690313710 +0200 +@@ -125,7 +125,7 @@ + sigaction( SIGIO, NULL, &handler ); + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ +-#if defined(__linux__) ++#if defined(DEBUG) && defined(__linux__) && defined(UTS_RELEASE) + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { +diff -Naur rxtx-2.2pre2.orig/src/RawImp.c rxtx-2.2pre2/src/RawImp.c +--- rxtx-2.2pre2.orig/src/RawImp.c 2007-11-18 23:32:42.000000000 +0100 ++++ rxtx-2.2pre2/src/RawImp.c 2013-08-10 13:28:54.703647364 +0200 +@@ -270,7 +270,7 @@ + sigaction( SIGIO, NULL, &handler ); + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ +-#if defined(__linux__) ++#if defined(DEBUG) && defined(__linux__) && defined(UTS_RELEASE) + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { +diff -Naur rxtx-2.2pre2.orig/src/RS485Imp.c rxtx-2.2pre2/src/RS485Imp.c +--- rxtx-2.2pre2.orig/src/RS485Imp.c 2007-04-26 07:26:05.000000000 +0200 ++++ rxtx-2.2pre2/src/RS485Imp.c 2013-08-10 13:28:54.706980778 +0200 +@@ -125,7 +125,7 @@ + sigaction( SIGIO, NULL, &handler ); + if( !handler.sa_handler ) signal( SIGIO, SIG_IGN ); + #endif /* !__FreeBSD__ */ +-#if defined(__linux__) ++#if defined(DEBUG) && defined(__linux__) && defined(UTS_RELEASE) + /* Lets let people who upgraded kernels know they may have problems */ + if (uname (&name) == -1) + { diff --git a/community/jnettop/PKGBUILD b/community/jnettop/PKGBUILD new file mode 100644 index 000000000..2c006554d --- /dev/null +++ b/community/jnettop/PKGBUILD @@ -0,0 +1,27 @@ +# $Id: PKGBUILD 96415 2013-08-28 09:24:47Z fyan $ +# Maintainer: Felix Yan <felixonmars@gmail.com +# Contributor: Paul Bredbury <brebs@sent.com> + +pkgname=jnettop +pkgver=0.13.0 +pkgrel=4 +pkgdesc="A top-like console network traffic visualizer" +arch=(i686 x86_64) +url="http://jnettop.kubs.info/wiki/" +license=('GPL') +depends=('libpcap' 'glib2') +makedepends=('pkgconfig') +source=("http://jnettop.kubs.info/dist/$pkgname-$pkgver.tar.gz") +md5sums=('9529d75011026b3fcaf185b2fb063881') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr --mandir=/usr/share/man + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD index 9859b3077..ca895708a 100644 --- a/community/lazarus/PKGBUILD +++ b/community/lazarus/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 92718 2013-06-13 12:56:35Z spupykin $ +# $Id: PKGBUILD 96456 2013-08-29 15:09:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jens Adam (byte/jra) <j_adam@web.de> # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com> pkgbase=lazarus pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt') -pkgver=1.0.10 +pkgver=1.0.12 _pkgsubver=0 pkgrel=1 url='http://www.lazarus.freepascal.org/' -license=('GPL2' 'MPL' 'custom:LGPL') +license=('GPL2' 'MPL' 'custom:modifiedLGPL') arch=('i686' 'x86_64' 'mips64el') makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync') options=('!emptydirs' '!makeflags') source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz" 'lazcontrols2.diff') -md5sums=('60d3b297079ca4151f690245295a8708' +md5sums=('daeb68f09e9ec9939f91c992f52305d5' '288bca6ad5ade79deec34c3602daaaa9') build() { diff --git a/community/libsieve/PKGBUILD b/community/libsieve/PKGBUILD index cc8a4d6f8..3009255d1 100644 --- a/community/libsieve/PKGBUILD +++ b/community/libsieve/PKGBUILD @@ -1,20 +1,45 @@ -# $Id: PKGBUILD 72453 2012-06-14 19:07:49Z spupykin $ +# $Id: PKGBUILD 96634 2013-09-02 16:06:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libsieve pkgver=2.3.1 -pkgrel=1 +pkgrel=2 pkgdesc="sieve interpretator lib" arch=(i686 x86_64 'mips64el') url="http://libsieve.sourceforge.net/" license=('GPL') options=('!libtool') -source=("https://github.com/downloads/sodabrew/libsieve/libsieve-$pkgver.tar.gz") -md5sums=('bb48eecf877cc7fdb2b0dfe757b48d7a') +source=("https://github.com/downloads/sodabrew/libsieve/libsieve-$pkgver.tar.gz" + "glibc-regex.patch") +md5sums=('bb48eecf877cc7fdb2b0dfe757b48d7a' + '0d98d9e8f0583857616b2ba98f1833fa') + +prepare() { + cd "$srcdir/$pkgname-$pkgver" + rm -rf src/sv_regex + patch -p1 <$srcdir/glibc-regex.patch +} build() { cd "$srcdir/$pkgname-$pkgver" + aclocal + automake + autoconf ./configure --prefix=/usr make +} + +check() { + cd "$srcdir/$pkgname-$pkgver/src/sv_test" + ls -1 script* | while read script; do + ls -1 message* | while read msg; do + msg "checking $script $msg" + ./example $script $msg || true # upstream bugs? + done + done +} + +package() { + cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } diff --git a/community/libsieve/glibc-regex.patch b/community/libsieve/glibc-regex.patch new file mode 100644 index 000000000..1b024ff2e --- /dev/null +++ b/community/libsieve/glibc-regex.patch @@ -0,0 +1,79 @@ +diff -wbBur libsieve-2.3.1/Makefile.am libsieve-2.3.1.my/Makefile.am +--- libsieve-2.3.1/Makefile.am 2012-05-14 15:20:06.000000000 +0400 ++++ libsieve-2.3.1.my/Makefile.am 2013-09-02 19:24:34.474741233 +0400 +@@ -5,7 +5,6 @@ + + EXTRA_DIST = libsieve.pc.in \ + src/sv_parser/addr.h src/sv_parser/addr-lex.h src/sv_parser/header.h src/sv_parser/header-lex.h src/sv_parser/sieve.h src/sv_parser/sieve-lex.h \ +- src/sv_regex/README src/sv_regex/regcomp.c src/sv_regex/regexec.c src/sv_regex/regex_internal.c src/sv_regex/regex_internal.h \ + src/sv_test/lmtp-1 src/sv_test/lmtp-2 src/sv_test/messagea.mbox src/sv_test/messageb.mbox src/sv_test/messagec.mbox src/sv_test/messaged.mbox src/sv_test/messagef.mbox src/sv_test/messageg.mbox src/sv_test/messageh.mbox src/sv_test/messagei.mbox src/sv_test/messagej.mbox src/sv_test/messagek.mbox src/sv_test/script10.sv src/sv_test/script11.sv src/sv_test/script12.sv src/sv_test/script13.sv src/sv_test/script14.sv src/sv_test/script15.sv src/sv_test/script16.sv src/sv_test/script17.sv src/sv_test/script18.sv src/sv_test/script19.sv src/sv_test/script1.sv src/sv_test/script20.sv src/sv_test/script21.sv src/sv_test/script22.sv src/sv_test/script23.sv src/sv_test/script2.sv src/sv_test/script3.sv src/sv_test/script4.sv src/sv_test/script5.sv src/sv_test/script6.sv src/sv_test/script7.sv src/sv_test/script8.sv src/sv_test/script9.sv src/sv_test/testmessage.sh src/sv_test/testvalid.sh + pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libsieve.pc +@@ -24,7 +23,6 @@ + src_libsieve_la_SOURCES = \ + src/sv_interface/callbacks2.c src/sv_interface/callbacks2.h src/sv_interface/context2.c src/sv_interface/context2.h src/sv_interface/message2.c src/sv_interface/message2.h src/sv_interface/message.c src/sv_interface/message.h src/sv_interface/script2.c src/sv_interface/script.c src/sv_interface/script.h src/sv_interface/tree.c src/sv_interface/tree.h \ + src/sv_parser/addrinc.h src/sv_parser/addr.y src/sv_parser/addr-lex.l src/sv_parser/comparator.c src/sv_parser/comparator.h src/sv_parser/headerinc.h src/sv_parser/header.y src/sv_parser/header-lex.l src/sv_parser/parser.h src/sv_parser/sieveinc.h src/sv_parser/sieve.y src/sv_parser/sieve-lex.l \ +- src/sv_regex/regex.h src/sv_regex/regex.c \ + src/sv_util/exception.c src/sv_util/exception.h src/sv_util/md5.c src/sv_util/util.c src/sv_util/util.h + + dist-hook: +diff -wbBur libsieve-2.3.1/src/sv_interface/tree.h libsieve-2.3.1.my/src/sv_interface/tree.h +--- libsieve-2.3.1/src/sv_interface/tree.h 2012-05-14 15:20:06.000000000 +0400 ++++ libsieve-2.3.1.my/src/sv_interface/tree.h 2013-09-02 19:23:48.351408431 +0400 +@@ -29,7 +29,7 @@ + #define TREE_H + + #include "src/sv_parser/comparator.h" +-#include "src/sv_regex/regex.h" ++#include <regex.h> + + + /* abstract syntax tree for sieve */ +diff -wbBur libsieve-2.3.1/src/sv_parser/comparator.c libsieve-2.3.1.my/src/sv_parser/comparator.c +--- libsieve-2.3.1/src/sv_parser/comparator.c 2012-05-14 15:20:06.000000000 +0400 ++++ libsieve-2.3.1.my/src/sv_parser/comparator.c 2013-09-02 19:25:13.368074118 +0400 +@@ -127,7 +127,7 @@ + + static int octet_regex(struct sieve2_context *context, const char *pat, const char *text) + { +- return (!libsieve_regexec((const regex_t *)pat, text, 0, NULL, 0)); ++ return (!regexec((const regex_t *)pat, text, 0, NULL, 0)); + } + + +diff -wbBur libsieve-2.3.1/src/sv_parser/comparator.h libsieve-2.3.1.my/src/sv_parser/comparator.h +--- libsieve-2.3.1/src/sv_parser/comparator.h 2012-05-14 15:20:06.000000000 +0400 ++++ libsieve-2.3.1.my/src/sv_parser/comparator.h 2013-09-02 19:23:27.671408659 +0400 +@@ -27,7 +27,7 @@ + #ifndef COMPARATOR_H + #define COMPARATOR_H + +-#include "src/sv_regex/regex.h" ++#include <regex.h> + #include "src/sv_include/sieve2.h" + + /* compares pat to text; returns 1 if it's true, 0 otherwise +diff -wbBur libsieve-2.3.1/src/sv_parser/sieve.y libsieve-2.3.1.my/src/sv_parser/sieve.y +--- libsieve-2.3.1/src/sv_parser/sieve.y 2012-05-31 13:16:50.000000000 +0400 ++++ libsieve-2.3.1.my/src/sv_parser/sieve.y 2013-09-02 19:25:53.704740324 +0400 +@@ -34,8 +34,7 @@ + #include <string.h> + #include <ctype.h> + +-/* sv_regex */ +-#include "src/sv_regex/regex.h" ++#include <regex.h> + + /* sv_parser */ + #include "comparator.h" +@@ -882,8 +881,8 @@ + char errbuf[100]; + regex_t *reg = (regex_t *) libsieve_malloc(sizeof(regex_t)); + +- if ((ret = libsieve_regcomp(reg, s, cflags)) != 0) { +- (void) libsieve_regerror(ret, reg, errbuf, sizeof(errbuf)); ++ if ((ret = regcomp(reg, s, cflags)) != 0) { ++ (void) regerror(ret, reg, errbuf, sizeof(errbuf)); + libsieve_sieveerror(context, context->sieve_scan, errbuf); + libsieve_free(reg); + return NULL; diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD index 6aedbcc29..dad79163c 100644 --- a/community/libvirt/PKGBUILD +++ b/community/libvirt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95449 2013-08-12 09:34:23Z spupykin $ +# $Id: PKGBUILD 96612 2013-09-02 10:46:37Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Jonathan Wiersma <archaur at jonw dot org> pkgname=libvirt -pkgver=1.1.1 -pkgrel=2 +pkgver=1.1.2 +pkgrel=1 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)" arch=('i686' 'x86_64' 'mips64el') url="http://libvirt.org/" @@ -16,7 +16,6 @@ depends=('e2fsprogs' 'gnutls' 'iptables' 'libxml2' 'parted' 'polkit' 'python2' makedepends=('pkgconfig' 'lvm2' 'linux-api-headers' 'dnsmasq') optdepends=('bridge-utils: for briged networking (default)' 'dnsmasq: for NAT/DHCP for guests' - 'kvm' 'openbsd-netcat: for remote management over ssh' 'qemu' 'radvd' @@ -34,7 +33,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz" libvirtd.conf.d libvirtd-guests.conf.d libvirt.tmpfiles.d) -md5sums=('632f30a2f22fbb404b8e10702d7f55ca' +md5sums=('1835bbfa492099bce12e2934870e5611' '3ed0e24f5b5e25bf553f5427d64915e6' '0a96ed876ffb1fcb9dff5a9b3a609c1e' '020971887442ebbf1b6949e031c8dd3f') diff --git a/community/libzdb/PKGBUILD b/community/libzdb/PKGBUILD index 89ea48e74..6df859ede 100644 --- a/community/libzdb/PKGBUILD +++ b/community/libzdb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 88544 2013-04-19 13:27:42Z spupykin $ +# $Id: PKGBUILD 96630 2013-09-02 14:51:26Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=libzdb -pkgver=2.11.2 +pkgver=2.11.3 pkgrel=1 pkgdesc="Zild Database Library" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('GPL') depends=('postgresql-libs' 'sqlite' 'libmariadbclient') options=('!libtool') source=(http://www.tildeslash.com/libzdb/dist/libzdb-$pkgver.tar.gz) -md5sums=('f3ebd6c32c47be084643a44d34459499') +md5sums=('49c55f02e5b82110cd9007e215d58468') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/lrzip/PKGBUILD b/community/lrzip/PKGBUILD index 0b017ecb6..f7368a40a 100644 --- a/community/lrzip/PKGBUILD +++ b/community/lrzip/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 73744 2012-07-15 12:25:29Z arodseth $ +# $Id: PKGBUILD 96603 2013-09-02 09:08:52Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: graysky <graysky AT archlinux DOT us> # Contributor: kastor@fobos.org.ar pkgname=lrzip -pkgver=0.614 +pkgver=0.615 pkgrel=1 -pkgdesc="Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms" -url="http://lrzip.kolivas.org/" +pkgdesc='Multi-threaded compression using the rzip/lzma, lzo, and zpaq algorithms' +url='http://lrzip.kolivas.org/' license=('GPL') arch=('x86_64' 'i686' 'mips64el') depends=('lzo2' 'bzip2' 'zlib' 'bash' 'gcc-libs') @@ -18,7 +18,7 @@ then fi options=('!libtool') source=("http://ck.kolivas.org/apps/$pkgname/$pkgname-$pkgver.tar.bz2") -sha256sums=('65024d69d1773f3ccf84508a481d7de128c03d1cf9750b5803aead4a24522763') +sha256sums=('c419662bf840bea2e4bd5ebef2585849ee1c85cec370fda423907e4514ee427d') build() { cd "$srcdir/$pkgname-$pkgver" @@ -38,7 +38,7 @@ check() { package() { cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install-strip + make DESTDIR="$pkgdir" install-strip } # vim:set ts=2 sw=2 et: diff --git a/community/lxpolkit/PKGBUILD b/community/lxpolkit/PKGBUILD new file mode 100644 index 000000000..2455ab0be --- /dev/null +++ b/community/lxpolkit/PKGBUILD @@ -0,0 +1,28 @@ +# $Id: PKGBUILD 96579 2013-09-01 20:36:18Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> + +pkgname=lxpolkit +pkgver=0.1.0 +pkgrel=2 +pkgdesc="Simple policykit authentication agent for LXDE" +arch=('i686' 'x86_64') +url="http://blog.lxde.org/?p=674" +license=('GPL') +groups=('lxde') +depends=('gtk2' 'polkit') +makedepends=('intltool') +source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz) +md5sums=('2597b00035fe1d695219e0f9bfa8c26f') + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD index 633deeff7..b3770a264 100644 --- a/community/mlt/PKGBUILD +++ b/community/mlt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94893 2013-08-01 06:55:10Z bpiotrowski $ +# $Id: PKGBUILD 96457 2013-08-29 15:10:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com> # Contributor: funkyou <spamopfer@nickname.berlin.de> @@ -8,7 +8,7 @@ pkgbase=mlt pkgname=('mlt' 'mlt-python-bindings') pkgver=0.9.0 -pkgrel=3 +pkgrel=4 pkgdesc="An open source multimedia framework" arch=('i686' 'x86_64' 'mips64el') url="http://www.mltframework.org" @@ -26,7 +26,6 @@ build() { msg "SSE2=$SSE2" ./configure --prefix=/usr --disable-gtk2 \ - --avformat-vdpau \ --avformat-swscale \ --enable-gpl --enable-gpl3 make diff --git a/community/mtpaint/PKGBUILD b/community/mtpaint/PKGBUILD index dac85d96f..b12d03519 100644 --- a/community/mtpaint/PKGBUILD +++ b/community/mtpaint/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 95673 2013-08-15 12:27:57Z arodseth $ +# $Id: PKGBUILD 96473 2013-08-30 11:19:31Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Roman Kyrylych <roman@archlinux.org> # Contributor: yosh64 <yosh64.at.gmail.dot.com> pkgname=mtpaint pkgver=3.40 -pkgrel=9 +pkgrel=10 pkgdesc='Simple paint program for creating icons and pixel based artwork' arch=('i686' 'x86_64' 'mips64el') url='http://mtpaint.sourceforge.net/' license=('GPL3') -depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2') -makedepends=('setconf') +depends=('gtk2' 'giflib' 'openjpeg' 'desktop-file-utils' 'lcms2' 'jasper') +makedepends=('gtk2' 'giflib' 'openjpeg' 'lcms2' 'setconf' 'jasper') install='mtpaint.install' source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2" 'libpng15.patch') @@ -19,9 +19,9 @@ sha256sums=('ef321d2b404839c7b909bdf5283eb22a37fbdd35b4cc9e380ddc400573d7c890' 'be51d45d1146d6c61d1c2c12d1712134da5048dd7314e2741ff336cac6838de3') prepare() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" - patch -Np1 -i '../libpng15.patch' + patch -Np1 -i '../libpng15.patch' sed -i 's:openjpeg.h:openjpeg-1.5/openjpeg.h:' src/png.c sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c @@ -30,20 +30,20 @@ prepare() { } build() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" export CFLAGS="`pkg-config gtk+-2.0 --cflags` $CFLAGS" - ./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff + ./configure --prefix=/usr --mandir=/usr/share/man man intl gif jpeg tiff sed -i 's:-lpng:-lpng -lgif:' _conf.txt sed -i 's:ungif:gif:g' _conf.txt setconf _conf.txt CC 'gcc -w' - make + make } package() { - cd "$srcdir/$pkgname-$pkgver" + cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } # vim:set ts=2 sw=2 et: diff --git a/community/mupdf/PKGBUILD b/community/mupdf/PKGBUILD index 3668d676a..4e2669b9f 100644 --- a/community/mupdf/PKGBUILD +++ b/community/mupdf/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96166 2013-08-20 21:04:13Z bpiotrowski $ +# $Id: PKGBUILD 96533 2013-08-31 09:24:59Z bpiotrowski $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Stefan Husmann <stefan-husmann@t-online.de> @@ -7,15 +7,23 @@ pkgname=mupdf pkgver=1.3 -pkgrel=3 +pkgrel=4 pkgdesc='Lightweight PDF and XPS viewer' arch=('i686' 'x86_64' 'mips64el') url='http://mupdf.com' license=('GPL3') -depends=('desktop-file-utils' 'libxext' 'openssl') +depends=('curl' 'desktop-file-utils' 'freetype2' 'jbig2dec' 'libjpeg' 'libxext' 'openssl') install=mupdf.install -source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz) -sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478') +source=(https://mupdf.googlecode.com/files/$pkgname-$pkgver-source.tar.gz + mupdf-1.3-system-libcurl.patch) +sha256sums=('aba8b31bee9cc0a16abedab5e31c81c65996cba5591e62a50a79bea2a63d4478' + '41a3b6df736f971e91c066e73afac286eec8fa37af244a55df52e8b173646f42') + +prepare() { + cd $pkgname-$pkgver-source + rm -rf thirdparty/{curl,freetype,jpeg,zlib,jbig2dec} + patch -Np1 -i ../mupdf-1.3-system-libcurl.patch +} build() { CFLAGS+=' -fPIC' @@ -40,5 +48,7 @@ package() { install -Dm644 mupdf.desktop "$pkgdir"/usr/share/applications/mupdf.desktop install -Dm644 mupdf.xpm "$pkgdir"/usr/share/pixmaps/mupdf.xpm - chmod 644 "$pkgdir"/usr/lib/libmupdf{,-js-none}.a + find "$pkgdir"/usr/include \ + "$pkgdir"/usr/share \ + "$pkgdir"/usr/lib -type f | xargs chmod -v 0644 } diff --git a/community/mupdf/mupdf-1.3-system-libcurl.patch b/community/mupdf/mupdf-1.3-system-libcurl.patch new file mode 100644 index 000000000..b99083216 --- /dev/null +++ b/community/mupdf/mupdf-1.3-system-libcurl.patch @@ -0,0 +1,21 @@ +--- a/Makerules 2013-08-27 14:35:11.243520354 +0000 ++++ b/Makerules 2013-08-27 15:40:22.583629510 +0000 +@@ -67,6 +67,8 @@ + SYS_JBIG2DEC_LIBS = -ljbig2dec + SYS_JPEG_LIBS = -ljpeg + SYS_ZLIB_LIBS = -lz ++SYS_CURL_CFLAGS = $(shell pkg-config --cflags libcurl) -I/usr/include/curl ++SYS_CURL_LIBS = $(shell pkg-config --libs libcurl) + + endif + +--- a/Makethird 2013-08-27 15:41:18.043354692 +0000 ++++ b/Makethird 2013-08-27 15:42:41.332916192 +0000 +@@ -444,5 +444,6 @@ + CURL_CFLAGS := -I$(CURL_DIR)/include + CURL_LIBS := $(SYS_CURL_DEPS) + else +-NOCURL := yes ++CURL_CFLAGS := $(SYS_CURL_CFLAGS) ++CURL_LIBS := $(SYS_CURL_LIBS) $(SYS_CURL_DEPS) + endif diff --git a/community/mupen64plus/PKGBUILD b/community/mupen64plus/PKGBUILD new file mode 100644 index 000000000..016e0deba --- /dev/null +++ b/community/mupen64plus/PKGBUILD @@ -0,0 +1,33 @@ +# $Id: PKGBUILD 94277 2013-07-18 16:50:52Z jelle $ +# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> +# Contributor: Thomas Dziedzic < gostrc at gmail > +# Contributor: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Allan McRae <allan@archlinux.org> +# Contributor: Zephyr + +pkgname=mupen64plus +pkgver=2.0 +pkgrel=1 +pkgdesc='Nintendo64 Emulator' +arch=('i686' 'x86_64') +url='http://code.google.com/p/mupen64plus/' +license=('GPL') +depends=('glu' 'libsamplerate' 'libpng' 'sdl' 'freetype2' 'boost-libs') +makedepends=('mesa' 'boost') +source=("http://mupen64plus.googlecode.com/files/mupen64plus-bundle-src-${pkgver}.tar.gz") +md5sums=('f855b4233faa9616b780c364fc4a9a9a') + +build() { + cd mupen64plus-bundle-src-${pkgver} + + sh m64p_build.sh +} + +package() { + cd mupen64plus-bundle-src-$pkgver + + # set LDCONFIG since we are using fakeroot and scripts run root commands by checking the uid + ./m64p_install.sh DESTDIR="$pkgdir" PREFIX='/usr' MANDIR='/usr/share/man' LDCONFIG='true' +} + +# vim: ts=2:sw=2:et diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD index bf8a4471c..77d77082a 100644 --- a/community/nbd/PKGBUILD +++ b/community/nbd/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 90984 2013-05-16 23:49:59Z svenstaro $ +# $Id: PKGBUILD 96567 2013-09-01 12:07:41Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Christian Hesse <mail@eworm.de> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> pkgname=nbd -pkgver=3.3 -pkgrel=3 +pkgver=3.4 +pkgrel=1 pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP" arch=('i686' 'x86_64' 'mips64el') url="http://nbd.sourceforge.net" @@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2 backup=('etc/nbd-server/config') depends=('glib2') install=nbd.install -md5sums=('cde8fe6e870b8a7459f12e5dcf572d86' +md5sums=('40ce12dfe408288b4eab36103b48fec0' '2d05d426b8c2708d5f8a0d028fcbae05' '5d1acc143018117174f79eff15afa038') diff --git a/community/nemo/PKGBUILD b/community/nemo/PKGBUILD index a794b0205..4f4700e96 100644 --- a/community/nemo/PKGBUILD +++ b/community/nemo/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 95581 2013-08-14 15:07:17Z bgyorgy $ +# $Id: PKGBUILD 96434 2013-08-28 19:54:26Z faidoc $ # Maintainer: Alexandre Filgueira <alexfilgueira@cinnarch.com> # Contributor: Ner0 pkgname=nemo -pkgver=1.8.4 -pkgrel=3 +pkgver=1.8.5 +pkgrel=1 pkgdesc="Cinnamon file manager (Nautilus fork)" arch=('i686' 'x86_64' 'mips64el') url="https://github.com/linuxmint/nemo" @@ -18,7 +18,7 @@ install=nemo.install source=("$pkgname-$pkgver.tar.gz::https://github.com/linuxmint/nemo/tarball/$pkgver" "tracker-0.16.patch" "remove-desktop-background.patch") -sha256sums=('c8805302144c1aba72707eed22501cdd4f008a4c4090dea94fde5c05cd6c25f6' +sha256sums=('ba43794293c66ebc31a9c4145d6e7a8326321a4f0e58b28fe4f3d56a8fe39874' '2b86f486add84e3affb0b14eb84425443e7cf5e593738d10d02e9c2ac0f17626' '0bd07fd931ad701442358cdcbd26e0c5d57717ffadfd39a1cba137e36def1aa5') diff --git a/community/netsurf/PKGBUILD b/community/netsurf/PKGBUILD deleted file mode 100644 index 709468cb5..000000000 --- a/community/netsurf/PKGBUILD +++ /dev/null @@ -1,52 +0,0 @@ -# $Id: PKGBUILD 95677 2013-08-15 12:59:27Z 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> - -pkgname=netsurf -pkgver=3.0 -pkgrel=3 -pkgdesc='Lightweight and fast web browser' -arch=('x86_64' 'i686' 'mips64el') -url='http://www.netsurf-browser.org/' -license=('MIT' 'GPL2') -depends=('gtk2' 'libmng' 'curl' 'librsvg' 'desktop-file-utils' 'libnsbmp' 'libnsgif' 'libcss' 'libwebp' 'libdom') # 'libharu' 'gstreamer0.10' -makedepends=('js' 're2c' 'lcms' 'gendesk' 'netsurf-buildsystem' 'libglade') -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" - - 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 "$srcdir/$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/community/newsbeuter/PKGBUILD b/community/newsbeuter/PKGBUILD index e19c7f97e..20d4f3ab6 100644 --- a/community/newsbeuter/PKGBUILD +++ b/community/newsbeuter/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 87233 2013-03-28 21:20:42Z jlichtblau $ +# $Id: PKGBUILD 96640 2013-09-02 18:35:40Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Sven Pfleiderer <pfleidi@roothausen.de> pkgname=newsbeuter -pkgver=2.6 +pkgver=2.7 pkgrel=1 pkgdesc="A RSS feed reader for the text console with special Podcast support" arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +16,7 @@ options=('!libtool') install=$pkgname.install changelog=$pkgname.changelog source=(http://www.newsbeuter.org/downloads/$pkgname-$pkgver.tar.gz) -sha256sums=('3189fdd3c65b3207f9ffb3a10f6fda4e92ea927776cb49a79c1e4c0344f9dcc3') +sha256sums=('e6720da7ac3f5ea83bc39cd17bd61ccf458b7167f5a17170ae32c7b6e8ff903a') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/newsbeuter/newsbeuter.changelog b/community/newsbeuter/newsbeuter.changelog index d8fb146ff..6d5db9fd3 100644 --- a/community/newsbeuter/newsbeuter.changelog +++ b/community/newsbeuter/newsbeuter.changelog @@ -1,3 +1,6 @@ +2013-09-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * newsbeuter 2.7-1 + 2013-03-28 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * newsbeuter 2.6-1 diff --git a/community/onboard/PKGBUILD b/community/onboard/PKGBUILD index fd70bc2db..43e1b87d7 100644 --- a/community/onboard/PKGBUILD +++ b/community/onboard/PKGBUILD @@ -1,21 +1,20 @@ -# $Id: PKGBUILD 84150 2013-02-12 01:00:22Z bgyorgy $ +# $Id: PKGBUILD 96585 2013-09-01 23:01:22Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgname=onboard -pkgver=0.98.2 +pkgver=0.99.0 pkgrel=1 pkgdesc="On-screen keyboard useful on tablet PCs or for mobility impaired users" arch=('i686' 'x86_64' 'mips64el') url="https://launchpad.net/onboard" license=('GPL') -depends=('python-dbus' 'python-gobject' 'gtk3' 'python-virtkey' 'librsvg' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') +depends=('libxkbfile' 'libcanberra' 'hunspell' 'python-dbus' 'python-gobject' 'gtk3' 'librsvg' 'gsettings-desktop-schemas' 'desktop-file-utils' 'dconf' 'hicolor-icon-theme' 'xdg-utils') makedepends=('python-distutils-extra') -optdepends=('at-spi2-atk: auto-show when editing text' - 'mousetweaks: hover click with mouse') +optdepends=('mousetweaks: hover click with mouse') options=('!emptydirs') install=$pkgname.install source=(http://launchpad.net/$pkgname/${pkgver%.*}/$pkgver/+download/$pkgname-$pkgver.tar.gz) -md5sums=('7b44ab2873ca7b76ff1d9ab0b3398487') +md5sums=('456d1e32a6f7143200993b0819386a0d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/openbox/PKGBUILD b/community/openbox/PKGBUILD index fa508a781..caae00e5f 100644 --- a/community/openbox/PKGBUILD +++ b/community/openbox/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 95420 2013-08-12 05:12:07Z bpiotrowski $ +# $Id: PKGBUILD 96638 2013-09-02 18:32:53Z bgyorgy $ # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Brad Fanella <bradfanella@archlinux.us> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,25 +6,28 @@ pkgname=openbox pkgver=3.5.2 -pkgrel=1 +pkgrel=4 pkgdesc='Highly configurable and lightweight X11 window manager' arch=('i686' 'x86_64' 'mips64el') url='http://openbox.org' license=('GPL') depends=('startup-notification' 'libxml2' 'libxinerama' 'libxrandr' - 'libxcursor' 'pango' 'imlib2') -optdepends=('python2: for the xdg-autostart script' - 'librsvg: for SVG icons support') + 'libxcursor' 'pango' 'imlib2' 'librsvg') +optdepends=('gnome-flashback-session: for the GNOME/Openbox xsession' + 'kdebase-workspace: for the KDE/Openbox xsession' + 'python2-xdg: for the openbox-xdg-autostart script') groups=('lxde') options=('!libtool') backup=('etc/xdg/openbox/menu.xml' 'etc/xdg/openbox/rc.xml' 'etc/xdg/openbox/autostart' 'etc/xdg/openbox/environment') source=(http://www.icculus.org/openbox/releases/$pkgname-$pkgver.tar.gz openbox-3.5.0-title-matching.patch - openbox-3.5.0-which-2.20.patch) + openbox-3.5.0-which-2.20.patch + openbox-3.5.0-gnome-session.patch) md5sums=('93df606606053b7e8578a5c116afb8ec' '0a11d7149da210a31ef88f8a9c717711' - '7ca3b5244bb092d46f5bcf1e2bdf4a18') + '7ca3b5244bb092d46f5bcf1e2bdf4a18' + '47fb1a16af05b6aba3b07051e6027f93') prepare() { cd $pkgname-$pkgver @@ -32,6 +35,9 @@ prepare() { patch -Np1 -i "$srcdir"/openbox-3.5.0-title-matching.patch # OB#5277 patch -Np1 -i "$srcdir"/openbox-3.5.0-which-2.20.patch # FS#11455 + # Fix GNOME/Openbox xsession with GNOME 3.8 + patch -Np1 -i "$srcdir"/openbox-3.5.0-gnome-session.patch + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \ data/autostart/openbox-xdg-autostart } @@ -49,7 +55,9 @@ build() { package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install - rm "$pkgdir"/usr/bin/{gdm-control,gnome-panel-control} + + rm "$pkgdir"/usr/bin/gdm-control \ + "$pkgdir"/usr/share/gnome-session/sessions/openbox-gnome-fallback.session sed -i 's:startkde:/usr/bin/\0:' \ "$pkgdir"/usr/share/xsessions/openbox-kde.desktop diff --git a/community/openbox/openbox-3.5.0-gnome-session.patch b/community/openbox/openbox-3.5.0-gnome-session.patch new file mode 100644 index 000000000..e0121d9a8 --- /dev/null +++ b/community/openbox/openbox-3.5.0-gnome-session.patch @@ -0,0 +1,14 @@ +diff -Naur openbox-3.5.2.orig/data/gnome-session/openbox-gnome.session openbox-3.5.2/data/gnome-session/openbox-gnome.session +--- openbox-3.5.2.orig/data/gnome-session/openbox-gnome.session 2013-09-02 16:06:03.076984284 +0000 ++++ openbox-3.5.2/data/gnome-session/openbox-gnome.session 2013-09-02 16:07:32.696385427 +0000 +@@ -1,9 +1,3 @@ + [GNOME Session] + Name=GNOME/Openbox +-RequiredComponents=gnome-settings-daemon; +-# Try load with the gnome-panel and use the fallback if we can't load a panel +-RequiredProviders=windowmanager;panel +-DefaultProvider-windowmanager=openbox +-DefaultProvider-panel=gnome-panel +-FallbackSession=openbox-gnome-fallback +-DesktopName=GNOME ++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;openbox;notification-daemon;polkit-gnome-authentication-agent-1;gnome-fallback-background-helper;gnome-fallback-media-keys-helper;gnome-fallback-mount-helper; diff --git a/community/openimageio/PKGBUILD b/community/openimageio/PKGBUILD index fb8d89490..55314055a 100644 --- a/community/openimageio/PKGBUILD +++ b/community/openimageio/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94899 2013-08-01 06:55:22Z bpiotrowski $ +# $Id: PKGBUILD 96492 2013-08-30 17:23:45Z svenstaro $ # Contributor: SpepS <dreamspepser at yahoo dot it> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openimageio -pkgver=1.2.0 -pkgrel=2 +pkgver=1.2.1 +pkgrel=1 pkgdesc="A library for reading and writing images, including classes, utilities, and applications" arch=(i686 x86_64) url="http://www.openimageio.org/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'qt4' 'python2' 'boost' 'mesa') optdepends=('qt4: iv image viewer' 'python2: bindings support') source=(https://github.com/OpenImageIO/oiio/tarball/Release-$pkgver) -md5sums=('8738dd9b24fc4f0cb3eebb094347104a') +md5sums=('c98d002c9ec843b7cc35d7aec5f03326') build() { cd "$srcdir"/$_pkgname* diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD index fc56c8211..04e565ad8 100644 --- a/community/openshadinglanguage/PKGBUILD +++ b/community/openshadinglanguage/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 94175 2013-07-15 22:55:05Z svenstaro $ +# $Id: PKGBUILD 96490 2013-08-30 17:18:19Z svenstaro $ # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> pkgname=openshadinglanguage pkgver=1.3.3 -pkgrel=3 +pkgrel=4 pkgdesc="Advanced shading language for production GI renderers" arch=(i686 x86_64) url="https://github.com/imageworks/OpenShadingLanguage" @@ -22,7 +22,7 @@ build() { cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DLLVM_STATIC=1 \ + -DLLVM_STATIC=0 \ .. make } diff --git a/community/pcsxr/PKGBUILD b/community/pcsxr/PKGBUILD new file mode 100644 index 000000000..71bb22650 --- /dev/null +++ b/community/pcsxr/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 96557 2013-08-31 16:57:39Z schuay $ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: quantax -- contact via Arch Linux forum or AUR +# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org> + +pkgname=pcsxr +pkgver=1.9.93 +pkgrel=1 +pkgdesc='A Sony PlayStation (PSX) emulator based on the PCSX-df project' +arch=('i686' 'x86_64') +url='http://pcsxr.codeplex.com/' +license=('GPL') +depends=('libcdio' 'libgl' 'libglade' 'libxtst' 'libxv' 'sdl' 'gtk3') +makedepends=('mesa' 'intltool') + +# Accessible through /srv/ftp/other/community on nymeria. +source=("ftp://ftp.archlinux.org/other/community/pcsxr/pcsxr-${pkgver}.tar.bz2") + +build() { + cd "$srcdir/$pkgname" + + autoreconf -f -i + intltoolize --force + + ./configure --prefix=/usr --enable-libcdio --enable-opengl + make +} + +package() { + cd "$srcdir/$pkgname" + make DESTDIR="$pkgdir" install +} + +md5sums=('d75725b4c3fcb2cb11d39b3ace10dc31') diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD index 25e6ac43e..f2e876d91 100644 --- a/community/pidgin-lwqq/PKGBUILD +++ b/community/pidgin-lwqq/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96180 2013-08-21 03:24:34Z fyan $ +# $Id: PKGBUILD 96467 2013-08-30 08:55:39Z fyan $ # Maintainer: Felix Yan <felixonmars@gmail.com> pkgname=pidgin-lwqq -pkgver=0.2a.20130820 -_commit=895fdf5248c5d69f797220b7df36df1d5bf2709a +pkgver=0.2a.20130824 +_commit=b2208aaa0c622e7daf1e9e78af7b1e04277f99a5 pkgrel=1 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol" arch=('i686' 'x86_64' 'mips64el') diff --git a/community/polkit-gnome/PKGBUILD b/community/polkit-gnome/PKGBUILD index 0e351d88e..520a893c5 100644 --- a/community/polkit-gnome/PKGBUILD +++ b/community/polkit-gnome/PKGBUILD @@ -1,24 +1,26 @@ -# $Id: PKGBUILD 90254 2013-05-10 04:01:53Z heftig $ -# Maintainer: Jan de Groot <jgc@archlinux.org> +# $Id: PKGBUILD 96622 2013-09-02 13:20:27Z bgyorgy $ +# Maintainer: Balló György <ballogyor+arch at gmail dot com> +# Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: onestep_ua <onestep@ukr.net> pkgname=polkit-gnome pkgver=0.105 -pkgrel=1.1 -pkgdesc="PolicyKit integration for the GNOME desktop" +pkgrel=2 +pkgdesc="Legacy polkit authentication agent for GNOME" arch=('i686' 'x86_64' 'mips64el') -url="http://www.freedesktop.org/wiki/Software/PolicyKit" +url="http://www.freedesktop.org/wiki/Software/polkit/" license=('LGPL') depends=('polkit' 'gtk3') -makedepends=('intltool' 'gobject-introspection') +makedepends=('intltool') options=(!libtool) -source=(http://download.gnome.org/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz polkit-gnome-authentication-agent-1.desktop) sha256sums=('1784494963b8bf9a00eedc6cd3a2868fb123b8a5e516e66c5eda48df17ab9369' - 'ad19e73ae8eba00a8f66bd9afd3e0e1fd7ca22f716e29b97f097d9c01711e0de') + '5074c723a4eab274830587d799ba781ff57f4fbe4ac99fbdc5aac5009c441ee7') build() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd "$srcdir/$pkgname-$pkgver" ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --libexecdir=/usr/lib/polkit-gnome \ --disable-static @@ -26,8 +28,8 @@ build() { } package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install - install -Dm644 "${srcdir}/polkit-gnome-authentication-agent-1.desktop" \ - "${pkgdir}/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop" + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + install -Dm644 "$srcdir/polkit-gnome-authentication-agent-1.desktop" \ + "$pkgdir/usr/share/applications/polkit-gnome-authentication-agent-1.desktop" } diff --git a/community/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/community/polkit-gnome/polkit-gnome-authentication-agent-1.desktop index fc2acc28d..c45acfa54 100644 --- a/community/polkit-gnome/polkit-gnome-authentication-agent-1.desktop +++ b/community/polkit-gnome/polkit-gnome-authentication-agent-1.desktop @@ -84,5 +84,4 @@ Terminal=false Type=Application Categories= NoDisplay=true -NotShowIn=KDE; -AutostartCondition=GNOME3 unless-session gnome +OnlyShowIn=GNOME; diff --git a/community/polkit-gnome/polkit-gnome.install b/community/polkit-gnome/polkit-gnome.install new file mode 100644 index 000000000..9d42a4c64 --- /dev/null +++ b/community/polkit-gnome/polkit-gnome.install @@ -0,0 +1,8 @@ +post_upgrade() { + if [ "$(vercmp 0.105-2 "$2")" -eq 1 ]; then + printf '==> The agent is no longer autostarted by default except in GNOME Flashback.\n' + printf ' For Xfce, LXDE etc., "lxpolkit" is the suggested lightweight alternative.\n' + printf ' See https://wiki.archlinux.org/index.php/Polkit#Authentication_agents for\n' + printf ' more details.\n' + fi +} diff --git a/community/qingy/PKGBUILD b/community/qingy/PKGBUILD index 78531b595..c2470df3c 100644 --- a/community/qingy/PKGBUILD +++ b/community/qingy/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 90406 2013-05-12 08:49:01Z eric $ +# $Id: PKGBUILD 96483 2013-08-30 15:29:41Z spupykin $ # Maintainer: Eric Bélanger <eric@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qingy pkgver=1.0.0 -pkgrel=8 +pkgrel=9 pkgdesc="A DirectFB getty replacement" arch=('i686' 'x86_64' 'mips64el') url="http://qingy.sourceforge.net/" diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 10a4f2818..d5b316af4 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94086 2013-07-14 10:55:45Z jlichtblau $ +# $Id: PKGBUILD 96652 2013-09-02 19:19:45Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.7.1 +pkgver=1.7.3 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64' 'mips64el') @@ -40,3 +40,5 @@ package(){ install -D -m644 "${srcdir}/$pkgname-mimetypes.xml" \ "${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml" } +sha256sums=('dbfc9636f4a8cc88737dff8cbd3b411e4b1ac17c552516396b55d1e680ad953c' + 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index 2e5704bfb..01b841a7d 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2013-09-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.7.3-1 + 2013-07-14 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.7.1-1 diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD index 12ec966bd..b9bda96e3 100644 --- a/community/qtcreator/PKGBUILD +++ b/community/qtcreator/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93892 2013-07-11 20:07:23Z svenstaro $ +# $Id: PKGBUILD 96448 2013-08-29 04:44:01Z svenstaro $ # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> @@ -7,8 +7,8 @@ # Contributor: delor <bartekpiech gmail com> pkgname=qtcreator -pkgver=2.8.0 -_pkgver=2.8.0 +pkgver=2.8.1 +_pkgver=2.8.1 pkgrel=1 pkgdesc='Lightweight, cross-platform integrated development environment' arch=('i686' 'x86_64') @@ -28,7 +28,7 @@ optdepends=('qt5-doc: for the integrated Qt documentation' install=qtcreator.install source=("http://download.qt-project.org/official_releases/qtcreator/2.8/${pkgver}/qt-creator-${pkgver}-src.tar.gz" 'qtcreator.desktop') -md5sums=('5aacdad4491b7dda9758a81384d8da79' +md5sums=('79ef6c6ece0c00035ef744c9d6e3bd3b' '82888d4be900e7833d768050a135cd37') build() { diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD index 0b5b82db8..d4de2b60b 100644 --- a/community/redis/PKGBUILD +++ b/community/redis/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 96235 2013-08-22 08:59:22Z spupykin $ +# $Id: PKGBUILD 96458 2013-08-29 15:11:24Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us> # Contributor: nofxx <x@<nick>.com> pkgname=redis -pkgver=2.6.15 +pkgver=2.6.16 pkgrel=1 pkgdesc="Advanced key-value store" arch=('i686' 'x86_64' 'mips64el') @@ -19,7 +19,7 @@ source=("http://download.redis.io/releases/redis-$pkgver.tar.gz" "redis.service" "redis.logrotate" "redis.tmpfiles.d") -md5sums=('cff9cce74f29f70694ec21b1c4f134a6' +md5sums=('ca1b81bd56fe0c5e2c8ec443a95c908d' '5320aa6d0f31aadc1d6202ca40425aea' '9e2d75b7a9dc421122d673fe520ef17f' 'dd9ab8022b4d963b2e5899170dfff490') diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD index e4d684e76..1f28af024 100644 --- a/community/scite/PKGBUILD +++ b/community/scite/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 93570 2013-07-05 18:26:15Z arodseth $ +# $Id: PKGBUILD 96605 2013-09-02 09:39:10Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Thomas S Hatch <thatch45@gmail.com> # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it> @@ -6,7 +6,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=scite -pkgver=3.3.3 +pkgver=3.3.5 pkgrel=1 pkgdesc='Editor with facilities for building and running programs' arch=('i686' 'x86_64' 'mips64el') @@ -17,7 +17,7 @@ makedepends=('setconf') backup=('usr/share/scite/SciTEGlobal.properties') install="$pkgname.install" source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz") -sha256sums=('ee4d8e976d1a13657cb1b60af392cef60fbb2c441932e0398f2c9562fbcbe6a3') +sha256sums=('5acd167046afe7dfa280c034ab9c7dc5d1be1d548e4999c2456fb2a61468fa89') prepare() { if [ $?CXXBASEFLAGS == 1 ]; then @@ -37,7 +37,7 @@ build() { } package() { - cd "$srcdir/$pkgname/gtk" + cd "$pkgname/gtk" make DESTDIR="$pkgdir" install install -Dm644 "$srcdir/$pkgname/License.txt" \ diff --git a/community/shotwell/PKGBUILD b/community/shotwell/PKGBUILD index 44dac8510..7d8805616 100644 --- a/community/shotwell/PKGBUILD +++ b/community/shotwell/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 92942 2013-06-19 21:09:47Z bpiotrowski $ +# $Id: PKGBUILD 96421 2013-08-28 11:35:15Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Joeny Ang <ang(dot)joeny(at)gmail(dot)com> pkgname=shotwell pkgver=0.14.1 -pkgrel=4 +pkgrel=5 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" arch=('i686' 'x86_64' 'mips64el') url="http://yorba.org/shotwell/" @@ -17,15 +17,18 @@ makedepends=('intltool' 'vala>=0.17.2' 'libunique3') install=shotwell.install source=("http://yorba.org/download/shotwell/stable/shotwell-$pkgver.tar.xz" "no-libexec.patch" - "libraw-0.15.2.patch") + "libraw-0.15.2.patch" + "FS35899.patch::http://redmine.yorba.org/projects/shotwell/repository/revisions/4f635ba4236dbbb8cb3f8b7bdd201432961fb283/diff/src/AppDirs.vala?format=diff") md5sums=('bb5783f9265e1ce2d4c9f354987c3ab1' 'b4124e022c98b4382530e6fbcef965e2' - '3ad21364f82229122f48452f5c74dfde') + '3ad21364f82229122f48452f5c74dfde' + '9f9690f4b860f52ffd44f8ab6d4fd3b5') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" patch -p1 <$srcdir/no-libexec.patch patch -Rp1 <$srcdir/libraw-0.15.2.patch + patch -p1 <$srcdir/FS35899.patch } build() { diff --git a/community/signon/PKGBUILD b/community/signon/PKGBUILD index b230d6f62..af1ac68ad 100644 --- a/community/signon/PKGBUILD +++ b/community/signon/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 92690 2013-06-12 05:04:06Z bgyorgy $ +# $Id: PKGBUILD 96589 2013-09-02 00:00:14Z bgyorgy $ # Maintainer: Balló György <ballogyor+arch at gmail dot com> pkgbase=signon pkgname=('signon' 'signon-doc') -pkgver=8.52 +pkgver=8.53 pkgrel=1 pkgdesc="Framework to provide credential storage and authentication service" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=(etc/signond.conf) install=$pkgname.install source=(http://accounts-sso.googlecode.com/files/$pkgbase-$pkgver.tar.bz2 use_keyring.patch) -sha1sums=('cebedffb219ee1d28d9dde0cafb8f978acf34d95' +sha1sums=('7148cf6cac0d5e56c5b697836f18aeb8cfce3734' 'cfdd48b494ad267654ceba23f1b81bcb8f56b9a1') build() { diff --git a/community/sqlheavy/PKGBUILD b/community/sqlheavy/PKGBUILD index 5803ede93..fc6a0a3f1 100755 --- a/community/sqlheavy/PKGBUILD +++ b/community/sqlheavy/PKGBUILD @@ -1,15 +1,14 @@ -# $Id: PKGBUILD 89815 2013-05-02 15:11:19Z alucryd $ +# $Id: PKGBUILD 96517 2013-08-30 22:52:46Z alucryd $ # Maintainer: Maxime Gauduin <alucryd at gmail dot com> # Contributor : sebikul <sebikul@gmail.com> pkgname=sqlheavy pkgver=0.1.1 -pkgrel=6 +pkgrel=7 pkgdesc="GObject SQLite wrapper" arch=('i686' 'x86_64' 'mips64el') url="https://code.google.com/p/sqlheavy/" license=('LGPL') -conflicts=('sqlheavy-git') depends=('gtk2' 'sqlite3') makedepends=('gobject-introspection' 'vala') options=('!libtool') @@ -17,22 +16,21 @@ source=("https://sqlheavy.googlecode.com/files/${pkgname}-${pkgver}.tar.xz") sha256sums=('e8689f5fd4e0baf98eada2b3811262bb99877c2e8586fd21ad2a7ad3acc59031') prepare() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} - sed -i 's/libvala-0.16/libvala-0.20/' configure - sed -i '/examples/d - /utils/d' Makefile.in + sed 's/libvala-0.16/libvala-0.20/' -i configure + sed '/examples/d; /utils/d' -i Makefile.in } build() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} - ./configure --prefix=/usr --disable-static + ./configure --prefix='/usr' --disable-static make } package() { - cd "${srcdir}"/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install } diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD index 90eb7462c..587b920d5 100644 --- a/community/synfig/PKGBUILD +++ b/community/synfig/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 94909 2013-08-01 06:55:42Z bpiotrowski $ +# $Id: PKGBUILD 96407 2013-08-28 00:08:39Z eric $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Franco Iacomella <yaco@gnu.org> pkgname=synfig pkgver=0.64.0 -pkgrel=5 +pkgrel=7 pkgdesc="Professional vector animation program (CLI renderer only)" arch=(i686 x86_64 'mips64el') url="http://synfig.org" diff --git a/community/texvc/PKGBUILD b/community/texvc/PKGBUILD index acea4610e..a11620314 100644 --- a/community/texvc/PKGBUILD +++ b/community/texvc/PKGBUILD @@ -1,26 +1,26 @@ -# $Id: PKGBUILD 85705 2013-03-05 09:48:36Z spupykin $ +# $Id: PKGBUILD 96626 2013-09-02 13:37:28Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=texvc -pkgver=1.20 +pkgver=1.21 pkgrel=1 pkgdesc="tex to HTML/MathML/png converter used by mediawiki" arch=(i686 x86_64 'mips64el') url="http://www.mediawiki.org/wiki/Extension:Math" license=("GPL") depends=('imagemagick' 'ghostscript' 'texlive-core' 'texlive-latexextra') -makedepends=('ocaml') -source=(mediawiki-math-1.20.tar.gz::https://nodeload.github.com/wikimedia/mediawiki-extensions-Math/legacy.tar.gz/REL${pkgver/./_}) -md5sums=('ee8fceb0a86f2972409104767406591c') +makedepends=('ocaml' 'git') +source=(mediawiki-math-$pkgver::git+https://git.wikimedia.org/git/mediawiki/extensions/Math.git#branch=REL${pkgver/./_}) +md5sums=('SKIP') build() { - cd $srcdir/wikimedia-mediawiki-extensions-Math-*/math - make -j1 texvc.bc + cd $srcdir/mediawiki-math-$pkgver/math + make -j1 } package() { - cd $srcdir/wikimedia-mediawiki-extensions-Math-*/math + cd $srcdir/mediawiki-math-$pkgver/math install -d -m 0755 $pkgdir/usr/bin install -m 0755 texvc.bc $pkgdir/usr/bin } diff --git a/community/unbound/PKGBUILD b/community/unbound/PKGBUILD index 38dde02e3..2631f77cc 100644 --- a/community/unbound/PKGBUILD +++ b/community/unbound/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 91247 2013-05-20 14:50:41Z bisson $ +# $Id: PKGBUILD 96581 2013-09-01 20:52:28Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Hisato Tatekura <hisato_tatekura@excentrics.net> # Contributor: Massimiliano Torromeo <massimiliano DOT torromeo AT google mail service> pkgname=unbound pkgver=1.4.20 -pkgrel=2 +pkgrel=3 pkgdesc='Validating, recursive, and caching DNS resolver' url='http://unbound.net/' license=('custom:BSD') arch=('i686' 'x86_64' 'mips64el') -depends=('openssl' 'ldns') makedepends=('expat') optdepends=('expat: unbound-anchor') +depends=('openssl' 'ldns' 'libevent') backup=('etc/unbound/unbound.conf') source=("http://unbound.net/downloads/${pkgname}-${pkgver}.tar.gz" 'service' @@ -33,6 +33,7 @@ build() { --sbindir=/usr/bin \ --disable-static \ --disable-rpath \ + --with-libevent \ --with-conf-file=/etc/unbound/unbound.conf \ --with-pidfile=/run/unbound.pid make diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD index e2d517a01..30da87a87 100644 --- a/community/virtualbox-modules/PKGBUILD +++ b/community/virtualbox-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 96298 2013-08-24 12:18:47Z tpowa $ +# $Id: PKGBUILD 96546 2013-08-31 16:05:06Z foutrelis $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Maintainer: Sébastien Luttringer pkgbase=virtualbox-modules pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') pkgver=4.2.16 -pkgrel=8 +pkgrel=9 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') diff --git a/community/weston/PKGBUILD b/community/weston/PKGBUILD index 62631f955..247153b30 100644 --- a/community/weston/PKGBUILD +++ b/community/weston/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 96283 2013-08-23 18:19:07Z seblu $ +# $Id: PKGBUILD 96469 2013-08-30 09:41:38Z seblu $ # Maintainer: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=weston -pkgver=1.2.1 +pkgver=1.2.2 pkgrel=1 pkgdesc='Reference implementation of a Wayland compositor' arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ license=('MIT') options=(!libtool) depends=('libxkbcommon' 'libunwind' 'poppler-glib' 'mtdev' 'libxcursor' 'glu' 'pango' 'colord') source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") -sha1sums=('111e639940ff06c6b8f3fcb866b53449a5690d3e') +sha1sums=('b08d0c15b5eef65d5f7b864fe393b27f981f97f7') build() { cd $pkgname-$pkgver diff --git a/community/winff/PKGBUILD b/community/winff/PKGBUILD index 4ac9e154a..efbf80827 100644 --- a/community/winff/PKGBUILD +++ b/community/winff/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 95219 2013-08-06 20:32:53Z arodseth $ +# $Id: PKGBUILD 96460 2013-08-29 16:47:40Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: yugrotavele <yugrotavele at archlinux dot us> # Contributor: Paolo Stivanin <admin AT polslinux DOT it> pkgname=winff -pkgver=1.5.1 +pkgver=1.5.2 pkgrel=1 pkgdesc='GUI for ffmpeg' url='http://code.google.com/p/winff/' license=('GPL3') arch=('x86_64' 'i686') depends=('ffmpeg' 'gtk2' 'xterm' 'hicolor-icon-theme') -makedepends=('lazarus' 'lazarus-gtk2' 'gendesk') +makedepends=('lazarus' 'lazarus-gtk2' 'gendesk' 'tar') install='winff.install' -source=("http://winff.googlecode.com/files/winff-$pkgver-source.tar.gz") -sha256sums=('9d0c46c4245633ed4754fcc0dc104c850daeeefb032a9c5690eda63e84cd367b') +source=("https://$pkgname.googlecode.com/files/WinFF-$pkgver-source.tar.gz") +noextract=("WinFF-$pkgver-source.tar.gz") +sha256sums=('9ee1c68173263dad8d07df2bd62e830d73e6546a0fa86b35de9be8b4c363434c') prepare() { gendesk -n \ @@ -22,6 +23,12 @@ prepare() { --pkgdesc "$pkgdesc" \ --genericname 'Video converter' \ --categories 'AudioVideo;AudioVideoEditing;GTK' + + # The file provided by upstream is an "exploding tarball" where the files + # are not extracted in a directory. Also everything is set as executable. m) + mkdir -p "$pkgname" + cd "$pkgname" + tar zxf "../WinFF-$pkgver-source.tar.gz" } build() { @@ -31,22 +38,24 @@ build() { } package() { - install -Dm755 "$srcdir/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname" - install -dm755 "$pkgdir/usr/share/winff/" + cd "$pkgname" + + install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" + install -d "$pkgdir/usr/share/winff/" find . -name "*.xml" \ -exec install -Dm644 {} "$pkgdir/usr/share/winff/" \; &> /dev/null install -Dm644 "$srcdir/winff.desktop" \ "$pkgdir/usr/share/applications/winff.desktop" - install -Dm644 "$srcdir/$pkgname/winff-icons/48x48/winff.png" \ + install -Dm644 'winff-icons/48x48/winff.png' \ "$pkgdir/usr/share/pixmaps/winff.png" for size in 16x16 24x24 32x32 48x48; do - install -Dm644 "$srcdir/$pkgname/winff-icons/$size/winff.png" \ + install -Dm644 "winff-icons/$size/winff.png" \ "$pkgdir/usr/share/icons/hicolor/$size/apps/winff.png" done install -dm755 "$pkgdir/usr/share/winff/languages/" find . -name "*.po" \ -exec install -Dm644 {} "$pkgdir/usr/share/winff/languages/" \; &> /dev/null - rm -f "$srcdir/$pkgname/presets.xml" + rm -f 'presets.xml' } # vim:set ts=2 sw=2 et: diff --git a/community/xfmedia/PKGBUILD b/community/xfmedia/PKGBUILD deleted file mode 100644 index 9aee44152..000000000 --- a/community/xfmedia/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# $Id: PKGBUILD 85661 2013-03-04 13:23:23Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com> -# Maintainer : Tom Killian <tomk@runbox.com> -# Contributor: Spider.007 <archPackage@spider007.net> - -pkgname=xfmedia -pkgver=0.9.2 -pkgrel=12 -pkgdesc="xfce media player" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL') -url="http://spuriousinterrupt.org/projects/xfmedia/" -depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib') -makedepends=('intltool' 'libxt') -install=xfmedia.install -source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2 - xfmedia-dbus-0.6-support.patch - xfmedia-empty-prev-next-fix.patch - xfmedia-exo-0.6.patch - xfmedia-xine-1.2.0.patch) -md5sums=('6eb8bd1f67201f829e0f45e733c02bd5' - '8f2aa12eea584de65d8ed28179e56b51' - '650f8cb9e2ddd9a8a2a03748b8757110' - 'f5e17fcdf2056dcc8ca8aae8600c0132' - '934603c7d3a1a0a66edb847bcb930df1') - -build() { - cd ${srcdir}/$pkgname-$pkgver - patch -Np1 -i ../xfmedia-dbus-0.6-support.patch - patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch - patch -Np1 -i ../xfmedia-exo-0.6.patch - patch -Np1 -i ../xfmedia-xine-1.2.0.patch - LDFLAGS="$LDFLAGS -lXext -lm -lgmodule-2.0" ./configure \ - --prefix=/usr --sysconfdir=/etc - make -} - -package() { - cd ${srcdir}/$pkgname-$pkgver - make DESTDIR="$pkgdir" install -} diff --git a/community/xfmedia/xfmedia-dbus-0.6-support.patch b/community/xfmedia/xfmedia-dbus-0.6-support.patch deleted file mode 100644 index 9b1eb3678..000000000 --- a/community/xfmedia/xfmedia-dbus-0.6-support.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur xfmedia-0.9.1.orig/src/remote.c xfmedia-0.9.1/src/remote.c ---- xfmedia-0.9.1.orig/src/remote.c 2005-09-05 00:56:37.000000000 -0400 -+++ xfmedia-0.9.1/src/remote.c 2006-04-08 00:27:18.000000000 -0400 -@@ -55,6 +55,10 @@ - #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER - #endif - -+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT -+#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE -+#endif -+ - #endif /* HAVE_DBUS */ - - #include <libxfce4util/libxfce4util.h> diff --git a/community/xfmedia/xfmedia-empty-prev-next-fix.patch b/community/xfmedia/xfmedia-empty-prev-next-fix.patch deleted file mode 100644 index e2d0d8166..000000000 --- a/community/xfmedia/xfmedia-empty-prev-next-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -wbBur xfmedia-0.9.2/src/mainwin.c xfmedia-0.9.2.my/src/mainwin.c ---- xfmedia-0.9.2/src/mainwin.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/mainwin.c 2010-11-01 13:01:17.000000000 +0000 -@@ -1865,6 +1865,10 @@ - gboolean use_playlist_q = xfmedia_playlist_queue_n_entries(mwin->playlist_q); - gboolean ret = FALSE; - -+ if(xfmedia_playlist_get_n_entries(mwin->plist) == 0) -+// if(xfmedia_playlist_queue_is_empty(mwin->plist)) -+ return; -+ - if(mwin->cur_playing - && xfmedia_settings_get_bool("/xfmedia/playlist/shuffle") - && !use_playlist_q ) -@@ -1899,6 +1903,10 @@ - { - gint tot_items, idx = -1; - -+ if(xfmedia_playlist_get_n_entries(mwin->plist) == 0) -+// if(xfmedia_playlist_queue_is_empty(mwin->plist)) -+ return; -+ - if(xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")) { - XfmediaPlaylistEntryRef *ref = NULL; - gboolean playing = FALSE; diff --git a/community/xfmedia/xfmedia-exo-0.6.patch b/community/xfmedia/xfmedia-exo-0.6.patch deleted file mode 100644 index 1de611c82..000000000 --- a/community/xfmedia/xfmedia-exo-0.6.patch +++ /dev/null @@ -1,196 +0,0 @@ -diff -wbBur xfmedia-0.9.2/configure xfmedia-0.9.2.my/configure ---- xfmedia-0.9.2/configure 2006-11-27 20:20:59.000000000 +0000 -+++ xfmedia-0.9.2.my/configure 2011-01-31 17:15:58.000000000 +0000 -@@ -27417,7 +27417,7 @@ - - - if test x"$xdt_cv_EXO_check" = x"yes"; then -- if $PKG_CONFIG --exists "exo-0.3 >= 0.3.0" >/dev/null 2>&1; then -+ if $PKG_CONFIG --exists "exo-1 >= 0.3.0" >/dev/null 2>&1; then - - - # minimum supported version of pkg-config -@@ -27501,22 +27501,22 @@ - fi - - -- { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.0" >&5 --echo $ECHO_N "checking for exo-0.3 >= 0.3.0... $ECHO_C" >&6; } -- if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then -- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"` -+ { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.0" >&5 -+echo $ECHO_N "checking for exo-1 >= 0.3.0... $ECHO_C" >&6; } -+ if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then -+ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5 - echo "${ECHO_T}$EXO_VERSION" >&6; } - - { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5 - echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; } -- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"` -+ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5 - echo "${ECHO_T}$EXO_CFLAGS" >&6; } - - { echo "$as_me:$LINENO: checking EXO_LIBS" >&5 - echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; } -- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"` -+ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"` - { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5 - echo "${ECHO_T}$EXO_LIBS" >&6; } - -@@ -27535,15 +27535,15 @@ - - EXO_FOUND="yes" - -- elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then -- xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"` -+ elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then -+ xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"` - { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5 - echo "${ECHO_T}found, but $xdt_cv_version" >&6; } - - -- echo "*** The required package exo-0.3 was found on your system," -+ echo "*** The required package exo-1 was found on your system," - echo "*** but the installed version ($xdt_cv_version) is too old." -- echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust" -+ echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you installed" - echo "*** the new version of the package in a nonstandard prefix so" - echo "*** pkg-config is able to find it." -@@ -27554,8 +27554,8 @@ - echo "${ECHO_T}not found" >&6; } - - -- echo "*** The required package exo-0.3 was not found on your system." -- echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust" -+ echo "*** The required package exo-1 was not found on your system." -+ echo "*** Please install exo-1 (atleast version 0.3.0) or adjust" - echo "*** the PKG_CONFIG_PATH environment variable if you" - echo "*** installed the package in a nonstandard prefix so that" - echo "*** pkg-config is able to find it." -@@ -27564,14 +27564,14 @@ - fi - - else -- { echo "$as_me:$LINENO: checking for optional package exo-0.3 >= 0.3.0" >&5 --echo $ECHO_N "checking for optional package exo-0.3 >= 0.3.0... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for optional package exo-1 >= 0.3.0" >&5 -+echo $ECHO_N "checking for optional package exo-1 >= 0.3.0... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: not found" >&5 - echo "${ECHO_T}not found" >&6; } - fi - else -- { echo "$as_me:$LINENO: checking for optional package exo-0.3" >&5 --echo $ECHO_N "checking for optional package exo-0.3... $ECHO_C" >&6; } -+ { echo "$as_me:$LINENO: checking for optional package exo-1" >&5 -+echo $ECHO_N "checking for optional package exo-1... $ECHO_C" >&6; } - { echo "$as_me:$LINENO: result: disabled" >&5 - echo "${ECHO_T}disabled" >&6; } - fi -diff -wbBur xfmedia-0.9.2/src/main.c xfmedia-0.9.2.my/src/main.c ---- xfmedia-0.9.2/src/main.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/main.c 2011-02-01 11:08:02.000000000 +0000 -@@ -388,6 +388,23 @@ - return optind; - } - -+/** -+ * exo_str_get_md5_str: -+ * @contents : The string to create a digest of. -+ * -+ * Creates a character array MD5 digestof the string -+ * @contents. -+ * -+ * Return value: A newly-allocated character array which -+ * should be free with g_free() when no -+ * longer needed. -+ **/ -+gchar* -+exo_str_get_md5_str (const gchar *contents) -+{ -+ return g_compute_checksum_for_string (G_CHECKSUM_MD5, contents, -1); -+} -+ - int - main(int argc, char **argv) - { -diff -wbBur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2.my/src/mediamarks.c ---- xfmedia-0.9.2/src/mediamarks.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/mediamarks.c 2011-02-01 11:04:42.000000000 +0000 -@@ -684,9 +684,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - gtk_tree_view_column_pack_start(col, render, TRUE); -@@ -1693,9 +1693,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - gtk_tree_view_column_pack_start(col, render, TRUE); -@@ -1705,9 +1705,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - col = gtk_tree_view_column_new_with_attributes(_("Location"), render, -diff -wbBur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2.my/src/playlist.c ---- xfmedia-0.9.2/src/playlist.c 2006-11-27 07:21:22.000000000 +0000 -+++ xfmedia-0.9.2.my/src/playlist.c 2011-02-01 11:04:47.000000000 +0000 -@@ -1409,9 +1409,9 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - if(gtk_major_version == 2 && gtk_minor_version >= 6) -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL); -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL); - else { -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - } - col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text", -diff -wbBur xfmedia-0.9.2/src/settings-dialog.c xfmedia-0.9.2.my/src/settings-dialog.c ---- xfmedia-0.9.2/src/settings-dialog.c 2006-11-27 07:21:23.000000000 +0000 -+++ xfmedia-0.9.2.my/src/settings-dialog.c 2011-02-01 11:04:53.000000000 +0000 -@@ -552,7 +552,7 @@ - render = exo_cell_renderer_ellipsized_text_new(); - col = gtk_tree_view_column_new_with_attributes("name", render, - "text", PLUGINS_NAME, NULL); -- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, NULL); - gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col); - -diff -wbBur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c ---- xfmedia-0.9.2/src/xfmedia-playlist-queue.c 2006-11-27 07:21:22.000000000 +0000 -+++ xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c 2011-02-01 11:04:57.000000000 +0000 -@@ -171,7 +171,7 @@ - - render = exo_cell_renderer_ellipsized_text_new(); - g_object_set(G_OBJECT(render), -- "ellipsize", EXO_PANGO_ELLIPSIZE_END, -+ "ellipsize", PANGO_ELLIPSIZE_END, - "ellipsize-set", TRUE, - NULL); - col = gtk_tree_view_column_new_with_attributes("display-name", render, diff --git a/community/xfmedia/xfmedia-xine-1.2.0.patch b/community/xfmedia/xfmedia-xine-1.2.0.patch deleted file mode 100644 index 2e04ac80a..000000000 --- a/community/xfmedia/xfmedia-xine-1.2.0.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c ---- xfmedia-0.9.2/src/xfmedia-xine.c 2006-11-27 10:21:23.000000000 +0300 -+++ xfmedia-0.9.2.my/src/xfmedia-xine.c 2012-01-05 01:23:21.000000000 +0400 -@@ -1450,17 +1450,6 @@ - } - - gboolean --xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value) --{ -- -- g_return_val_if_fail(xfx != NULL, 0); -- g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0); -- g_return_val_if_fail(xfx->priv->stream != NULL, 0); -- -- return xine_trick_mode(xfx->priv->stream, mode, value); --} -- --gboolean - xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream, - gint *pos_time, gint *length_time) - { -diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h ---- xfmedia-0.9.2/src/xfmedia-xine.h 2006-11-27 10:21:23.000000000 +0300 -+++ xfmedia-0.9.2.my/src/xfmedia-xine.h 2012-01-05 01:20:47.000000000 +0400 -@@ -87,9 +87,6 @@ - gboolean xfmedia_xine_play (XfmediaXine *xfx, - gint pos, - gint start_time); --gboolean xfmedia_xine_trick_mode (XfmediaXine *xfx, -- gint mode, -- gint value); - gint xfmedia_xine_get_stream_info (XfmediaXine *xfx, - gint info); - G_CONST_RETURN gchar *xfmedia_xine_get_meta_info (XfmediaXine *xfx, diff --git a/community/xfmedia/xfmedia.install b/community/xfmedia/xfmedia.install deleted file mode 100644 index b95cc069d..000000000 --- a/community/xfmedia/xfmedia.install +++ /dev/null @@ -1,11 +0,0 @@ -post_install() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true -} diff --git a/core/bash/PKGBUILD b/core/bash/PKGBUILD index 5c6e0be11..5825ee0eb 100644 --- a/core/bash/PKGBUILD +++ b/core/bash/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 187018 2013-06-03 11:14:54Z allan $ +# $Id: PKGBUILD 193699 2013-08-28 09:22:56Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> @@ -6,7 +6,7 @@ pkgname=bash _basever=4.2 _patchlevel=045 #prepare for some patches pkgver=$_basever.$_patchlevel -pkgrel=4 +pkgrel=5 pkgdesc="The GNU Bourne Again shell" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -21,7 +21,8 @@ source=(http://ftp.gnu.org/gnu/bash/bash-$_basever.tar.gz{,.sig} dot.bash_profile dot.bash_logout system.bashrc - system.bash_logout) + system.bash_logout + bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch) if [ $_patchlevel -gt 000 ]; then for (( p=1; p<=$((10#${_patchlevel})); p++ )); do source=(${source[@]} http://ftp.gnu.org/gnu/bash/bash-$_basever-patches/bash${_basever//./}-$(printf "%03d" $p){,.sig}) @@ -33,8 +34,10 @@ prepare() { for (( p=1; p<=$((10#${_patchlevel})); p++ )); do msg "applying patch bash${_basever//./}-$(printf "%03d" $p)" - patch -Np0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) + patch -p0 -i $srcdir/bash${_basever//./}-$(printf "%03d" $p) done + + patch -p1 -i $srcdir/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch } build() { @@ -81,6 +84,7 @@ md5sums=('3fb927c7c33022f1c327f14a81c0d4b0' '42f4400ed2314bd7519c020d0187edc5' '3546099a1b2f667adc9794f52e78e35b' '472f536d7c9e8250dc4568ec4cfaf294' + '9e55d01f2d9dda4a0c96031b25d19f45' '1100bc1dda2cdc06ac44d7e5d17864a3' 'SKIP' '30e7948079921d3261efcc6a40722135' diff --git a/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch b/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch new file mode 100644 index 000000000..c621f0af8 --- /dev/null +++ b/core/bash/bash-4.2-do-not-use-memcpy-on-overlapping-memory.patch @@ -0,0 +1,12 @@ +diff -Naur bash-4.2-orig/general.c bash-4.2/general.c +--- bash-4.2-orig/general.c 2010-12-13 06:06:27.000000000 +1000 ++++ bash-4.2/general.c 2013-08-25 21:52:36.681484302 +1000 +@@ -766,7 +766,7 @@ + *nbeg++ = '.'; + + nlen = nend - ntail; +- memcpy (nbeg, ntail, nlen); ++ memmove (nbeg, ntail, nlen); + nbeg[nlen] = '\0'; + + return name; diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD index 7ccb55440..d3664345e 100644 --- a/core/glibc/PKGBUILD +++ b/core/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193120 2013-08-16 21:44:47Z allan $ +# $Id: PKGBUILD 193742 2013-08-30 03:37:09Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.18 -pkgrel=2 +pkgrel=3 pkgdesc="GNU C Library" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/libc" @@ -77,7 +77,9 @@ build() { --enable-obsolete-rpc \ --enable-kernel=2.6.32 \ --enable-bind-now --disable-profile \ - --enable-stackguard-randomization + --enable-stackguard-randomization \ + --enable-lock-elision \ + --enable-multi-arch # build libraries with hardening disabled echo "build-programs=no" >> configparms diff --git a/core/groff/PKGBUILD b/core/groff/PKGBUILD index a0ab19609..52a9ac4b3 100644 --- a/core/groff/PKGBUILD +++ b/core/groff/PKGBUILD @@ -1,9 +1,11 @@ -# $Id: PKGBUILD 185682 2013-05-17 08:28:58Z tpowa $ +# $Id: PKGBUILD 193702 2013-08-28 15:19:04Z andyrtr $ # Maintainer: +### rebuild on every ghostscript update - FS#36562 ### + pkgname=groff pkgver=1.22.2 -pkgrel=3 +pkgrel=5 pkgdesc="GNU troff text-formatting system" arch=('i686' 'x86_64' 'mips64el') url="http://www.gnu.org/software/groff/groff.html" diff --git a/core/reiserfsprogs/PKGBUILD b/core/reiserfsprogs/PKGBUILD index d69a06aff..f5649a84d 100644 --- a/core/reiserfsprogs/PKGBUILD +++ b/core/reiserfsprogs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 189852 2013-07-09 13:39:02Z tpowa $ +# $Id: PKGBUILD 193785 2013-08-31 10:51:10Z tpowa $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: judd <jvinet@zeroflux.org> pkgname=reiserfsprogs -pkgver=3.6.23 +pkgver=3.6.24 pkgrel=1 pkgdesc="Reiserfs utilities" arch=('i686' 'x86_64' 'mips64el') @@ -12,6 +12,7 @@ license=('GPL') groups=('base') depends=('util-linux') source=("http://ftp.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${pkgver}/${pkgname}-${pkgver}.tar.xz") +md5sums=('66787380fb418ff7d88a23e47cda7af6') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -28,4 +29,3 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } -md5sums=('e7224bbda4d366ba9b11cdf98616c8f6') diff --git a/core/rpcbind/PKGBUILD b/core/rpcbind/PKGBUILD index 2eed8c3ff..e37b8c843 100644 --- a/core/rpcbind/PKGBUILD +++ b/core/rpcbind/PKGBUILD @@ -1,22 +1,23 @@ -# $Id: PKGBUILD 186778 2013-05-31 07:19:10Z tpowa $ +# $Id: PKGBUILD 193786 2013-08-31 10:51:12Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> pkgname=rpcbind -pkgver=0.2.0 -pkgrel=12 +pkgver=0.2.1 +pkgrel=2 pkgdesc="portmap replacement which supports RPC over various protocols" arch=(i686 x86_64 'mips64el') depends=('bash' 'glibc' 'libtirpc') url="http://rpcbind.sourceforge.net" license=('custom') replaces=('portmap') -source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2 +source=(http://downloads.sourceforge.net/sourceforge/rpcbind/rpcbind-0.2.1.tar.bz2 rpcbind-sunrpc.patch rpcbind.service) -md5sums=('1a77ddb1aaea8099ab19c351eeb26316' +install=rpcbind.install +md5sums=('0a5f9c2142af814c55d957aaab3bcc68' 'c02ac36a98baac70b8a26190524b7b73' - 'a7b23a32be2eb52d7dec52da36d4eba1') - + 'a7b23a32be2eb52d7dec52da36d4eba1' +) prepare() { cd $srcdir/$pkgname-$pkgver # patch for iana services file @@ -25,7 +26,7 @@ prepare() { build() { cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --enable-warmstarts --with-statedir=/run + ./configure --prefix=/usr --with-rpcuser=rpc --enable-warmstarts --with-statedir=/run make } diff --git a/core/rpcbind/rpcbind.install b/core/rpcbind/rpcbind.install new file mode 100644 index 000000000..3b5b7dc7f --- /dev/null +++ b/core/rpcbind/rpcbind.install @@ -0,0 +1,13 @@ +post_install() { + getent group rpc &>/dev/null || groupadd -r -g 32 rpc >/dev/null + getent passwd rpc &>/dev/null || useradd -r -u 32 -g rpc -d /dev/null -s /bin/false -c "Rpcbind Daemon" rpc >/dev/null +} + +post_upgrade() { + post_install +} +post_remove() { + getent passwd rpc &>/dev/null && userdel rpc >/dev/null + getent group rpc &>/dev/null && groupdel rpc >/dev/null + return 0 +} diff --git a/extra/arora/PKGBUILD b/extra/arora/PKGBUILD deleted file mode 100644 index c84d829b7..000000000 --- a/extra/arora/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# $Id: PKGBUILD 188497 2013-06-15 04:38:48Z bisson $ -# Maintainer: Gaetan Bisson <bisson@archlinux.org> -# Contributor: Pierre Schmitz <pierre@archlinux.de> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> - -pkgname=arora -pkgver=0.11.0 -pkgrel=4 -pkgdesc='Lightweight cross-platform Web browser' -url='http://code.google.com/p/arora/' -license=('GPL') -arch=('i686' 'x86_64' 'mips64el') -depends=('qtwebkit' 'desktop-file-utils') -source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz") -sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31') - -install=install - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - qmake-qt4 PREFIX='/usr' 'CONFIG-=debug' -r - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - make INSTALL_ROOT="${pkgdir}" install -} diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index fa091c893..f7884e4cf 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 184362 2013-05-06 19:36:38Z foutrelis $ +# $Id: PKGBUILD 193704 2013-08-28 15:19:08Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> pkgname=cairo -pkgver=1.12.14 -pkgrel=4 +pkgver=1.12.16 +pkgrel=1 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64 'mips64el') license=('LGPL' 'MPL') url="http://cairographics.org/" -# depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh') -makedepends=('mesa>=9.1' 'mesa-libgl>=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' +depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa' 'libgl' 'sh' 'lzo2') +makedepends=('mesa-libgl' 'librsvg' 'gtk2' 'poppler-glib' 'libspectre' 'gtk-doc' # for the test suite: 'ttf-dejavu' 'gsfonts' 'xorg-server-xvfb' ) # 'libdrm') #optdepends=('xcb-util: for XCB backend') # really needed? @@ -18,16 +18,12 @@ makedepends=('mesa>=9.1' 'mesa-libgl>=9.1' 'librsvg' 'gtk2' 'poppler-glib' 'libs provides=('cairo-xcb') replaces=('cairo-xcb') options=('!libtool') -source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz - libpng16.patch) -sha1sums=('9106ab09b2e7b9f90521b18dd4a7e9577eba6c15' - 'c9911f185637d266ce1d2985bd6fb7d0df3d75b2') +source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz) +sha1sums=('4f6e337d5d3edd7ea79d1426f575331552b003ec') build() { cd $pkgname-$pkgver - patch -Np1 -i ../libpng16.patch - ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ @@ -48,15 +44,18 @@ build() { make } -#check() { -# cd "$srcdir/$pkgname-$pkgver" - #make -k check || /bin/true # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped -# make test || /bin/true # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped -#} +check() { + cd $pkgname-$pkgver + make -k test || /bin/true + + # results: + # 1.12.8-1 # 162 Passed, 328 Failed [8 crashed, 10 expected], 26 Skipped + # 1.12.12-2: # 29 Passed, 464 Failed [460 crashed, 2 expected], 26 Skipped + # 1.12.16-1: 144 Passed, 364 Failed [6 crashed, 12 expected], 27 Skipped -package() { - depends=('libpng' 'libxrender' 'libxext' 'fontconfig' 'pixman>=0.28.0' 'glib2' 'mesa>=9.1' 'libgl' 'sh' 'lzo2') +} +package() { cd $pkgname-$pkgver make DESTDIR="$pkgdir" install } diff --git a/extra/cairo/libpng16.patch b/extra/cairo/libpng16.patch deleted file mode 100644 index c16317811..000000000 --- a/extra/cairo/libpng16.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 2dd2c826a5b367d32cf2d48ed69754795990c5db Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Tue, 16 Apr 2013 09:58:56 +0000 -Subject: png: Avoid marking the surface as in error after a png warning - -It turns out that libpng will continue to load an image after throwing a -warning, and that libpng16 now throws warnings for images that libpng15 -and earlier loaded without error. As we were happily loading those -images into cairo surfaces before, we are therefore being overzealous -in throwing an error now - so just squelch the warning. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- -diff --git a/src/cairo-png.c b/src/cairo-png.c -index e74a4a8..068617d 100644 ---- a/src/cairo-png.c -+++ b/src/cairo-png.c -@@ -149,13 +149,13 @@ static void - png_simple_warning_callback (png_structp png, - png_const_charp error_msg) - { -- cairo_status_t *error = png_get_error_ptr (png); -- -- /* default to the most likely error */ -- if (*error == CAIRO_STATUS_SUCCESS) -- *error = _cairo_error (CAIRO_STATUS_NO_MEMORY); -- -- /* png does not expect to abort and will try to tidy up after a warning */ -+ /* png does not expect to abort and will try to tidy up and continue -+ * loading the image after a warning. So we also want to return the -+ * (incorrect?) surface. -+ * -+ * We use our own warning callback to squelch any attempts by libpng -+ * to write to stderr as we may not be in control of that output. -+ */ - } - - --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD index d3444ca5c..6a7f4d476 100644 --- a/extra/enlightenment17/PKGBUILD +++ b/extra/enlightenment17/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 193669 2013-08-26 20:20:21Z ronald $ +# $Id: PKGBUILD 193683 2013-08-27 18:28:14Z ronald $ # Maintainer: Ronald van Haren <ronald@archlinux.org> # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com> pkgname=enlightenment17 _pkgname=enlightenment pkgver=0.17.4 -pkgrel=1 +pkgrel=2 pkgdesc="Enlightenment window manager DR17 (aka e17)" arch=('i686' 'x86_64' 'mips64el') url="http://www.enlightenment.org" @@ -19,12 +19,25 @@ backup=('etc/enlightenment/sysactions.conf') options=('!libtool' '!emptydirs') install=enlightenment17.install source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz - 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch') + 'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch' + 'blackscreenfix.patch') sha1sums=('29f5f4c10bcc7b32f79013ccbc7257abeea78faf' 'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5' '3f53931ae86de8fe99e386aeb097521aac0decd8' - '86f1c5e36dc274c3101362532378be034e89c593') + '86f1c5e36dc274c3101362532378be034e89c593' + '85f9b1378ebb7a05ed7f0e8db6982d88a0f46be4') + +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + patch -p0 < $srcdir/quickstart.patch + + # upstream fix for blackscreen problem on existing configs + patch -Np1 -i $srcdir/blackscreenfix.patch + + # default to systemd for sysactions + patch -Np0 < $srcdir/sysactions_systemd.patch +} build() { cd "$srcdir/$_pkgname-$pkgver" @@ -32,11 +45,6 @@ build() { export CXXFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections ${CXXFLAGS}" export LDFLAGS="-fvisibility=hidden -ffunction-sections -fdata-sections -Wl,--gc-sections -Wl,--as-needed ${LDFLAGS}" - patch -p0 < $srcdir/quickstart.patch - - # default to systemd for sysactions - patch -Np0 < $srcdir/sysactions_systemd.patch - ./configure \ --prefix=/usr \ --sysconfdir=/etc \ @@ -67,13 +75,13 @@ package() { make DESTDIR=$pkgdir install # install license files - if [ -e $srcdir/$_pkgname-$_pkgver/COPYING ]; then - install -Dm644 $srcdir/$_pkgname-$_pkgver/COPYING \ + if [ -e $srcdir/$_pkgname-$pkgver/COPYING ]; then + install -Dm644 $srcdir/$_pkgname-$pkgver/COPYING \ $pkgdir/usr/share/licenses/$pkgname/COPYING fi - if [ -e $srcdir/$_pkgname-$_pkgver/COPYING-PLAIN ]; then - install -Dm644 $srcdir/$_pkgname-$_pkgver/COPYING-PLAIN \ + if [ -e $srcdir/$_pkgname-$pkgver/COPYING-PLAIN ]; then + install -Dm644 $srcdir/$_pkgname-$pkgver/COPYING-PLAIN \ $pkgdir/usr/share/licenses/$pkgname/COPYING-PLAIN fi diff --git a/extra/enlightenment17/blackscreenfix.patch b/extra/enlightenment17/blackscreenfix.patch new file mode 100644 index 000000000..817d6c105 --- /dev/null +++ b/extra/enlightenment17/blackscreenfix.patch @@ -0,0 +1,48 @@ +From b17a9b9cc9438b6dfac4402ac4107f08e23a4373 Mon Sep 17 00:00:00 2001 +From: Chris Michael <cp.michael@samsung.com> +Date: Wed, 29 May 2013 11:50:17 +0000 +Subject: Backport: 45b4d9f :: Move xinerama init until After randr has setup the screens. + +NB: Old Man, THIS should fix your black screen problem ;) + +Signed-off-by: Chris Michael <cp.michael@samsung.com> +Signed-off-by: Deon Thomas <PrinceAMD.Elive@gmail.com> +--- +diff --git a/src/bin/e_main.c b/src/bin/e_main.c +index ee8fd8a..ed58cfd 100644 +--- a/src/bin/e_main.c ++++ b/src/bin/e_main.c +@@ -462,15 +462,6 @@ main(int argc, char **argv) + TS("E_Alert Init Done"); + _e_main_shutdown_push(e_alert_shutdown); + +- TS("E_Xinerama Init"); +- if (!e_xinerama_init()) +- { +- e_error_message_show(_("Enlightenment cannot initialize E_Xinerama!\n")); +- _e_main_shutdown(-1); +- } +- TS("E_Xinerama Init Done"); +- _e_main_shutdown_push(e_xinerama_shutdown); +- + TS("E_Hints Init"); + e_hints_init(); + TS("E_Hints Init Done"); +@@ -521,6 +512,15 @@ main(int argc, char **argv) + _e_main_shutdown_push(e_randr_shutdown); + TS("E_Randr Init Done"); + ++ TS("E_Xinerama Init"); ++ if (!e_xinerama_init()) ++ { ++ e_error_message_show(_("Enlightenment cannot initialize E_Xinerama!\n")); ++ _e_main_shutdown(-1); ++ } ++ TS("E_Xinerama Init Done"); ++ _e_main_shutdown_push(e_xinerama_shutdown); ++ + TS("E_Env Init"); + if (!e_env_init()) + { +-- +cgit v0.9.2 diff --git a/community/ffmpeg-compat/PKGBUILD b/extra/ffmpeg-compat/PKGBUILD index a34f737d2..53b1a5ccc 100644 --- a/community/ffmpeg-compat/PKGBUILD +++ b/extra/ffmpeg-compat/PKGBUILD @@ -1,4 +1,4 @@ -# $Id$ +# $Id: PKGBUILD 193811 2013-09-02 08:57:55Z bpiotrowski $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Ionut Biru <ibiru@archlinux.org> diff --git a/extra/fontconfig/PKGBUILD b/extra/fontconfig/PKGBUILD index 611ae6a84..95fca93c5 100644 --- a/extra/fontconfig/PKGBUILD +++ b/extra/fontconfig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186044 2013-05-20 18:22:18Z andyrtr $ +# $Id: PKGBUILD 193795 2013-09-01 09:03:59Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=fontconfig -pkgver=2.10.93 +pkgver=2.10.95 pkgrel=1 pkgdesc="A library for configuring and customizing font access" arch=(i686 x86_64 'mips64el') @@ -12,10 +12,9 @@ depends=('expat' 'freetype2') options=('!libtool') install=fontconfig.install source=(http://www.fontconfig.org/release/$pkgname-$pkgver.tar.bz2 - 29-replace-bitmap-fonts.conf git_fixes.diff) -sha256sums=('ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c' - '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6' - '7dc98137405ee0e5f98f3266a760a4da27d78e3c2bc7b7ef4db6b481df3c39f0') + 29-replace-bitmap-fonts.conf) +sha256sums=('abc0ecb9fb083d8705c140c8c0d13cc294c56faa1fee0e31e3f3eb98062a5e7b' + '2325c478783659e8fce79f5754119934d6ce21f81552f878b740c7b18f9fe0d6') # a nice page to test font matching: # http://zipcon.net/~swhite/docs/computers/browsers/fonttest.html @@ -23,9 +22,6 @@ sha256sums=('ea901f278848829ed9937d76fb0ce63ad362d7d5b9e75aa6a6b78bfef42e529c' build() { cd "$srcdir/$pkgname-$pkgver" - # post release fixes - #patch -Np1 -i ${srcdir}/git_fixes.diff - # make sure there's no rpath trouble and sane .so versioning - FC and Gentoo do this as well libtoolize -f autoreconf -fi diff --git a/extra/fontconfig/git_fixes.diff b/extra/fontconfig/git_fixes.diff deleted file mode 100644 index 209cba64c..000000000 --- a/extra/fontconfig/git_fixes.diff +++ /dev/null @@ -1,732 +0,0 @@ -From 8fd0ed60a62cb7f36b2ade1bd16a66671eaf79da Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Mon, 01 Apr 2013 09:16:28 +0000 -Subject: Bug 62980 - matching native fonts with even :lang=en - -Fix the matcher modified by 4eab908c8679a797ac7016b77a93ee41bb11b0fc -to deal with both strong and weak of FC_LANG as the same location in the score ---- -diff --git a/src/fcmatch.c b/src/fcmatch.c -index 68f39ae..2d7b798 100644 ---- a/src/fcmatch.c -+++ b/src/fcmatch.c -@@ -227,9 +227,10 @@ typedef enum _FcMatcherPriorityDummy { - #undef FC_OBJECT - - #undef PRI1 --#define PRI1(n) \ -- PRI_ ## n ## _STRONG, \ -- PRI_ ## n ## _WEAK -+#define PRI1(n) \ -+ PRI_ ## n, \ -+ PRI_ ## n ## _STRONG = PRI_ ## n, \ -+ PRI_ ## n ## _WEAK = PRI_ ## n - - typedef enum _FcMatcherPriority { - PRI1(HASH), -@@ -237,9 +238,8 @@ typedef enum _FcMatcherPriority { - PRI1(FOUNDRY), - PRI1(CHARSET), - PRI_FAMILY_STRONG, -- PRI_LANG_STRONG, - PRI_POSTSCRIPT_NAME_STRONG, -- PRI_LANG_WEAK, -+ PRI1(LANG), - PRI_FAMILY_WEAK, - PRI_POSTSCRIPT_NAME_WEAK, - PRI1(SPACING), -@@ -910,8 +910,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, - * If this node matches any language, go check - * which ones and satisfy those entries - */ -- if (nodeps[f]->score[PRI_LANG_STRONG] < 2000 || -- nodeps[f]->score[PRI_LANG_WEAK] < 2000) -+ if (nodeps[f]->score[PRI_LANG] < 2000) - { - for (i = 0; i < nPatternLang; i++) - { -@@ -935,13 +934,6 @@ FcFontSetSort (FcConfig *config FC_UNUSED, - } - patternLangSat[i] = FcTrue; - satisfies = FcTrue; -- /* adjust score to ensure it's not more than 10000.0 -- * which would means the lang didn't satisfy the requirements -- */ -- if (nodeps[f]->score[PRI_LANG_STRONG] > 10000.0) -- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; -- if (nodeps[f]->score[PRI_LANG_WEAK] > 10000.0) -- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; - break; - } - } -@@ -949,8 +941,7 @@ FcFontSetSort (FcConfig *config FC_UNUSED, - } - if (!satisfies) - { -- nodeps[f]->score[PRI_LANG_STRONG] = 10000.0; -- nodeps[f]->score[PRI_LANG_WEAK] = 10000.0; -+ nodeps[f]->score[PRI_LANG] = 10000.0; - } - } - --- -cgit v0.9.0.2-2-gbebe -From 18bf57c70aafcad031c0b43756b754dcaf6a756a Mon Sep 17 00:00:00 2001 -From: Sebastian Freundt <hroptatyr@fresse.org> -Date: Sun, 07 Apr 2013 00:02:58 +0000 -Subject: build-chain, replace INCLUDES directive by AM_CPPFLAGS - -As of automake-13.1 the INCLUDES directive is no longer supported. -An automake run will return with an error. - -This changeset simply follows automake's advice to replace INCLUDES -by AM_CPPFLAGS. ---- -diff --git a/Tools.mk b/Tools.mk -index 56766da..f0fa0ec 100644 ---- a/Tools.mk -+++ b/Tools.mk -@@ -32,7 +32,7 @@ TOOL=./$(DIR)$(EXEEXT_FOR_BUILD) - - EXTRA_DIST = $(TARG) $(TMPL) $(TSRC) $(DIST) - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(builddir) \ - -I$(srcdir) \ - -I$(top_builddir)/src \ -@@ -43,7 +43,7 @@ INCLUDES = \ - $(WARN_CFLAGS) - - $(TOOL): $(TSRC) $(ALIAS_FILES) -- $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(INCLUDES) -+ $(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) - - $(TARG): $(TMPL) $(TSRC) $(DEPS) - $(AM_V_GEN) $(MAKE) $(TOOL) && \ -diff --git a/fc-cache/Makefile.am b/fc-cache/Makefile.am -index 7f7d1b1..0e10786 100644 ---- a/fc-cache/Makefile.am -+++ b/fc-cache/Makefile.am -@@ -36,7 +36,7 @@ uninstall-local: - -$(RM) -rf "$(DESTDIR)$(fc_cachedir)" - endif - --INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} -I${top_srcdir}/src $(WARN_CFLAGS) - - bin_PROGRAMS=fc-cache - -diff --git a/fc-cat/Makefile.am b/fc-cat/Makefile.am -index b426723..04c1cc4 100644 ---- a/fc-cat/Makefile.am -+++ b/fc-cat/Makefile.am -@@ -27,7 +27,7 @@ FC_CAT_SRC=${top_srcdir}/fc-cat - - SGML = ${FC_CAT_SRC}/fc-cat.sgml - --INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) - - bin_PROGRAMS=fc-cat - -diff --git a/fc-list/Makefile.am b/fc-list/Makefile.am -index b2c499d..c58540e 100644 ---- a/fc-list/Makefile.am -+++ b/fc-list/Makefile.am -@@ -29,7 +29,7 @@ SGML = ${FC_LIST_SRC}/fc-list.sgml - - bin_PROGRAMS=fc-list - --INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) - - BUILT_MANS=fc-list.1 - -diff --git a/fc-match/Makefile.am b/fc-match/Makefile.am -index 0e9e8fd..84afb8b 100644 ---- a/fc-match/Makefile.am -+++ b/fc-match/Makefile.am -@@ -29,7 +29,7 @@ FC_MATCH_SRC=${top_srcdir}/fc-match - - SGML = ${FC_MATCH_SRC}/fc-match.sgml - --INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) - - BUILT_MANS=fc-match.1 - -diff --git a/fc-pattern/Makefile.am b/fc-pattern/Makefile.am -index 92b0433..c456247 100644 ---- a/fc-pattern/Makefile.am -+++ b/fc-pattern/Makefile.am -@@ -29,7 +29,7 @@ FC_PATTERN_SRC=${top_srcdir}/fc-pattern - - SGML = ${FC_PATTERN_SRC}/fc-pattern.sgml - --INCLUDES=-I${top_srcdir} $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(WARN_CFLAGS) - - BUILT_MANS=fc-pattern.1 - -diff --git a/fc-query/Makefile.am b/fc-query/Makefile.am -index b3ea1e6..73b3f11 100644 ---- a/fc-query/Makefile.am -+++ b/fc-query/Makefile.am -@@ -29,7 +29,7 @@ FC_QUERY_SRC=${top_srcdir}/fc-query - - SGML = ${FC_QUERY_SRC}/fc-query.sgml - --INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) - - BUILT_MANS=fc-query.1 - -diff --git a/fc-scan/Makefile.am b/fc-scan/Makefile.am -index 2063405..471a42f 100644 ---- a/fc-scan/Makefile.am -+++ b/fc-scan/Makefile.am -@@ -29,7 +29,7 @@ FC_SCAN_SRC=${top_srcdir}/fc-scan - - SGML = ${FC_SCAN_SRC}/fc-scan.sgml - --INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) - - BUILT_MANS=fc-scan.1 - -diff --git a/fc-validate/Makefile.am b/fc-validate/Makefile.am -index 54edec2..782cead 100644 ---- a/fc-validate/Makefile.am -+++ b/fc-validate/Makefile.am -@@ -29,7 +29,7 @@ FC_VALIDATE_SRC=${top_srcdir}/fc-validate - - SGML = ${FC_VALIDATE_SRC}/fc-validate.sgml - --INCLUDES=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) -+AM_CPPFLAGS=-I${top_srcdir} $(FREETYPE_CFLAGS) $(WARN_CFLAGS) - - BUILT_MANS=fc-validate.1 - -diff --git a/src/Makefile.am b/src/Makefile.am -index 9fd7dd8..066cc03 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -70,7 +70,7 @@ uninstall-ms-import-lib: - - endif - --INCLUDES = \ -+AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/src \ - $(FREETYPE_CFLAGS) \ --- -cgit v0.9.0.2-2-gbebe -From 9299155b5247255d6b6687448173056c3ca8d09b Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Tue, 09 Apr 2013 02:34:35 +0000 -Subject: Ensure closing fp on error - ---- -diff --git a/src/fchash.c b/src/fchash.c -index 827b20f..4ea5f37 100644 ---- a/src/fchash.c -+++ b/src/fchash.c -@@ -220,7 +220,7 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename) - - ret = FcHashInitSHA256Digest (); - if (!ret) -- return NULL; -+ goto bail0; - - while (!feof (fp)) - { --- -cgit v0.9.0.2-2-gbebe -From c93a8b8b54afe33e5ecf9870723543cb4058fa94 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Tue, 09 Apr 2013 03:46:30 +0000 -Subject: Obtain fonts data via FT_Face instead of opening a file directly - ---- -diff --git a/src/fcfreetype.c b/src/fcfreetype.c -index 8a037c0..1eecfdb 100644 ---- a/src/fcfreetype.c -+++ b/src/fcfreetype.c -@@ -1662,7 +1662,7 @@ FcFreeTypeQueryFace (const FT_Face face, - if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative)) - goto bail1; - -- hashstr = FcHashGetSHA256DigestFromFile (file); -+ hashstr = FcHashGetSHA256DigestFromFace (face); - if (!hashstr) - goto bail1; - if (!FcPatternAddString (pat, FC_HASH, hashstr)) -diff --git a/src/fchash.c b/src/fchash.c -index 4ea5f37..043d94b 100644 ---- a/src/fchash.c -+++ b/src/fchash.c -@@ -29,6 +29,9 @@ - #include "fcint.h" - #include <stdio.h> - #include <string.h> -+#include <ft2build.h> -+#include FT_TRUETYPE_TABLES_H -+#include FT_TRUETYPE_TAGS_H - - #define ROTRN(w, v, n) ((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n))) - #define ROTR32(v, n) ROTRN(32, v, n) -@@ -204,41 +207,50 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings, - } - - FcChar8 * --FcHashGetSHA256DigestFromFile (const FcChar8 *filename) -+FcHashGetSHA256DigestFromFace (const FT_Face face) - { -- FILE *fp = fopen ((const char *)filename, "rb"); -- char ibuf[64]; -+ char ibuf[64], *buf = NULL; - FcChar32 *ret; -- size_t len; -- struct stat st; -+ FT_Error err; -+ FT_ULong len = 0, alen, i = 0; - -- if (!fp) -+ err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); -+ if (err != FT_Err_Ok) - return NULL; -- -- if (FcStat (filename, &st)) -+ alen = (len + 63) & ~63; -+ buf = malloc (alen); -+ if (!buf) -+ return NULL; -+ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len); -+ if (err != FT_Err_Ok) - goto bail0; -+ memset (&buf[len], 0, alen - len); - - ret = FcHashInitSHA256Digest (); - if (!ret) - goto bail0; - -- while (!feof (fp)) -+ while (i <= len) - { -- if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64) -+ if ((len - i) < 64) - { - long v; -+ int n; - - /* add a padding */ -- memset (&ibuf[len], 0, 64 - len); -- ibuf[len] = 0x80; -- if ((64 - len) < 9) -+ n = len - i; -+ if (n > 0) -+ memcpy (ibuf, &buf[i], n); -+ memset (&ibuf[n], 0, 64 - n); -+ ibuf[n] = 0x80; -+ if ((64 - n) < 9) - { - /* process a block once */ - FcHashComputeSHA256Digest (ret, ibuf); - memset (ibuf, 0, 64); - } - /* set input size at the end */ -- v = (long)st.st_size * 8; -+ v = len * 8; - ibuf[63 - 0] = v & 0xff; - ibuf[63 - 1] = (v >> 8) & 0xff; - ibuf[63 - 2] = (v >> 16) & 0xff; -@@ -252,14 +264,18 @@ FcHashGetSHA256DigestFromFile (const FcChar8 *filename) - } - else - { -- FcHashComputeSHA256Digest (ret, ibuf); -+ FcHashComputeSHA256Digest (ret, &buf[i]); - } -+ i += 64; - } -- fclose (fp); -+ if (buf) -+ free (buf); - - return FcHashSHA256ToString (ret); - - bail0: -- fclose (fp); -+ if (buf) -+ free (buf); -+ - return NULL; - } -diff --git a/src/fcint.h b/src/fcint.h -index c45075e..703b983 100644 ---- a/src/fcint.h -+++ b/src/fcint.h -@@ -47,6 +47,8 @@ - #include "fcdeprecate.h" - #include "fcmutex.h" - #include "fcatomic.h" -+#include <ft2build.h> -+#include FT_FREETYPE_H - - #ifndef FC_CONFIG_PATH - #define FC_CONFIG_PATH "fonts.conf" -@@ -819,7 +821,7 @@ FcPrivate FcChar8 * - FcHashGetSHA256Digest (const FcChar8 *input_strings, - size_t len); - FcPrivate FcChar8 * --FcHashGetSHA256DigestFromFile (const FcChar8 *filename); -+FcHashGetSHA256DigestFromFace (const FT_Face face); - - /* fcinit.c */ - FcPrivate FcConfig * --- -cgit v0.9.0.2-2-gbebe -From fc5a589abad0e8285f7d95007ebda76536e8fa7d Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Tue, 09 Apr 2013 08:18:43 +0000 -Subject: Revert the previous change and rework to not export freetype API outside fcfreetype.c - ---- -diff --git a/src/fcfreetype.c b/src/fcfreetype.c -index 1eecfdb..22064b3 100644 ---- a/src/fcfreetype.c -+++ b/src/fcfreetype.c -@@ -1104,7 +1104,10 @@ FcFreeTypeQueryFace (const FT_Face face, - char psname[256]; - const char *tmp; - -- FcChar8 *hashstr; -+ FcChar8 *hashstr = NULL; -+ char *fontdata = NULL; -+ FT_Error err; -+ FT_ULong len = 0, alen; - - pat = FcPatternCreate (); - if (!pat) -@@ -1662,12 +1665,22 @@ FcFreeTypeQueryFace (const FT_Face face, - if (!FcPatternAddBool (pat, FC_DECORATIVE, decorative)) - goto bail1; - -- hashstr = FcHashGetSHA256DigestFromFace (face); -+ err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); -+ if (err != FT_Err_Ok) -+ goto bail1; -+ alen = (len + 63) & ~63; -+ fontdata = malloc (alen); -+ if (!fontdata) -+ goto bail1; -+ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); -+ if (err != FT_Err_Ok) -+ goto bail1; -+ memset (&fontdata[len], 0, alen - len); -+ hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); - if (!hashstr) - goto bail1; - if (!FcPatternAddString (pat, FC_HASH, hashstr)) - goto bail1; -- free (hashstr); - - /* - * Compute the unicode coverage for the font -@@ -1756,6 +1769,10 @@ FcFreeTypeQueryFace (const FT_Face face, - bail2: - FcCharSetDestroy (cs); - bail1: -+ if (hashstr) -+ free (hashstr); -+ if (fontdata) -+ free (fontdata); - FcPatternDestroy (pat); - bail0: - return NULL; -diff --git a/src/fchash.c b/src/fchash.c -index 043d94b..1ef1e16 100644 ---- a/src/fchash.c -+++ b/src/fchash.c -@@ -29,9 +29,6 @@ - #include "fcint.h" - #include <stdio.h> - #include <string.h> --#include <ft2build.h> --#include FT_TRUETYPE_TABLES_H --#include FT_TRUETYPE_TAGS_H - - #define ROTRN(w, v, n) ((((FcChar32)v) >> n) | (((FcChar32)v) << (w - n))) - #define ROTR32(v, n) ROTRN(32, v, n) -@@ -207,40 +204,28 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings, - } - - FcChar8 * --FcHashGetSHA256DigestFromFace (const FT_Face face) -+FcHashGetSHA256DigestFromMemory (const char *fontdata, -+ size_t length) - { -- char ibuf[64], *buf = NULL; -+ char ibuf[64]; - FcChar32 *ret; -- FT_Error err; -- FT_ULong len = 0, alen, i = 0; -- -- err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); -- if (err != FT_Err_Ok) -- return NULL; -- alen = (len + 63) & ~63; -- buf = malloc (alen); -- if (!buf) -- return NULL; -- err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)buf, &len); -- if (err != FT_Err_Ok) -- goto bail0; -- memset (&buf[len], 0, alen - len); -+ size_t i = 0; - - ret = FcHashInitSHA256Digest (); - if (!ret) -- goto bail0; -+ return NULL; - -- while (i <= len) -+ while (i <= length) - { -- if ((len - i) < 64) -+ if ((length - i) < 64) - { - long v; -- int n; -+ size_t n; - - /* add a padding */ -- n = len - i; -+ n = length - i; - if (n > 0) -- memcpy (ibuf, &buf[i], n); -+ memcpy (ibuf, &fontdata[i], n); - memset (&ibuf[n], 0, 64 - n); - ibuf[n] = 0x80; - if ((64 - n) < 9) -@@ -250,7 +235,7 @@ FcHashGetSHA256DigestFromFace (const FT_Face face) - memset (ibuf, 0, 64); - } - /* set input size at the end */ -- v = len * 8; -+ v = length * 8; - ibuf[63 - 0] = v & 0xff; - ibuf[63 - 1] = (v >> 8) & 0xff; - ibuf[63 - 2] = (v >> 16) & 0xff; -@@ -264,18 +249,10 @@ FcHashGetSHA256DigestFromFace (const FT_Face face) - } - else - { -- FcHashComputeSHA256Digest (ret, &buf[i]); -+ FcHashComputeSHA256Digest (ret, &fontdata[i]); - } - i += 64; - } -- if (buf) -- free (buf); - - return FcHashSHA256ToString (ret); -- --bail0: -- if (buf) -- free (buf); -- -- return NULL; - } -diff --git a/src/fcint.h b/src/fcint.h -index 703b983..a662dbf 100644 ---- a/src/fcint.h -+++ b/src/fcint.h -@@ -47,8 +47,6 @@ - #include "fcdeprecate.h" - #include "fcmutex.h" - #include "fcatomic.h" --#include <ft2build.h> --#include FT_FREETYPE_H - - #ifndef FC_CONFIG_PATH - #define FC_CONFIG_PATH "fonts.conf" -@@ -821,7 +819,8 @@ FcPrivate FcChar8 * - FcHashGetSHA256Digest (const FcChar8 *input_strings, - size_t len); - FcPrivate FcChar8 * --FcHashGetSHA256DigestFromFace (const FT_Face face); -+FcHashGetSHA256DigestFromMemory (const char *fontdata, -+ size_t length); - - /* fcinit.c */ - FcPrivate FcConfig * --- -cgit v0.9.0.2-2-gbebe -From 77419a4dfdf41ed34dd03e74d0e4e6f89dbc65e1 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Wed, 10 Apr 2013 02:14:39 +0000 -Subject: documented FC_HASH and FC_POSTSCRIPT_NAME - ---- -diff --git a/doc/fontconfig-devel.sgml b/doc/fontconfig-devel.sgml -index 05c5c09..a7b8530 100644 ---- a/doc/fontconfig-devel.sgml -+++ b/doc/fontconfig-devel.sgml -@@ -196,6 +196,9 @@ convenience for the application's rendering mechanism. - default value of familylang, - stylelang and fullnamelang - prgname FC_PRGNAME String Name of the running program -+ hash FC_HASH String SHA256 hash value of the font data -+ with "sha256:" prefix. -+ postscriptname FC_POSTSCRIPT_NAME String Font name in PostScript - </programlisting> - </sect2> - </sect1> --- -cgit v0.9.0.2-2-gbebe -From 03216ccf4ca0808f9c7b9513efcaeb7f4058b575 Mon Sep 17 00:00:00 2001 -From: Akira TAGOH <akira@tagoh.org> -Date: Wed, 10 Apr 2013 09:41:22 +0000 -Subject: Bug 63329 - make check fails: .. contents:: :depth: 2 - -Add back FcHashGetSHA256DigestFromFile() and fall back to it -when font isn't SFNT-based font because FT_Load_Sfnt_Table -fails with FT_Err_Invalid_Face_Handle. ---- -diff --git a/src/fcfreetype.c b/src/fcfreetype.c -index 22064b3..5e8990d 100644 ---- a/src/fcfreetype.c -+++ b/src/fcfreetype.c -@@ -1666,17 +1666,29 @@ FcFreeTypeQueryFace (const FT_Face face, - goto bail1; - - err = FT_Load_Sfnt_Table (face, 0, 0, NULL, &len); -- if (err != FT_Err_Ok) -- goto bail1; -- alen = (len + 63) & ~63; -- fontdata = malloc (alen); -- if (!fontdata) -- goto bail1; -- err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); -- if (err != FT_Err_Ok) -+ if (err == FT_Err_Ok) -+ { -+ alen = (len + 63) & ~63; -+ fontdata = malloc (alen); -+ if (!fontdata) -+ goto bail1; -+ err = FT_Load_Sfnt_Table (face, 0, 0, (FT_Byte *)fontdata, &len); -+ if (err != FT_Err_Ok) -+ goto bail1; -+ memset (&fontdata[len], 0, alen - len); -+ hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); -+ } -+ else if (err == FT_Err_Invalid_Face_Handle) -+ { -+ /* font may not support SFNT. falling back to -+ * read the font data from file directly -+ */ -+ hashstr = FcHashGetSHA256DigestFromFile (file); -+ } -+ else -+ { - goto bail1; -- memset (&fontdata[len], 0, alen - len); -- hashstr = FcHashGetSHA256DigestFromMemory (fontdata, len); -+ } - if (!hashstr) - goto bail1; - if (!FcPatternAddString (pat, FC_HASH, hashstr)) -diff --git a/src/fchash.c b/src/fchash.c -index 1ef1e16..92585a6 100644 ---- a/src/fchash.c -+++ b/src/fchash.c -@@ -204,6 +204,68 @@ FcHashGetSHA256Digest (const FcChar8 *input_strings, - } - - FcChar8 * -+FcHashGetSHA256DigestFromFile (const FcChar8 *filename) -+{ -+ FILE *fp = fopen ((const char *)filename, "rb"); -+ char ibuf[64]; -+ FcChar32 *ret; -+ size_t len; -+ struct stat st; -+ -+ if (!fp) -+ return NULL; -+ -+ if (FcStat (filename, &st)) -+ goto bail0; -+ -+ ret = FcHashInitSHA256Digest (); -+ if (!ret) -+ goto bail0; -+ -+ while (!feof (fp)) -+ { -+ if ((len = fread (ibuf, sizeof (char), 64, fp)) < 64) -+ { -+ long v; -+ -+ /* add a padding */ -+ memset (&ibuf[len], 0, 64 - len); -+ ibuf[len] = 0x80; -+ if ((64 - len) < 9) -+ { -+ /* process a block once */ -+ FcHashComputeSHA256Digest (ret, ibuf); -+ memset (ibuf, 0, 64); -+ } -+ /* set input size at the end */ -+ v = (long)st.st_size * 8; -+ ibuf[63 - 0] = v & 0xff; -+ ibuf[63 - 1] = (v >> 8) & 0xff; -+ ibuf[63 - 2] = (v >> 16) & 0xff; -+ ibuf[63 - 3] = (v >> 24) & 0xff; -+ ibuf[63 - 4] = (v >> 32) & 0xff; -+ ibuf[63 - 5] = (v >> 40) & 0xff; -+ ibuf[63 - 6] = (v >> 48) & 0xff; -+ ibuf[63 - 7] = (v >> 56) & 0xff; -+ FcHashComputeSHA256Digest (ret, ibuf); -+ break; -+ } -+ else -+ { -+ FcHashComputeSHA256Digest (ret, ibuf); -+ } -+ } -+ fclose (fp); -+ -+ return FcHashSHA256ToString (ret); -+ -+bail0: -+ fclose (fp); -+ -+ return NULL; -+} -+ -+FcChar8 * - FcHashGetSHA256DigestFromMemory (const char *fontdata, - size_t length) - { -diff --git a/src/fcint.h b/src/fcint.h -index a662dbf..8919958 100644 ---- a/src/fcint.h -+++ b/src/fcint.h -@@ -818,6 +818,10 @@ FcFontSetSerialize (FcSerialize *serialize, const FcFontSet * s); - FcPrivate FcChar8 * - FcHashGetSHA256Digest (const FcChar8 *input_strings, - size_t len); -+ -+FcPrivate FcChar8 * -+FcHashGetSHA256DigestFromFile (const FcChar8 *filename); -+ - FcPrivate FcChar8 * - FcHashGetSHA256DigestFromMemory (const char *fontdata, - size_t length); --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD index d4f3401d1..2c323008e 100644 --- a/extra/gdb/PKGBUILD +++ b/extra/gdb/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 183696 2013-04-27 07:01:47Z allan $ +# $Id: PKGBUILD 193781 2013-08-31 05:34:23Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gdb -pkgver=7.6 +pkgver=7.6.1 pkgrel=1 pkgdesc="The GNU Debugger" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ backup=('etc/gdb/gdbinit') options=('!libtool') install=gdb.install source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig}) -md5sums=('fda57170e4d11cdde74259ca575412a8' +md5sums=('fbc4dab4181e6e9937075b43a4ce2732' 'SKIP') prepare() { diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD index 8ad7bccfc..8baf014ff 100644 --- a/extra/gimp/PKGBUILD +++ b/extra/gimp/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 188883 2013-06-23 21:29:32Z daniel $ +# $Id: PKGBUILD 193684 2013-08-28 00:06:02Z eric $ # Maintainer: Daniel Isenmann <daniel@archlinux.org> pkgname=gimp pkgver=2.8.6 -pkgrel=1 +pkgrel=2 pkgdesc="GNU Image Manipulation Program" arch=('i686' 'x86_64' 'mips64el') url="http://www.gimp.org/" diff --git a/extra/glamor-egl/PKGBUILD b/extra/glamor-egl/PKGBUILD index bc7954587..0565d6c3f 100644 --- a/extra/glamor-egl/PKGBUILD +++ b/extra/glamor-egl/PKGBUILD @@ -3,61 +3,37 @@ # Contributor: Eugeni Dodonov <eugeni@dodonov.net> pkgname=glamor-egl -pkgver=0.5.0 -pkgrel=4 -pkgdesc='OpenGL based 2D rendering acceleration library ' +pkgver=0.5.1 +pkgrel=1 +pkgdesc='OpenGL based 2D rendering acceleration library' arch=('i686' 'x86_64') url="http://xorg.freedesktop.org/" license=('custom') depends=('mesa-libgl') makedepends=('xorg-server-devel') -source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2 - glamor_utils.h glamor_priv.h glapi.h - compat-api.h compiler.h glamor_debug.h glamor_gl_dispatch.h glamor_glext.h - git-fixes.patch) +source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2) conflicts=('glamor-git') options=('!libtool') -sha256sums=('5dc8679ccb3e42bf431b6316c7907b9df2db89745d523e04721f34aee6c84991' - 'fb7db610451d8bb0baaabe3ac618794f535924ac08f62159b08a82ac90a1ed4a' - '6ad1b6349325be84aa9fe6f0b3224128f11bcf00a91a7080e40cd7b58a83137c' - '5c148a18607f94fcdfebe2838aa77d190cb913e05579a9676c2520219a5e2a6a' - '1a5c1059a3757047de064ccd952ab637b73e7e2d55cbccd6dafc60b57aaed1d0' - 'f883c329e7ec94afafa646b866eaab8a5616761b5ffe2b2837c75d403917944a' - 'fc3d937f2cb996586d3a9cc7427050d04d2d19d3f745055cc9d3556428a7cf93' - 'a7fac65474af636995d0181dbf7f8f091d8657260162eb172ae816b75ad98b54' - 'dcf38a7ac303c1636a3b1b7810dcb6ee65ba7e81b6e590840e164ce0e28010dc' - 'c56e677456fb8555b009b1d3b95e939b5a38f37c2a345fff48f2b723e44045e9') +sha256sums=('f42805b68e2bddc90cb5d9d3811e4f2176659c5686f295865839b20b7be7f359') build() { cd ${srcdir}/${pkgname}-${pkgver} - # add missing headers - tarball creation buggy - cp $srcdir/*.h src/ - - patch -Np1 -i ${srcdir}/git-fixes.patch - - autoreconf -vfi - ./configure --prefix=/usr \ --disable-static \ --enable-glx-tls \ #--with-xorg-conf-dir=/etc/X11/xorg.conf.d - #--help #--enable-glamor-gles2 \ https://bugs.archlinux.org/task/34284 + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" + make "DESTDIR=${pkgdir}" install + install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}" install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/" - - # hack for lib loading with recent Xorg-servers, see FS#34236 and - # http://lists.x.org/archives/xorg-devel/2013-March/035719.html - - # add glamor library path to ld.so.conf.d -# install -d ${pkgdir}/etc/ld.so.conf.d -# echo "/usr/lib/xorg/modules" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf } diff --git a/extra/gnome-documents/PKGBUILD b/extra/gnome-documents/PKGBUILD index 830d2116d..d9194daa2 100644 --- a/extra/gnome-documents/PKGBUILD +++ b/extra/gnome-documents/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 188472 2013-06-14 19:29:50Z heftig $ +# $Id: PKGBUILD 193767 2013-08-30 14:34:45Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgname=gnome-documents -pkgver=3.8.3.1 +pkgver=3.8.4 pkgrel=1 pkgdesc="Documents Manager for GNOME" arch=(i686 x86_64 mips64el) @@ -16,7 +16,7 @@ optdepends=('unoconv: Support for Libreoffice document types') options=('!libtool') install=gnome-documents.install source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz) -sha256sums=('608d965857a0dc0230f0c2408dc28acd78fba5e77b2ba4a1c7fe99376c05b551') +sha256sums=('daebb07b2e0767677e5fbdc4f5b5ca6672089565f955e3a42505e3f784e02ed9') build() { cd $pkgname-$pkgver diff --git a/extra/gnome-online-accounts/PKGBUILD b/extra/gnome-online-accounts/PKGBUILD index 59ead62c0..5b9c7e624 100644 --- a/extra/gnome-online-accounts/PKGBUILD +++ b/extra/gnome-online-accounts/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192045 2013-08-05 10:07:57Z jgc $ +# $Id: PKGBUILD 193766 2013-08-30 14:31:41Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gnome-online-accounts -pkgver=3.8.2 -pkgrel=2 +pkgver=3.8.3 +pkgrel=1 pkgdesc="GNOME service to access online accounts" arch=(i686 x86_64 mips64el) url="http://www.gnome.org" @@ -13,24 +13,16 @@ makedepends=('intltool' 'libxslt' 'gobject-introspection' 'docbook-xsl') 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 drop-google-password-interface-1.patch drop-google-password-interface-2.patch drop-google-password-interface-3.patch) -sha256sums=('12611a002043c8acc29e9800ec009e3e19736bdb6237d246e848d7c7909fe826' - '2b413d1f401647bd143b7dc6dd4b6d6660ff47ef9a11ccbc691b7c13de5cba69' - 'e7250be7c078053345699250433b7164751d3e457155bd35508c7d1660f459be' +sha256sums=('9e5e55c5097b8d7c32c0dfb7d94448795c627723b133e8edd0b846adde63a44b' '33435c10aa1ba3fbb6fd633dc098cd1da50629f1d602521ca83be5379f2ebe48' 'c837f9be4e5e072a06ea44076e6b9a1519c66c95b16d7a55b1dba105fded317f' '18dfad8ed978af1068fd057bbe323006c349ac4ea77c742aa06f1011dc92326e') prepare() { cd $pkgname-$pkgver - # Upstream 3.8 branch - patch -Np1 -i ../imap-smtp.patch - patch -Np1 -i ../smtp-auth-plain.patch - # Backport from Ubuntu patch -Np1 -i ../drop-google-password-interface-1.patch patch -Np1 -i ../drop-google-password-interface-2.patch diff --git a/extra/gnome-online-accounts/imap-smtp.patch b/extra/gnome-online-accounts/imap-smtp.patch deleted file mode 100644 index 7213c8d1e..000000000 --- a/extra/gnome-online-accounts/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/extra/gnome-online-accounts/smtp-auth-plain.patch b/extra/gnome-online-accounts/smtp-auth-plain.patch deleted file mode 100644 index c6782d0f6..000000000 --- a/extra/gnome-online-accounts/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/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD index cf56d7b7c..d31a65301 100644 --- a/extra/gnumeric/PKGBUILD +++ b/extra/gnumeric/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 193620 2013-08-26 07:59:33Z jgc $ +# $Id: PKGBUILD 193817 2013-09-02 12:41:23Z jgc $ # Maintainer: Eric Belanger <eric@archlinux.org> # Contributor: Kritoke <typeolinux@yahoo.com> pkgname=gnumeric -pkgver=1.12.5 +pkgver=1.12.7 pkgrel=1 pkgdesc="A GNOME Spreadsheet Program" arch=('i686' 'x86_64' 'mips64el') @@ -20,7 +20,7 @@ install=gnumeric.install options=('!libtool') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz revert-warnings.patch) -sha256sums=('7ff36dff134157ce6919c4cebc1a419192e529b00e42c52d9cebbd15e8dd5871' +sha256sums=('5de9cca87efb2ea190bcddf57bd83a34e7f9580f5b7c92c6757707d1164748ef' 'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53') prepare() { diff --git a/extra/gnutls/PKGBUILD b/extra/gnutls/PKGBUILD index f42a8c29c..32ed5cb91 100644 --- a/extra/gnutls/PKGBUILD +++ b/extra/gnutls/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191780 2013-07-30 17:27:51Z andyrtr $ +# $Id: PKGBUILD 193808 2013-09-02 08:07:32Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=gnutls -pkgver=3.2.3 +pkgver=3.2.4 pkgrel=1 pkgdesc="A library which provides a secure layer over a reliable transport layer" arch=('i686' 'x86_64' 'mips64el') @@ -15,7 +15,7 @@ depends=('gcc-libs' 'libtasn1' 'readline' 'zlib' 'nettle' 'p11-kit') makedepends=('strace' 'datefudge') [ "$CARCH" = "mips64el" ] || makedepends+=('valgrind') source=(ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${pkgname}-${pkgver}.tar.xz{,.sig}) -md5sums=('7c0dd4f77dc70c64d2f385aeb2df4157' +md5sums=('79ef8538d65128b7ed47046649b98c27' 'SKIP') build() { diff --git a/extra/goffice/PKGBUILD b/extra/goffice/PKGBUILD index f62f6052e..0adf72294 100644 --- a/extra/goffice/PKGBUILD +++ b/extra/goffice/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 193438 2013-08-20 07:25:28Z jgc $ +# $Id: PKGBUILD 193815 2013-09-02 12:10:06Z jgc $ # Maintainer: Aaron Griffin <aaron@archlinux.org> pkgname=goffice -pkgver=0.10.5 +pkgver=0.10.7 pkgrel=1 pkgdesc="A library of document-centric objects and utilities built on top of GLib and Gtk+" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ options=('!libtool') makedepends=('pkgconfig' 'intltool' 'gtk-doc' 'gobject-introspection') depends=('librsvg' 'gtk3' 'libgsf' 'libspectre') source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz) -sha256sums=('63a7a7dd55fbe91991a66dbc78ab27d2ac55bd722d42d4dd3087e3ae33832570') +sha256sums=('d1663fc7851f0f50329b37311b1859db184ac088eea4b80472f163c036896597') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/extra/graphviz/LICENSE b/extra/graphviz/LICENSE deleted file mode 100644 index 16cc69a52..000000000 --- a/extra/graphviz/LICENSE +++ /dev/null @@ -1,87 +0,0 @@ -Eclipse Public License - v 1.0 - -THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. - -1. DEFINITIONS - -"Contribution" means: - -a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and - -b) in the case of each subsequent Contributor: - -i) changes to the Program, and - -ii) additions to the Program; - -where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program. - -"Contributor" means any person or entity that distributes the Program. - -"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program. - -"Program" means the Contributions distributed in accordance with this Agreement. - -"Recipient" means anyone who receives the Program under this Agreement, including all Contributors. - -2. GRANT OF RIGHTS - -a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form. - -b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder. - -c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program. - -d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement. - -3. REQUIREMENTS - -A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that: - -a) it complies with the terms and conditions of this Agreement; and - -b) its license agreement: - -i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose; - -ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits; - -iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and - -iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange. - -When the Program is made available in source code form: - -a) it must be made available under this Agreement; and - -b) a copy of this Agreement must be included with each copy of the Program. - -Contributors may not remove or alter any copyright notices contained within the Program. - -Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution. - -4. COMMERCIAL DISTRIBUTION - -Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense. - -For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages. - -5. NO WARRANTY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations. - -6. DISCLAIMER OF LIABILITY - -EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -7. GENERAL - -If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. - -If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed. - -All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive. - -Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved. - -This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation. diff --git a/extra/graphviz/PKGBUILD b/extra/graphviz/PKGBUILD index e107a6eac..c70f07471 100644 --- a/extra/graphviz/PKGBUILD +++ b/extra/graphviz/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 193136 2013-08-17 08:22:14Z pierre $ +# $Id: PKGBUILD 193739 2013-08-29 23:46:03Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: kevin <kevin@archlinux.org> # Contributor: John Proctor <jproctor@prium.net> pkgname=graphviz -pkgver=2.30.1 -pkgrel=7 +pkgver=2.32.0 +pkgrel=1 pkgdesc='Graph visualization software' url='http://www.graphviz.org/' -license=('custom:EPL') +license=('CPL') arch=('i686' 'x86_64' 'mips64el') depends=('libltdl' 'gd' 'librsvg' 'libxaw' 'ghostscript' 'pango' 'gts') makedepends=('swig' 'guile' 'lua51' 'ocaml' 'perl' 'php' 'python2' 'ruby' 'tk' 'qt4') @@ -26,10 +26,8 @@ if [ "$CARCH" != "mips64el" ]; then optdepends+=('mono: sharp bindings' 'r: r bindings') fi -source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz" - 'LICENSE') -sha1sums=('96739220c4bbcf1bd3bd52e7111f4e60497185c6' - 'e78277e502c29abb74b9587a5dc951ec392554ea') +source=("${url}/pub/${pkgname}/stable/SOURCES/${pkgname}-${pkgver}.tar.gz") +sha1sums=('a64f4a409012d13d18338ecb8bd7253083ebc35e') options=('!libtool') install=install @@ -67,9 +65,6 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - # http://www.graphviz.org/License.php - install -Dm644 ../LICENSE "${pkgdir}"/usr/share/licenses/graphviz/LICENSE - # everything has been built against cgraph, but use graph as default api sed '/#define WITH_CGRAPH 1/d' -i "${pkgdir}"/usr/include/graphviz/types.h } diff --git a/extra/gst-libav/PKGBUILD b/extra/gst-libav/PKGBUILD index 8a3ab6f1e..3d87d9da8 100644 --- a/extra/gst-libav/PKGBUILD +++ b/extra/gst-libav/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191871 2013-07-31 17:39:18Z heftig $ +# $Id: PKGBUILD 193754 2013-08-30 08:16:24Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-libav -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc="Gstreamer libav Plugin" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ makedepends=('yasm') options=(!libtool !emptydirs) provides=("gst-ffmpeg=$pkgver-$pkgrel") source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('759641c0597c24191322f40945b363b75df299a539ff4086650be6193028189a') +sha256sums=('b6d059d1a39967ef7e1d345009fe003afe14ab55006d68e895a64f4a36968c5e') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-base/PKGBUILD b/extra/gst-plugins-base/PKGBUILD index bb9c4ac21..f7b3dfcb5 100644 --- a/extra/gst-plugins-base/PKGBUILD +++ b/extra/gst-plugins-base/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 191865 2013-07-31 17:14:21Z heftig $ +# $Id: PKGBUILD 193750 2013-08-30 08:12:17Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=gst-plugins-base pkgname=('gst-plugins-base-libs' 'gst-plugins-base') -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Base Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ makedepends=('pkgconfig' 'gstreamer' 'orc' 'libxv' 'alsa-lib' 'cdparanoia' 'libv options=(!libtool !emptydirs) url="http://gstreamer.freedesktop.org/" source=(${url}/src/$pkgbase/$pkgbase-${pkgver}.tar.xz) -sha256sums=('963e3b83d651661f495ca2e44ccd2d5c61e986e9d7706246e568276689a372ea') +sha256sums=('9754e83b2a3ff61266112915bfc84c895c4d145519ad9a3381edceb216bc97e8') build() { cd $pkgbase-$pkgver diff --git a/extra/gst-plugins-good/PKGBUILD b/extra/gst-plugins-good/PKGBUILD index 2cbed4550..057b077a6 100644 --- a/extra/gst-plugins-good/PKGBUILD +++ b/extra/gst-plugins-good/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191870 2013-07-31 17:33:33Z heftig $ +# $Id: PKGBUILD 193751 2013-08-30 08:13:17Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-good -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Good Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,7 @@ depends=('libpulse' 'jack' 'libsoup' 'gst-plugins-base-libs' 'wavpack' 'aalib' ' makedepends=('gstreamer' 'speex' 'flac' 'libraw1394') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('cfa2e617a76f93e9ddd4ae1109297e93fb4a06b152042b996231234a72c5a5ff') +sha256sums=('c60342d6080ac6f794c5c2427dfbdee9140a2f67b82e7e945e286a2d416428ae') build() { cd $pkgname-$pkgver diff --git a/extra/gst-plugins-ugly/PKGBUILD b/extra/gst-plugins-ugly/PKGBUILD index 578b1b492..f7709298a 100644 --- a/extra/gst-plugins-ugly/PKGBUILD +++ b/extra/gst-plugins-ugly/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191938 2013-08-01 08:51:34Z heftig $ +# $Id: PKGBUILD 193753 2013-08-30 08:14:48Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-plugins-ugly -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc="GStreamer Multimedia Framework Ugly Plugins" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ url="http://gstreamer.freedesktop.org/" depends=('gst-plugins-base-libs' 'libdvdread' 'lame' 'libmpeg2' 'a52dec' 'libmad' 'libsidplay' 'libcdio' 'x264' 'opencore-amr') options=(!libtool !emptydirs) source=(${url}/src/$pkgname/$pkgname-$pkgver.tar.xz) -sha256sums=('11250fe9e44b0169c3a289e981b31874b483643ed78f619682ae1644d7088379') +sha256sums=('bed3510e09f036e7609e8d291535c395d25109b1180324b16859f475eac3a3c0') build() { cd $pkgname-$pkgver diff --git a/extra/gstreamer-vaapi/PKGBUILD b/extra/gstreamer-vaapi/PKGBUILD index 45a3bc4bd..d14884e68 100644 --- a/extra/gstreamer-vaapi/PKGBUILD +++ b/extra/gstreamer-vaapi/PKGBUILD @@ -1,25 +1,23 @@ -# $Id: PKGBUILD 193179 2013-08-18 02:49:33Z heftig $ +# $Id: PKGBUILD 193801 2013-09-01 14:13:21Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> pkgbase=gstreamer-vaapi pkgname=(gst-vaapi gstreamer0.10-vaapi) -pkgver=0.5.5.1 -pkgrel=2 +pkgver=0.5.6 +pkgrel=1 pkgdesc="GStreamer Multimedia Framework VA Plugins" arch=(i686 x86_64) license=(LGPL) url="http://www.freedesktop.org/software/vaapi/releases/gstreamer-vaapi/" makedepends=(gst-plugins-base gst-plugins-bad gstreamer0.10-base-plugins gstreamer0.10-bad-plugins libva - libxrandr git) + libxrandr) options=(!libtool !emptydirs) -#source=($url/$pkgbase-${pkgver}.tar.bz2) -source=("$pkgbase-$pkgver::git://gitorious.org/vaapi/gstreamer-vaapi.git#commit=73323ba") -sha1sums=('SKIP') +source=($url/$pkgbase-${pkgver}.tar.bz2) +sha1sums=('884a47cc4916f441bec160235927556a79c7ea09') prepare() { cd $pkgbase-$pkgver - NO_CONFIGURE=1 ./autogen.sh mkdir build-1.0 build-0.10 } @@ -29,7 +27,7 @@ build() { make cd ../build-0.10 - ../configure --prefix=/usr --disable-static --with-gstreamer-api=0.10 + ../configure --prefix=/usr --disable-static --with-gstreamer-api=0.10 --disable-wayland make } diff --git a/extra/gstreamer/PKGBUILD b/extra/gstreamer/PKGBUILD index 2b21463b8..b210533f2 100644 --- a/extra/gstreamer/PKGBUILD +++ b/extra/gstreamer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 191864 2013-07-31 17:05:38Z heftig $ +# $Id: PKGBUILD 193749 2013-08-30 08:11:09Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gstreamer -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc="GStreamer Multimedia Framework" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ optdepends=('sh: feedback script') makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'gobject-introspection') options=('!libtool') source=(${url}/src/gstreamer/gstreamer-${pkgver}.tar.xz) -sha256sums=('17a2c60a82baa461ef685ad3de187edb9c03a2c7e07513daba58a5a32efacaa3') +sha256sums=('8e0aa9f41370586171a2616326fbc508bc4b61ffc4d55b2a8c4c3459d0cc1130') build() { cd "${srcdir}/gstreamer-${pkgver}" diff --git a/extra/gtk3/PKGBUILD b/extra/gtk3/PKGBUILD index 2696f6a64..202045ba9 100644 --- a/extra/gtk3/PKGBUILD +++ b/extra/gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 185333 2013-05-13 12:25:58Z heftig $ +# $Id: PKGBUILD 193768 2013-08-30 14:56:03Z heftig $ # Maintainer: Ionut Biru <ibiru@archlinux.org> pkgname=gtk3 -pkgver=3.8.2 +pkgver=3.8.4 pkgrel=1 pkgdesc="GObject-based multi-platform GUI toolkit (v3)" arch=(i686 x86_64 mips64el) @@ -15,8 +15,9 @@ backup=(etc/gtk-3.0/settings.ini) license=(LGPL) source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz settings.ini) -sha256sums=('1ca80c9c15a1df95d74cefb8c2afe4682ba272a4b489106f04877be2a7aff297' +sha256sums=('b08360167702299e91b3435a4ce6bae41dd26d2794e898632f12dd091b0692e2' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621') + build() { cd "gtk+-$pkgver" diff --git a/extra/imagemagick/PKGBUILD b/extra/imagemagick/PKGBUILD index 781f40724..7c0b56469 100644 --- a/extra/imagemagick/PKGBUILD +++ b/extra/imagemagick/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192475 2013-08-12 20:25:42Z eric $ +# $Id: PKGBUILD 193716 2013-08-29 06:22:01Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgbase=imagemagick pkgname=('imagemagick' 'imagemagick-doc') -pkgver=6.8.6.8 +pkgver=6.8.6.9 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://www.imagemagick.org/" @@ -14,7 +14,7 @@ makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript' \ #source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ perlmagick.rpath.patch) -sha1sums=('fe298492c6be08eb887d02b75efeb609fa6c4d61' +sha1sums=('c1e8b19f6afc19751c7c777688f0005d36917f9e' 'e143cf9d530fabf3b58023899b5cc544ba93daec') prepare() { @@ -38,7 +38,7 @@ build() { check() { cd ImageMagick-${pkgver%.*}-${pkgver##*.} - make check + # make check } package_imagemagick() { diff --git a/extra/libmng/PKGBUILD b/extra/libmng/PKGBUILD index 588dff8de..c6b4a626b 100644 --- a/extra/libmng/PKGBUILD +++ b/extra/libmng/PKGBUILD @@ -1,31 +1,34 @@ -# $Id: PKGBUILD 178306 2013-02-19 21:06:05Z eric $ +# $Id: PKGBUILD 193685 2013-08-28 00:06:03Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=libmng -pkgver=1.0.10 -pkgrel=4.2 +pkgver=2.0.2 +pkgrel=2 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files" arch=('i686' 'x86_64' 'mips64el') url="http://www.libmng.com/" license=('custom') -depends=('zlib' 'libjpeg') +depends=('lcms2') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2) -md5sums=('eaf1476a3bb29f6190bca660e6abef16') +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.asc} + libmng-stdio.patch) +sha1sums=('7dd35369ff5916e1823cbacef984ab1b87714b69' + 'SKIP' + '2f8b472d53791ba3a44dab9b18fb215e8b19dd77') + +prepare() { + cd ${pkgname}-${pkgver} + patch -p5 -i "${srcdir}/libmng-stdio.patch" +} build() { - cd "${srcdir}/${pkgname}-${pkgver}" - sed -i 's/AM_C_PROTOTYPES//' makefiles/configure.in - ln -s makefiles/configure.in . - ln -s makefiles/Makefile.am . - sed -i '/^AM_C_PROTOTYPES$/d' configure.in # removed in recent automake - autoreconf --force --install + cd ${pkgname}-${pkgver} ./configure --prefix=/usr make } package() { - cd "${srcdir}/${pkgname}-${pkgver}" + cd ${pkgname}-${pkgver} make DESTDIR="${pkgdir}" install install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } diff --git a/extra/libmng/libmng-stdio.patch b/extra/libmng/libmng-stdio.patch new file mode 100644 index 000000000..42414f152 --- /dev/null +++ b/extra/libmng/libmng-stdio.patch @@ -0,0 +1,10 @@ +--- /mnt/chrootstaging32/usr/include/libmng_types.h 2013-08-15 16:26:03.000000000 -0400 ++++ /mnt/chrootstaging64/usr/include/libmng_types.h 2013-08-16 19:53:39.165878412 -0400 +@@ -204,6 +204,7 @@ + #define HAVE_BOOLEAN + typedef int boolean; + #endif ++#include <stdio.h> + #include <jpeglib.h> + #endif /* MNG_INCLUDE_IJG6B */ + diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD index 1e3205aaa..0aec90273 100644 --- a/extra/libreoffice/PKGBUILD +++ b/extra/libreoffice/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193556 2013-08-23 16:48:04Z andyrtr $ +# $Id: PKGBUILD 193796 2013-09-01 09:04:01Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase="libreoffice" @@ -16,12 +16,11 @@ pkgname=('libreoffice-common' 'libreoffice-en-US' 'libreoffice-postgresql-connector' 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-report-builder' 'libreoffice-extension-wiki-publisher' 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.0.5.2 -pkgver=4.0.5 -pkgrel=1 +_LOver=4.1.1.2 +pkgver=4.1.1 +pkgrel=2 arch=('i686' 'x86_64') license=('LGPL3') url="http://www.libreoffice.org/" @@ -29,7 +28,8 @@ makedepends=( # makedepends 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' 'clucene' 'bluez-libs' + 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' + 'clucene' 'bluez-libs' 'harfbuzz-icu' # the runtime dependencies "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" @@ -52,9 +52,9 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + ${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + ${_additional_source_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip @@ -66,22 +66,24 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 + ${_additional_source_url}/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 ${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 ${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz - ${_additional_source_url}/8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 - ${_additional_source_url}/54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 + ${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 + ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll + ${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 ${_additional_source_url}/libcdr-0.0.14.tar.bz2 ${_additional_source_url}/libmspub-0.0.6.tar.bz2 + ${_additional_source_url}/libmwaw-0.1.10.tar.bz2 ${_additional_source_url}/libvisio-0.0.30.tar.bz2 make-pyuno-work-with-system-wide-module-install.diff libreoffice-common.sh libreoffice-common.csh) noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 9f9e15966b5624834157fe3d748312bc-mdds_0.6.1.tar.bz2 + 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 @@ -90,9 +92,9 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz + 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz + 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip @@ -104,16 +106,18 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - 8755aac23317494a9028569374dc87b2-liborcus_0.3.0.tar.bz2 - 54e578c91b1b68e69c72be22adcb2195-liblangtag-0.4.0.tar.bz2 + ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 + 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip + 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 libcdr-0.0.14.tar.bz2 libmspub-0.0.6.tar.bz2 - libvisio-0.0.30.tar.bz2) -md5sums=('6cb30bf61cc264f0593a11fffa5cd7ee' - 'a9ddcbde6d7b1148c8fdb626b26c0c69' - '914c5ea3f433643387593cb96d6c119b' + libmwaw-0.1.10.tar.bz2 + libvisio-0.0.30.tar.bz2 ) +md5sums=('4eb8fd2b0d1177d19b2f797faabc4ea2' + 'f6b418a1ed94ef9d5ee30e9f5d7f305a' + 'e8c69bdb55586531cc192904467f5e24' 'f02578f5218f217a9f20e9c30e119c6a' '1f24ab1d39f4a51faf22244c94a6203f' '35c94d2df8893241173de1d16b6034c0' @@ -121,9 +125,9 @@ md5sums=('6cb30bf61cc264f0593a11fffa5cd7ee' '2a177023f9ea8ec8bd00837605c5df1b' 'a7983f859eafb2677d7ff386a023bc40' '3c219630e4302863a9a83d0efde889db' - '2ae988b339daec234019a7066f96733e' + '625ff5f2f968dd908bca43c9469d6e6b' '2c9b0f83ed5890af02c0df1c1776f39b' - 'af3c3acf618de6108d65fcdc92b492e1' + '2e482c7567908d334785ce7d69ddfff7' 'eeb2c7ddf0d302fba4bfc6e97eac9624' '39bb3fcea1514f1369fcfc87542390fd' '3404ab6b1792ae5f16bbd603bd1e1d03' @@ -135,16 +139,18 @@ md5sums=('6cb30bf61cc264f0593a11fffa5cd7ee' 'ace6ab49184e329db254e454a010f56d' 'db60e4fde8dd6d6807523deb71ee34dc' 'ba2930200c9f019c2d93a8c88c651a0f' - '9f9e15966b5624834157fe3d748312bc' + '08c85a6d6d793daee14e10e22eefdc4b' 'dc3d21a3921931096d6e80f6701f6763' 'b2371dc7cf4811c9d32146eec913d296' - '8755aac23317494a9028569374dc87b2' - '54e578c91b1b68e69c72be22adcb2195' + 'ea2acaf140ae40a87a952caa75184f4d' + '36271d3fa0d9dec1632029b6d7aac925' '0168229624cfac409e766913506961a8' '17410483b5b5f267aa18b7e00b65e6e0' '185d60944ea767075d27247c3162b3bc' + '8473296c671b6e3dd8197f4145e0854b' 'd88f9b94df880d2c05be943b000ca112' '1120705cd0f0d9bd5506360bf57b6c2e' + '2289bb137bbba9b473ce60168895c036' '9d9eb3ae6bee763c161228b2b12e25f8' '07d2bf5ad839a394cca008b3ec6e7bb1' '4195735a80876ae812fca5736b50192a' @@ -164,7 +170,7 @@ prepare() { ln -s ${srcdir}/$source . done popd - + # fix not upstreamable pyuno paths - patch taken from Debian patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff @@ -182,7 +188,6 @@ prepare() { } build() { - cd libreoffice-$_LOver #autoconf -f @@ -192,7 +197,6 @@ build() { #./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ - --with-unix-wrapper="libreoffice" \ --enable-split-app-modules \ --with-parallelism=${MAKEFLAGS/-j/} \ --with-external-tar="${srcdir}/ext_sources" \ @@ -217,8 +221,6 @@ build() { --enable-scripting-javascript \ --enable-ext-wiki-publisher \ --enable-ext-nlpsolver \ - --disable-ext-mysql-connector \ - --with-system-mysql \ --without-fonts\ --without-afms\ --without-system-libwps\ @@ -233,6 +235,8 @@ build() { --without-system-liblangtag \ --without-system-jfreereport \ --without-system-apache-commons \ + --without-system-libodfgen \ + --without-system-libmwaw \ --with-system-dicts \ --with-external-dict-dir=/usr/share/hunspell \ --with-external-hyph-dir=/usr/share/hyphen \ @@ -243,7 +247,6 @@ build() { --with-system-libwpg \ --with-system-libwps \ --with-system-redland\ - --without-system-mozilla \ --without-system-npapi-headers \ --with-ant-home="/usr/share/apache-ant"\ --without-system-boost\ @@ -279,12 +282,11 @@ package_libreoffice-common() { pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' + depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' 'libcups' 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.24.0" - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') + 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') optdepends=('libreoffice-langpack: additional language support' 'java-runtime: adds java support' - 'libcups: adds printing support' 'pstoedit: translates PostScript and PDF graphics into other vector formats' 'libmythes: for use in thesaurus' 'beanshell: interactive java -- good for prototyping /macros' @@ -300,10 +302,12 @@ package_libreoffice-common() { etc/libreoffice/psprint.conf) groups=('libreoffice') provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' - 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python') + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' + 'libreoffice-extension-report-builder') conflicts=('go-openoffice') replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' - 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python') + 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' + 'libreoffice-extension-report-builder') # create directories from *list.txt file for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do @@ -338,9 +342,9 @@ package_libreoffice-common() { rm -rf ${pkgdir}/etc/bash_completion.d # some files would conflict - rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar - rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar - rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb + rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar + rm -vf ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar + rm -vf ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb # make pyuno find its modules install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages @@ -348,7 +352,11 @@ package_libreoffice-common() { ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py # workaround all packages now depend on that file - cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd + cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd + + # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages + mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic ${srcdir}/ + mv ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic ${srcdir}/ } package_libreoffice-base() { @@ -541,7 +549,8 @@ package_libreoffice-sdk() { done # fix environment path to keep compatibility with other java-environments - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} +# sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} + sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh } package_libreoffice-sdk-doc() { @@ -610,6 +619,11 @@ package_libreoffice-en-US() { # mv file from fakeinstall to pkgdir mv ${srcdir}/fakeinstall${file} ${pkgdir}$file done + + # move dicts to en-US langpack to avoid file conflicts with en-GBen-ZA packages + install -dm755 ${pkgdir}/usr/lib/libreoffice/share/wordbook + mv ${srcdir}/en-GB.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-GB.dic + mv ${srcdir}/en-US.dic ${pkgdir}/usr/lib/libreoffice/share/wordbook/en-US.dic } package_libreoffice-extension-presentation-minimizer() { @@ -622,17 +636,6 @@ package_libreoffice-extension-presentation-minimizer() { unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer } -package_libreoffice-extension-report-builder() { - - pkgdesc="This extension creates smart-looking database reports" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder -} - package_libreoffice-extension-wiki-publisher() { pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" diff --git a/extra/libreoffice/PKGBUILD.41 b/extra/libreoffice/PKGBUILD.41 deleted file mode 100644 index c73d74627..000000000 --- a/extra/libreoffice/PKGBUILD.41 +++ /dev/null @@ -1,651 +0,0 @@ -# $Id: PKGBUILD 186347 2013-05-25 05:23:41Z foutrelis $ -# Maintainer: AndyRTR <andyrtr@archlinux.org> - -pkgbase="libreoffice" -pkgname=('libreoffice-common' - 'libreoffice-base' - 'libreoffice-calc' - 'libreoffice-draw' - 'libreoffice-gnome' - 'libreoffice-impress' - 'libreoffice-kde4' - 'libreoffice-math' - 'libreoffice-sdk' - 'libreoffice-sdk-doc' - 'libreoffice-writer' - 'libreoffice-en-US' - 'libreoffice-postgresql-connector' - 'libreoffice-extension-presentation-minimizer' - 'libreoffice-extension-wiki-publisher' - 'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built) -_LOver=4.1.0.4 -pkgver=4.1.0 -pkgrel=1 -arch=('i686' 'x86_64') -license=('LGPL3') -url="http://www.libreoffice.org/" -makedepends=( # makedepends - 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' #'boost' - 'apache-ant' 'gperf' 'kdelibs' 'gconf' 'cppunit' - 'beanshell' 'vigra' 'clucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' - 'glu' 'mesa' 'gst-plugins-base-libs' 'java-environment' 'postgresql-libs' 'doxygen' - 'clucene' 'bluez-libs' 'harfbuzz-icu' - # the runtime dependencies - "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.3" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6" - 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' 'libxslt' 'librsvg' "icu>=51.1" - 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite' 'lcms2' 'poppler>=0.22.4' - 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' - 'ttf-dejavu') # to satisfy regression tests - -# http://download.documentfoundation.org/mirrors/all.html -# http://wiki.documentfoundation.org/Mirrors - -_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}" -#_mirror="http://dev-builds.libreoffice.org/pre-releases/src" -_additional_source_url="http://dev-www.libreoffice.org/src" -_additional_source_url2="http://dev-www.libreoffice.org/extern" -source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz - ${_additional_source_url}/f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - ${_additional_source_url}/625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz - ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - ${_additional_source_url}/2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz - ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ${_additional_source_url}/08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 - ${_additional_source_url}/dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 - ${_additional_source_url}/b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz - ${_additional_source_url}/ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 - ${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 - ${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - ${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - ${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll - ${_additional_source_url}/8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 - ${_additional_source_url}/libcdr-0.0.14.tar.bz2 - ${_additional_source_url}/libmspub-0.0.6.tar.bz2 - ${_additional_source_url}/libmwaw-0.1.10.tar.bz2 - ${_additional_source_url}/libvisio-0.0.30.tar.bz2 - make-pyuno-work-with-system-wide-module-install.diff - libreoffice-common.sh libreoffice-common.csh) -noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2 - 185d60944ea767075d27247c3162b3bc-unowinreg.dll - 08c85a6d6d793daee14e10e22eefdc4b-mdds_0.8.1.tar.bz2 - 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip - 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz - dc3d21a3921931096d6e80f6701f6763-libexttextcat-3.4.0.tar.bz2 - b2371dc7cf4811c9d32146eec913d296-libcmis-0.3.0.tar.gz - 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip - 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz - a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip - 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz - 625ff5f2f968dd908bca43c9469d6e6b-commons-lang-2.4-src.tar.gz - 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz - 2e482c7567908d334785ce7d69ddfff7-commons-codec-1.6-src.tar.gz - eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip - 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip - 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip - 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip - f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip - 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip - d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip - 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip - ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip - db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip - ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip - ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2 - 36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2 - 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz - 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip - 8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2 - libcdr-0.0.14.tar.bz2 - libmspub-0.0.6.tar.bz2 - libmwaw-0.1.10.tar.bz2 - libvisio-0.0.30.tar.bz2 ) -md5sums=('5311656e1b54eadd4b93f948dfd5e68e' - 'e2cd3b63e3050771a1330fc98e41a701' - '1f4438828cbcf83c257742482dade3ef' - 'f02578f5218f217a9f20e9c30e119c6a' - '1f24ab1d39f4a51faf22244c94a6203f' - '35c94d2df8893241173de1d16b6034c0' - '798b2ffdc8bcfe7bca2cf92b62caf685' - '2a177023f9ea8ec8bd00837605c5df1b' - 'a7983f859eafb2677d7ff386a023bc40' - '3c219630e4302863a9a83d0efde889db' - '625ff5f2f968dd908bca43c9469d6e6b' - '2c9b0f83ed5890af02c0df1c1776f39b' - '2e482c7567908d334785ce7d69ddfff7' - 'eeb2c7ddf0d302fba4bfc6e97eac9624' - '39bb3fcea1514f1369fcfc87542390fd' - '3404ab6b1792ae5f16bbd603bd1e1d03' - '97b2d4dba862397f446b217e2b623e71' - 'f94d9870737518e3b597f9265f4e9803' - '8ce2fcd72becf06c41f7201d15373ed9' - 'd8bd5eed178db6e2b18eeed243f85aa8' - '3bdf40c0d199af31923e900d082ca2dd' - 'ace6ab49184e329db254e454a010f56d' - 'db60e4fde8dd6d6807523deb71ee34dc' - 'ba2930200c9f019c2d93a8c88c651a0f' - '08c85a6d6d793daee14e10e22eefdc4b' - 'dc3d21a3921931096d6e80f6701f6763' - 'b2371dc7cf4811c9d32146eec913d296' - 'ea2acaf140ae40a87a952caa75184f4d' - '36271d3fa0d9dec1632029b6d7aac925' - '0168229624cfac409e766913506961a8' - '17410483b5b5f267aa18b7e00b65e6e0' - '185d60944ea767075d27247c3162b3bc' - '8473296c671b6e3dd8197f4145e0854b' - 'd88f9b94df880d2c05be943b000ca112' - '1120705cd0f0d9bd5506360bf57b6c2e' - '2289bb137bbba9b473ce60168895c036' - '9d9eb3ae6bee763c161228b2b12e25f8' - '07d2bf5ad839a394cca008b3ec6e7bb1' - '4195735a80876ae812fca5736b50192a' - 'e7e4b3e70e99e5cba8f8dfcacf3b0d87') - -prepare() { - - cd ${srcdir}/libreoffice-$_LOver - - # fix exttextcat build error - # /usr/include/features.h:330:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp] - unset CPPFLAGS - - # move external sources into place - mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources - for source in "${noextract[@]}"; do - ln -s ${srcdir}/$source . - done - popd - - # fix not upstreamable pyuno paths - patch taken from Debian - patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff - - #use the CFLAGS but remove the LibO overridden ones - for i in $CFLAGS; do - case "$i" in - -O?|-pipe|-Wall|-g|-fexceptions) continue;; - esac - ARCH_FLAGS="$ARCH_FLAGS $i" - done - - - # qt4 fix - sed -i "s:qmake:qmake-qt4:g" configure.ac -} - -build() { - cd ${srcdir}/libreoffice-$_LOver - - #autoconf -f - - # non-SMP test build - #export MAKEFLAGS="-j1" - #./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ - - ./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \ - --enable-split-app-modules \ - --with-parallelism=${MAKEFLAGS/-j/} \ - --with-external-tar="${srcdir}/ext_sources" \ - --disable-fetch-external \ - --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \ - --libdir=/usr/lib --mandir=/usr/share/man \ - --with-lang="" \ - --enable-crashdump \ - --enable-dbus \ - --enable-evolution2\ - --enable-gio\ - --disable-gnome-vfs\ - --disable-kde\ - --enable-kde4\ - --enable-gtk3 \ - --enable-gstreamer \ - --enable-lockdown\ - --enable-opengl \ - --enable-odk\ - --enable-python=system \ - --enable-scripting-beanshell \ - --enable-scripting-javascript \ - --enable-ext-wiki-publisher \ - --enable-ext-nlpsolver \ - --without-fonts\ - --without-afms\ - --without-system-libwps\ - --without-system-libcdr \ - --without-system-mdds\ - --without-myspell-dicts \ - --without-system-libvisio \ - --without-system-libcmis \ - --without-system-libmspub \ - --without-system-libexttextcat \ - --without-system-orcus \ - --without-system-liblangtag \ - --without-system-jfreereport \ - --without-system-apache-commons \ - --without-system-libodfgen \ - --without-system-libmwaw \ - --with-system-dicts \ - --with-external-dict-dir=/usr/share/hunspell \ - --with-external-hyph-dir=/usr/share/hyphen \ - --with-external-thes-dir=/usr/share/mythes \ - --with-system-beanshell \ - --with-system-cppunit\ - --with-system-graphite\ - --with-system-libwpg \ - --with-system-libwps \ - --with-system-redland\ - --without-system-npapi-headers \ - --with-ant-home="/usr/share/apache-ant"\ - --without-system-boost\ - --with-system-cairo\ - --with-system-libs\ - --with-system-mythes\ - --with-system-headers\ - --without-system-hsqldb \ - --with-alloc=system\ - --with-system-clucene\ - --without-system-servlet-api - -# --enable-mergelibs \ # https://bugs.archlinux.org/task/34414 - -# --without-ppds\ # breaks spadmin permission - -#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool - - touch src.downloaded - #./download - make - # fake installation to create split file lists - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check -} - -#check() { -# cd ${srcdir}/build -# make check -#} - -package_libreoffice-common() { - - pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites" - install=libreoffice-common.install - depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6" 'dbus-glib' 'librsvg' - 'nss' 'libsm' 'redland' 'hyphen' 'graphite' "icu>=51.1" 'clucene' 'lcms2' "poppler>=0.22.4" - 'harfbuzz-icu' 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'xdg-utils') - optdepends=('libreoffice-langpack: additional language support' - 'java-runtime: adds java support' - 'libcups: adds printing support' - 'pstoedit: translates PostScript and PDF graphics into other vector formats' - 'libmythes: for use in thesaurus' - 'beanshell: interactive java -- good for prototyping /macros' - 'vigra: C++ computer vision library, usable in Basebmp' - 'libmspack: library for Microsoft compression formats for use in FontOOo' - 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import' - 'sane: for scanner access' - 'unixodbc: adds ODBC database support' - 'gst-plugins-base-libs: + some gstr-plugins to support multimedia content, e.g. in impress' - 'gtk2: for browser plugin') - backup=(etc/libreoffice/sofficerc - etc/libreoffice/bootstraprc - etc/libreoffice/psprint.conf) - groups=('libreoffice') - provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' - 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' - 'libreoffice-extension-report-builder') - conflicts=('go-openoffice') - replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen' - 'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python' - 'libreoffice-extension-report-builder') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # put configuration files into place - install -dm755 ${pkgdir}/etc/libreoffice - install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/ - install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/ - # install dummy links to make them found by LibO - cd ${pkgdir}/usr/lib/libreoffice/program/ - ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} . - cd ${pkgdir}/usr/lib/libreoffice/share/psprint/ - ln -vsf /etc/libreoffice/psprint.conf . - - # allow to preset desired VLC - install -dm755 ${pkgdir}/etc/profile.d - install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/ - - # move bash-completion files to its new place - install -dm755 ${pkgdir}/usr/share/bash-completion/completions - mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh - rm -rf ${pkgdir}/etc/bash_completion.d - - # some files would conflict - rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/ScriptProviderForJavaScript.jar - rm -f ${pkgdir}/usr/lib/libreoffice/program/classes/js.jar - rm -f ${pkgdir}/usr/lib/libreoffice/program/services/scriptproviderforjavascript.rdb - - # make pyuno find its modules - install -dm755 ${pkgdir}/usr/lib/python3.3/site-packages - ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.3/site-packages/uno.py - ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.3/site-packages/unohelper.py - - # workaround all packages now depend on that file - cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd -} - -package_libreoffice-base() { - pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI." - install=libreoffice-base.install - depends=('libreoffice-common') - optdepends=('libreoffice-postgresql-connector') - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-postgresql-connector() { - pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice" - depends=('libreoffice-base' 'postgresql-libs') - groups=('libreoffice') - replaces=('libreoffice') - - # workaround double entries in the file list - mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig - sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-calc() { - pkgdesc="Spreadsheet application for LibreOffice." - install=libreoffice-calc.install - depends=('libreoffice-common' 'lpsolve' ) - #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332 - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-draw() { - pkgdesc="Drawing Application for LibreOffice." - install=libreoffice-draw.install - depends=('libreoffice-common') - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-gnome() { - pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment." - depends=('libreoffice-common' 'gtk2' 'gconf') # gconf pulls in gtk3 - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-impress() { - pkgdesc="Presentation Application for LibreOffice." - install=libreoffice-impress.install - depends=('libreoffice-common') - optdepends=('glu: for the OGLTrans extension') - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-kde4() { - pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment." - depends=('libreoffice-common' 'kdelibs') - optdepends=() - backup=() - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-math() { - pkgdesc="Equation Editor Application for LibreOffice." - depends=('libreoffice-common') - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-sdk() { - pkgdesc="Software Development Kit for LibreOffice." - depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment') - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # fix environment path to keep compatibility with other java-environments -# sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh} - sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh -} - -package_libreoffice-sdk-doc() { - pkgdesc="Software Development Kit documentation for LibreOffice" - depends=('libreoffice-common' 'libreoffice-sdk') - groups=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - #fix permissions - find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \; -} - -package_libreoffice-writer() { - pkgdesc="Word Processor Application for LibreOffice." - install=libreoffice-writer.install - depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2') - optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images') - groups=('libreoffice') - replaces=('libreoffice') - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done - - # for workaround this file belongs now to common - rm ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd -} - -package_libreoffice-en-US() { - pkgdesc="English (US) language pack for LibreOffice" - #arch=('any') - provides=('openoffice-en-US' 'libreoffice-langpack') - replaces=(openoffice-en-US) - conflicts=(openoffice-en-US) - - # create directories from *list.txt file - for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do - install -dm755 ${pkgdir}/${directory/\%dir/} - done - # install files into the pkg from fakeinstall dir - for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do - dirname=`dirname $file` - # check if directory has been already been created - some are missing like manpages - [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname - # mv file from fakeinstall to pkgdir - mv ${srcdir}/fakeinstall${file} ${pkgdir}$file - done -} - -package_libreoffice-extension-presentation-minimizer() { - - pkgdesc="This extension reduce the file size of the current presentation" - depends=('libreoffice-common' 'gcc-libs') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer -} - -package_libreoffice-extension-wiki-publisher() { - - pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher -} - -package_libreoffice-extension-nlpsolver() { - - pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models" - #arch=('any') - depends=('libreoffice-common' 'java-environment') - groups=('libreoffice-extensions') - - install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions - unzip -q ${srcdir}/libreoffice-$_LOver/solver/unxlng*/bin/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver -} diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD index 79fbd180d..7f1d2105c 100644 --- a/extra/live-media/PKGBUILD +++ b/extra/live-media/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 190133 2013-07-16 17:49:19Z giovanni $ +# $Id: PKGBUILD 193833 2013-09-02 17:04:03Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Gilles CHAUVIN <gcnweb@gmail.com> pkgname=live-media -pkgver=2013.07.16 +pkgver=2013.08.31 pkgrel=1 pkgdesc="A set of C++ libraries for multimedia streaming" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') url="http://live555.com/liveMedia" depends=('gcc-libs') source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz") -md5sums=('8b660d11d43c3beac11580e62e3179f8') +md5sums=('3321fc303bf02542018e5280efa1206c') build() { cd ${srcdir}/live diff --git a/extra/llvm-amdgpu-snapshot/PKGBUILD b/extra/llvm-amdgpu-snapshot/PKGBUILD deleted file mode 100644 index cdac9521c..000000000 --- a/extra/llvm-amdgpu-snapshot/PKGBUILD +++ /dev/null @@ -1,88 +0,0 @@ -# $Id: PKGBUILD 186322 2013-05-24 18:14:34Z andyrtr $ -# Maintainer: Andreas Radke <andyrtr@archlinux.org> -# Maintainer: Laurent Carlier <lordheavym@gmail.com> -# Contributor: Thomas Dziedzic < gostrc at gmail > -# Contributor: Roberto Alsina <ralsina@kde.org> -# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk> -# Contributor: Anders Bergh <anders@archlinuxppc.org> -# Contributor: Tomas Wilhelmsson <tomas.wilhelmsson@gmail.com> - -pkgbase=llvm-amdgpu-snapshot -pkgname=('llvm-amdgpu-snapshot' 'llvm-amdgpu-lib-snapshot') -pkgver=20130403 -pkgrel=3 -pkgdesc='Low Level Virtual Machine with AMDGPU enabled to build r600g shader llvm support' -arch=('i686' 'x86_64') -url="http://llvm.org" -license=('custom:University of Illinois/NCSA Open Source License') -makedepends=('libffi' 'python2' 'ocaml') -source=(ftp://ftp.archlinux.org/other/packages/llvm-amdgpu/llvm-amdgpu-master.${pkgver}.tar.gz) -md5sums=('4baa7b8da9eff4811952b6f855c141ca') - -prepare() { - cd "$srcdir"/llvm-c* - - sed -i 's/python$/python2/' utils/llvm-build/llvm-build -} - -build() { - cd "$srcdir"/llvm-c* - - # Apply strip option to configure - _optimized_switch="enable" - [[ $(check_option strip) == n ]] && _optimized_switch="disable" - - # Include location of libffi headers in CPPFLAGS - export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)" - - # Force the use of GCC instead of clang - PYTHON=python2 CC=gcc CXX=g++ \ - ./configure \ - --prefix=/usr \ - --libdir=/usr/lib/llvm \ - --sysconfdir=/etc \ - --enable-shared \ - --enable-libffi \ - --enable-targets=all \ - --enable-experimental-targets=R600 \ - --disable-expensive-checks \ - --with-binutils-include=/usr/include \ - --$_optimized_switch-optimized - - make REQUIRES_RTTI=1 -} - -package_llvm-amdgpu-snapshot() { - depends=("llvm-amdgpu-lib-snapshot=${pkgver}" 'python2') - conflicts=('llvm') - - cd "$srcdir"/llvm-c* - - make DESTDIR="$pkgdir" install - - # Remove useless files - rm -r "$pkgdir"/usr/{docs,lib/ocaml} - # moved to llvm-amdgpu-lib-snapshot - rm "$pkgdir"/usr/lib/libLLVM-3.2svn.so - # Fix permissions of static libs - chmod -x "$pkgdir"/usr/lib/lib*.a - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_llvm-amdgpu-lib-snapshot() { - depends=('libffi' 'gcc-libs') - - cd "$srcdir"/llvm-c* - - make DESTDIR="$pkgdir" install - - mv -v "$pkgdir"/usr/lib/libLLVM-3.2svn.so "$pkgdir"/ - - # Remove useless files - rm -r "$pkgdir"/usr/{bin,include,docs,lib/*} - - mv "$pkgdir"/libLLVM-3.2svn.so "$pkgdir"/usr/lib/ - - install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 24e1d6822..fd09645b6 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 191957 2013-08-01 23:15:05Z lcarlier $ +# $Id: PKGBUILD 193703 2013-08-28 15:19:08Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.1.6 +pkgver=9.2.0 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' - 'wayland' 'systemd') + 'wayland' 'elfutils' 'llvm' 'systemd') if [ "$CARCH" != "mips64el" ]; then pkgname+=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri') makedepends+=('libvdpau' 'llvm-amdgpu-snapshot') @@ -16,9 +16,9 @@ fi url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') -source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 +source=(ftp://ftp.freedesktop.org/pub/mesa/9.2/MesaLib-${pkgver}.tar.bz2 LICENSE) -md5sums=('443a2a352667294b53d56cb1a74114e9' +md5sums=('4185b6aae890bc62a964f4b24cc1aca8' '5c65a0fe315dd347e09b1f2826a1df5a') build() { @@ -37,11 +37,11 @@ build() { --with-dri-driverdir=/usr/lib/xorg/modules/dri \ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ + --with-egl-platforms=x11,drm,wayland \ --with-llvm-shared-libs \ --enable-gallium-llvm \ --enable-egl \ --enable-gallium-egl \ - --with-egl-platforms=x11,drm,wayland \ --enable-shared-glapi \ --enable-gbm \ --enable-glx-tls \ @@ -57,9 +57,10 @@ build() { # --help make + # fake installation - mkdir $srcdir/fakeinstall - make DESTDIR=${srcdir}/fakeinstall install + mkdir $srcdir/fakeinstall + make DESTDIR=${srcdir}/fakeinstall install } package_ati-dri() { @@ -98,10 +99,8 @@ package_nouveau-dri() { optdepends=('libtxc_dxtn: S3 Texture Compressed support') depends=("mesa-libgl=${pkgver}") - # vdpau driver is problematic, so remove it (FS#36004) install -m755 -d ${pkgdir}/usr/lib/vdpau/ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/ - rm -rf ${pkgdir}/usr/lib/vdpau/ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -115,7 +114,7 @@ package_nouveau-dri() { package_svga-dri() { pkgdesc="Gallium3D VMware guest GL driver" - depends=('libdrm' 'expat' 'llvm-amdgpu-lib-snapshot') + depends=('libdrm' 'expat' 'llvm-libs') install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/ @@ -129,12 +128,12 @@ package_svga-dri() { package_mesa() { pkgdesc="an open-source implementation of the OpenGL specification" - depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd') + depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils' 'llvm-libs') optdepends=('opengl-man-pages: for the OpenGL API man pages') provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel') - [ "$CARCH" != "mips64el" ] && depends+=('libvdpau' 'llvm-amdgpu-lib-snapshot') + [ "$CARCH" != "mips64el" ] && depends+=('libvdpau') mv -v ${srcdir}/fakeinstall/* ${pkgdir} # rename libgl.so to not conflict with blobs - may break gl.pc ? diff --git a/extra/nx/PKGBUILD b/extra/nx/PKGBUILD index ab2c5fb44..be5daae47 100644 --- a/extra/nx/PKGBUILD +++ b/extra/nx/PKGBUILD @@ -1,20 +1,21 @@ -# $Id: PKGBUILD 184415 2013-05-06 19:38:57Z foutrelis $ +# $Id: PKGBUILD 193809 2013-09-02 08:07:35Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'x2go-agent' 'nx-headers') -pkgver=3.5.0.20 -pkgrel=2 +pkgver=3.5.0.21 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url="http://wiki.x2go.org/" license=('GPL') #options=('!makeflags') # '!strip') -makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' # runtime dependencies from subpackages - 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends +makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' 'libxml2' 'fontconfig' # runtime dependencies from subpackages + 'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' + 'libxcomposite' 'libxtst' 'xorg-sessreg' 'libfontenc' # makedepends ) source=(http://code.x2go.org/releases/source/nx-libs/nx-libs-$pkgver-full.tar.gz keyboard_rule.diff) -md5sums=('9dd4b22579cf048c14c9c75302553f18' +md5sums=('7143c216cb6eda0408ee8169c50adbe3' 'f681bc66827cd7ddff4b81b983c20401') build() { @@ -94,7 +95,7 @@ package_nx-xcompext() { package_nx-x11() { pkgdesc="NX-X11 lib for the NX framework" - depends=('libxcomp') + depends=('libxcomp' 'fontconfig') install -dm755 ${pkgdir}/{usr/bin,usr/lib/nx/{X11,bin}} cp -aR ${srcdir}/fakeinstall/usr/lib/nx/X11/* ${pkgdir}/usr/lib/nx/X11 diff --git a/extra/oxygen-gtk2/PKGBUILD b/extra/oxygen-gtk2/PKGBUILD index bf82523f9..f7d334747 100644 --- a/extra/oxygen-gtk2/PKGBUILD +++ b/extra/oxygen-gtk2/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 186908 2013-05-31 18:38:20Z andrea $ +# $Id: PKGBUILD 193727 2013-08-29 13:10:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: birdflesh <antkoul at gmail dot com> pkgname=oxygen-gtk2 -pkgver=1.3.4 +pkgver=1.4.0 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK2" arch=('i686' 'x86_64' 'mips64el') @@ -14,7 +14,7 @@ conflicts=('oxygen-gtk') replaces=('oxygen-gtk') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('10a78d31de95168eae861d9c5b4be9ed') +md5sums=('ccc9e468a5ea04159ca2040ee3f434e1') build() { mkdir build diff --git a/extra/oxygen-gtk3/PKGBUILD b/extra/oxygen-gtk3/PKGBUILD index 23a43e728..63609d242 100644 --- a/extra/oxygen-gtk3/PKGBUILD +++ b/extra/oxygen-gtk3/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 186910 2013-05-31 18:41:51Z andrea $ +# $Id: PKGBUILD 193729 2013-08-29 13:11:38Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=oxygen-gtk3 -pkgver=1.1.4 +pkgver=1.2.0 pkgrel=1 pkgdesc="Port of the default KDE widget theme (Oxygen) to GTK3" arch=('i686' 'x86_64' 'mips64el') @@ -11,7 +11,7 @@ license=('LGPL') depends=('gtk3') makedepends=('cmake') source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2") -md5sums=('6c6db0188d3780173af1994f34db8a71') +md5sums=('c89352459fa41bd35e64072e6bc89593') build() { mkdir build diff --git a/extra/poppler/PKGBUILD b/extra/poppler/PKGBUILD index ebe625d87..cb8f2e13d 100644 --- a/extra/poppler/PKGBUILD +++ b/extra/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192058 2013-08-05 14:17:25Z andyrtr $ +# $Id: PKGBUILD 193705 2013-08-28 15:19:09Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt4' 'poppler-qt5') -pkgver=0.24.0 +pkgver=0.24.1 pkgrel=1 arch=(i686 x86_64 mips64el) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.xz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('891000481f639e996d000d767d953a7f' +md5sums=('b11cc0408b4ad3809fa455d7b3d5ade9' '9dc64c254a31e570507bdd4ad4ba629a') prepare() { @@ -23,6 +23,7 @@ prepare() { sed -i -e '/AC_PATH_XTRA/d' configure.ac sed -i "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:" configure.ac } + build() { cd ${pkgbase}-${pkgver} autoreconf -fi diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD index cb1eee34b..ab15e1763 100644 --- a/extra/qt3/PKGBUILD +++ b/extra/qt3/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 184426 2013-05-06 19:39:25Z foutrelis $ +# $Id: PKGBUILD 193687 2013-08-28 00:06:06Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=qt3 pkgver=3.3.8b -pkgrel=5 +pkgrel=6 epoch=1 pkgdesc="A cross-platform application and UI framework" arch=('i686' 'x86_64' 'mips64el') @@ -12,7 +12,8 @@ license=('GPL') depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft' 'libxrandr' 'libmng') makedepends=('mariadb' 'postgresql' 'unixodbc' 'sqlite' 'mesa') -optdepends=('libmariadbclient: MariaDB driver' +optdepends=('qtchooser: set the default Qt toolkit' + 'libmariadbclient: MariaDB driver' 'postgresql-libs: PostgreSQL driver' 'unixodbc: ODBC driver') options=('!libtool' '!docs') @@ -30,13 +31,8 @@ sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854' # qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/ # other qt-patches come from fedora and gentoo -build() { - export QTDIR="${srcdir}"/qt-x11-free-${pkgver} - export PATH=${QTDIR}/bin:${PATH} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} - export QMAKESPEC=$QTDIR/mkspecs/linux-g++ - - cd "${srcdir}"/qt-x11-free-${pkgver} +prepare() { + cd qt-x11-free-${pkgver} # apply qt patches from kde.org for i in ../qt-copy-kde-patches/*; do patch -p0 -i $i @@ -56,12 +52,20 @@ build() { sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++{,-32,-64}/qmake.conf sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix sed -i "s|read acceptance|acceptance=yes|" configure +} + +build() { + export QTDIR="${srcdir}"/qt-x11-free-${pkgver} + export PATH=${QTDIR}/bin:${PATH} + export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + export QMAKESPEC=$QTDIR/mkspecs/linux-g++ if [ "$CARCH" = "x86_64" ]; then export ARCH="-64" else unset ARCH fi + cd qt-x11-free-${pkgver} ./configure \ -prefix /usr \ -bindir /usr/lib/qt3/bin \ @@ -87,7 +91,7 @@ build() { } package() { - cd "${srcdir}"/qt-x11-free-${pkgver} + cd qt-x11-free-${pkgver} make INSTALL_ROOT="${pkgdir}" install sed -i -e "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" -e "s|${srcdir}/||g" "${pkgdir}"/usr/lib/*.prl rm -rf "${pkgdir}"/usr/share/qt3/{phrasebooks,templates,translations} diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD index c46a82e66..7d211fa6a 100644 --- a/extra/qt4/PKGBUILD +++ b/extra/qt4/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 189290 2013-07-02 11:12:21Z andrea $ +# $Id: PKGBUILD 193688 2013-08-28 00:06:07Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=qt4 pkgver=4.8.5 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' -license=('GPL3' 'LGPL') +license=('GPL3' 'LGPL' 'FDL' 'custom') pkgdesc='A cross-platform application and UI framework' depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus' 'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib' @@ -35,7 +35,8 @@ source=("http://download.qt-project.org/official_releases/qt/4.8/${pkgver}/${_pk 'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop' 'qdbusviewer-qt4.desktop' 'improve-cups-support.patch' - 'declarative-fix-sigbus.patch') + 'declarative-fix-sigbus.patch' + 'qtbug-31579.patch' 'qtbug-32534.patch') md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' 'a16638f4781e56e7887ff8212a322ecc' '8a28b3f52dbeb685d4b69440b520a3e1' @@ -43,7 +44,9 @@ md5sums=('1864987bdbb2f58f8ae8b350dfdbe133' '0e384663d3dd32abe35f5331c4147569' 'b859c5673e5098c39f72b2252947049e' 'c439c7731c25387352d8453ca7574971' - 'aac963d05a9d5733e2bfce9e26607f51') + 'aac963d05a9d5733e2bfce9e26607f51' + '6ed8d26a8e4a9bba1f6c08fb99cc8357' + 'bb0e0fa6ba953fa590d81ac612374e11') prepare() { cd ${_pkgfqn} @@ -54,6 +57,11 @@ prepare() { # MIPS N32-specific fix, shouldn't affect correctness on other platforms. patch -Np1 -i "${srcdir}/declarative-fix-sigbus.patch" + # (FS#36028) (QTBUG#31579) + patch -p1 -i "${srcdir}"/qtbug-31579.patch + # (FS#36394) (QTBUG#32534) + patch -p1 -i "${srcdir}"/qtbug-32534.patch + sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/{g++,gcc}-base.conf sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf diff --git a/extra/qt4/qtbug-31579.patch b/extra/qt4/qtbug-31579.patch new file mode 100644 index 000000000..b4e1e7387 --- /dev/null +++ b/extra/qt4/qtbug-31579.patch @@ -0,0 +1,146 @@ +From 2a6537f0629aaff53a42d993ad94ad4de3cd3030 Mon Sep 17 00:00:00 2001 +From: Gunnar Sletta <gunnar.sletta@digia.com> +Date: Thu, 4 Jul 2013 16:20:40 +1000 +Subject: [PATCH] Fix drawing of 0-width polylines from outside the devicerect. + +This was broken by a previous fix which aimed to fix gaps in +polylines with tiny line segments. The result was that we +skipped updating the origin point when stroke() didn't produce +pixels which accidentally included the case of the line +being completely outside the deviceRect. I fixed this +by returning the value of clipLine in drawLine to the caller +so we could still update the origin for this case. + +Task-number: QTBUG-31579 +Change-Id: Iac29436f042da7658bbeaf9370351dc6f2c95065 +(cherry picked from qtbase/900cccfd459fcbdbc4aa3d313afe12cfbf68fd87) +Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> +--- + src/gui/painting/qcosmeticstroker.cpp | 42 ++++++++++++++++++++------------ + src/gui/painting/qcosmeticstroker_p.h | 2 +- + 2 files changed, 27 insertions(+), 17 deletions(-) + +diff --git a/src/gui/painting/qcosmeticstroker.cpp b/src/gui/painting/qcosmeticstroker.cpp +index 0061ecb..4413170 100644 +--- a/src/gui/painting/qcosmeticstroker.cpp ++++ b/src/gui/painting/qcosmeticstroker.cpp +@@ -133,10 +133,15 @@ struct NoDasher { + + }; + ++/* ++ * The return value is the result of the clipLine() call performed at the start ++ * of each of the two functions, aka "false" means completely outside the devices ++ * rect. ++ */ + template<DrawPixel drawPixel, class Dasher> +-static void drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++static bool drawLine(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + template<DrawPixel drawPixel, class Dasher> +-static void drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++static bool drawLineAA(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + + inline void drawPixel(QCosmeticStroker *stroker, int x, int y, int coverage) + { +@@ -602,17 +607,20 @@ void QCosmeticStroker::drawPath(const QVectorPath &path) + caps |= CapEnd; + + QCosmeticStroker::Point last = this->lastPixel; +- stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps); ++ bool unclipped = stroke(this, p.x(), p.y(), p2.x(), p2.y(), caps); + + /* fix for gaps in polylines with fastpen and aliased in a sequence + of points with small distances: if current point p2 has been dropped +- out, keep last non dropped point p. */ +- if (fastPenAliased) { +- if (last.x != lastPixel.x || last.y != lastPixel.y || +- points == begin + 2 || points == end - 2 ) { +- { +- p = p2; +- } ++ out, keep last non dropped point p. ++ ++ However, if the line was completely outside the devicerect, we ++ still need to update p to avoid drawing the line after this one from ++ a bad starting position. ++ */ ++ if (fastPenAliased && unclipped) { ++ if (last.x != lastPixel.x || last.y != lastPixel.y ++ || points == begin + 2 || points == end - 2) { ++ p = p2; + } + } else { + p = p2; +@@ -720,10 +728,10 @@ static inline void capAdjust(int caps, int &x1, int &x2, int &y, int yinc) + the drawing shifts from horizontal to vertical or back. + */ + template<DrawPixel drawPixel, class Dasher> +-static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) ++static bool drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) + { + if (stroker->clipLine(rx1, ry1, rx2, ry2)) +- return; ++ return false; + + static const int half = 31; + int x1 = toF26Dot6(rx1) + half; +@@ -813,7 +821,7 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, + } else { + // horizontal + if (!dx) +- return; ++ return true; + + QCosmeticStroker::Direction dir = QCosmeticStroker::LeftToRight; + +@@ -886,14 +894,15 @@ static void drawLine(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, + } + } + stroker->lastPixel = last; ++ return true; + } + + + template<DrawPixel drawPixel, class Dasher> +-static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) ++static bool drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx2, qreal ry2, int caps) + { + if (stroker->clipLine(rx1, ry1, rx2, ry2)) +- return; ++ return false; + + int x1 = toF26Dot6(rx1); + int y1 = toF26Dot6(ry1); +@@ -967,7 +976,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx + } else { + // horizontal + if (!dx) +- return; ++ return true; + + int yinc = F16Dot16FixedDiv(dy, dx); + +@@ -1029,6 +1038,7 @@ static void drawLineAA(QCosmeticStroker *stroker, qreal rx1, qreal ry1, qreal rx + drawPixel(stroker, x, (y>>16) + 1, alpha * alphaEnd >> 6); + } + } ++ return true; + } + + QT_END_NAMESPACE +diff --git a/src/gui/painting/qcosmeticstroker_p.h b/src/gui/painting/qcosmeticstroker_p.h +index 870738b..3216856 100644 +--- a/src/gui/painting/qcosmeticstroker_p.h ++++ b/src/gui/painting/qcosmeticstroker_p.h +@@ -56,7 +56,7 @@ QT_MODULE(Gui) + class QCosmeticStroker; + + +-typedef void (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); ++typedef bool (*StrokeLine)(QCosmeticStroker *stroker, qreal x1, qreal y1, qreal x2, qreal y2, int caps); + + class QCosmeticStroker + { +-- +1.7.1 + diff --git a/extra/qt4/qtbug-32534.patch b/extra/qt4/qtbug-32534.patch new file mode 100644 index 000000000..c49f18842 --- /dev/null +++ b/extra/qt4/qtbug-32534.patch @@ -0,0 +1,40 @@ +From 1f40ed553e618c3b0511c7db4b4fd26c2d2b65bf Mon Sep 17 00:00:00 2001 +From: Peter Hartmann <phartmann@blackberry.com> +Date: Thu, 25 Jul 2013 12:05:29 -0400 +Subject: [PATCH] QHttpMultiPart: fix data corruption in readData method + +When readData() is called repeatedly, we need to keep track which +part of the multipart message we are currently reading from. +Hereby we also need to take the boundary size into account, and not +only the size of the multipart; otherwise we would skip a not +completely read part. This would then later lead to advancing the +read pointer by negative indexes and data loss. + +Task-number: QTBUG-32534 +Change-Id: Ibb6dff16adaf4ea67181d23d1d0c8459e33a0ed0 +Reviewed-by: Jonathan Liu <net147@gmail.com> +Reviewed-by: Shane Kearns <shane.kearns@accenture.com> +(cherry picked from qtbase/af96c6fed931564c95037539f07e9c8e33c69529) +Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> +--- + src/network/access/qhttpmultipart.cpp | 3 +- + tests/auto/qnetworkreply/tst_qnetworkreply.cpp | 44 ++++++++++++++++++++++++ + 2 files changed, 46 insertions(+), 1 deletions(-) + +diff --git a/src/network/access/qhttpmultipart.cpp b/src/network/access/qhttpmultipart.cpp +index 635129a..b25e917 100644 +--- a/src/network/access/qhttpmultipart.cpp ++++ b/src/network/access/qhttpmultipart.cpp +@@ -488,7 +488,8 @@ qint64 QHttpMultiPartIODevice::readData(char *data, qint64 maxSize) + + // skip the parts we have already read + while (index < multiPart->parts.count() && +- readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size()) ++ readPointer >= partOffsets.at(index) + multiPart->parts.at(index).d->size() ++ + multiPart->boundary.count() + 6) // 6 == 2 boundary dashes, \r\n after boundary, \r\n after multipart + index++; + + // read the data +-- +1.7.1 + diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD index 57c0787f5..98161b0c4 100644 --- a/extra/qt5/PKGBUILD +++ b/extra/qt5/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 189742 2013-07-06 18:49:32Z andrea $ +# $Id: PKGBUILD 193725 2013-08-29 13:10:15Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=qt5 @@ -10,6 +10,7 @@ pkgname=('qt5-base' # V8 is not ported yet to mips64el, don't build jsbackend and its reverse dependencies there. [ "$CARCH" != "mips64el" ] && pkgname+=( 'qt5-declarative' + 'qt5-doc' 'qt5-graphicaleffects' 'qt5-jsbackend' 'qt5-multimedia' @@ -24,11 +25,11 @@ pkgname=('qt5-base' 'qt5-webkit' 'qt5-x11extras' 'qt5-xmlpatterns') -pkgver=5.1.0 +pkgver=5.1.1 pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://qt-project.org/' -license=('GPL3' 'LGPL') +license=('GPL3' 'LGPL' 'FDL' 'custom') makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms' 'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins' 'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils' @@ -42,13 +43,15 @@ _pkgfqn="qt-everywhere-opensource-src-${pkgver}" source=("http://download.qt-project.org/official_releases/qt/5.1/${pkgver}/single/${_pkgfqn}.tar.xz" 'assistant.desktop' 'designer.desktop' 'linguist.desktop' 'qdbusviewer.desktop' 'use-python2.patch' 'qatomic-before-mips32.patch') -md5sums=('44a507beebef73eb364b5a2ec7bbe090' + 'bison3.patch') +md5sums=('697b7b8768ef8895e168366ab6b44760' 'b2897dd6a2967bccf8f10e397aafee55' '9638a78e502719ef8fe5f8d10d0361a9' '188da8f4c87316e730ebf1c6217bf5a0' '322b419b16c75d4de0ee7ad0a246caa1' '92831f79144d5cb8121915423ba47575' - '84d7fcc2b5f270f482d5522ae01c29e2') + '84d7fcc2b5f270f482d5522ae01c29e2' + '6b162cd2bc104f0ae83ca039401be7bf') prepare() { cd ${_pkgfqn} @@ -65,13 +68,18 @@ prepare() { # Fix build without -march=mips32, mips64 or its superset. patch -p1 -i "$srcdir/qatomic-before-mips32.patch" + + # Fix build with bison 3.x + cd qtwebkit + patch -p1 -i "${srcdir}"/bison3.patch } build() { cd ${_pkgfqn} export QTDIR="${srcdir}"/${_pkgfqn} - export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH} + export LD_LIBRARY_PATH="${QTDIR}"/qtbase/lib:"${QTDIR}"/qttools/lib:"${LD_LIBRARY_PATH}" + export QT_PLUGIN_PATH="${QTDIR}"/qtbase/plugins # disable firebird on mips64el [ "$CARCH" != "mips64el" ] && extra="-plugin-sql-ibase" @@ -88,9 +96,7 @@ build() { -plugin-sql-{psql,mysql,sqlite,odbc} \ -system-sqlite \ -openssl-linked \ - -nomake docs \ -nomake examples \ - -nomake tests \ -no-rpath \ -optimized-qmake \ -dbus-linked \ @@ -102,17 +108,14 @@ build() { make $modules if [ "$CARCH" != "mips64el" ]; then - # build docs - make docs + # Fix paths + find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} + + find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt/bin/qdoc|${QTDIR}/qtbase/bin/qdoc|g" {} + + find "${QTDIR}" -name Makefile -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} + + find "${QTDIR}" -name Makefile.qmake-docs -exec sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" {} + + sed -i "s|/usr/lib/qt/bin/qhelpgenerator|${QTDIR}/qttools/bin/qhelpgenerator|g" qtwebkit/Source/Makefile.api - # build examples - for m in qtbase qtdeclarative qtmultimedia qtquick1 qtscript qtsvg qttools \ - qtwebkit-examples-and-demos qtxmlpatterns; do - cd ${m}/examples - ${QTDIR}/qtbase/bin/qmake - make - cd ../../ - done + make docs fi } @@ -168,6 +171,20 @@ package_qt5-declarative() { done } +package_qt5-doc() { + pkgdesc='A cross-platform application and UI framework (Documentation)' + depends=('qt5-base') +# arch=('any') + conflicts=('qt-doc') + replaces=('qt-doc') + provides=('qt-doc') + options=('docs') + groups=() + + cd ${_pkgfqn} + make INSTALL_ROOT="${pkgdir}" install_docs +} + package_qt5-jsbackend() { pkgdesc='A cross-platform application and UI framework (QtV8)' depends=('qt5-base') diff --git a/extra/qt5/bison3.patch b/extra/qt5/bison3.patch new file mode 100644 index 000000000..4070c88e8 --- /dev/null +++ b/extra/qt5/bison3.patch @@ -0,0 +1,38 @@ +From 60ba8bd5b3575d0c7740571fbb4e681b21a49a82 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen <allan.jensen@digia.com> +Date: Fri, 16 Aug 2013 18:27:07 +0200 +Subject: [PATCH] ANGLE doesn't build with bison 3.0 + +https://bugs.webkit.org/show_bug.cgi?id=119798 + +Reviewed by Antti Koivisto. + +Make glslang.y compatible with bison 3.0 +by using %lex-param to set YYLEX_PARAM. + +* src/compiler/glslang.y: + +git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154109 268f45cc-cd09-0410-ab3c-d52691b4dbfc + +Task-number: QTBUG-32913 +Change-Id: I15505d31f0588c4d558b73befdb9d2358e29c1a3 +Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> +--- + Source/ThirdParty/ANGLE/src/compiler/glslang.y | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/Source/ThirdParty/ANGLE/src/compiler/glslang.y b/Source/ThirdParty/ANGLE/src/compiler/glslang.y +index 3cad335..b41e95a 100644 +--- a/Source/ThirdParty/ANGLE/src/compiler/glslang.y ++++ b/Source/ThirdParty/ANGLE/src/compiler/glslang.y +@@ -47,6 +47,7 @@ WHICH GENERATES THE GLSL ES PARSER (glslang_tab.cpp AND glslang_tab.h). + %expect 1 /* One shift reduce conflict because of if | else */ + %pure-parser + %parse-param {TParseContext* context} ++%lex-param {YYLEX_PARAM} + + %union { + struct { +-- +1.7.1 + diff --git a/extra/qt5/gcc48.patch b/extra/qt5/gcc48.patch deleted file mode 100644 index 03b205b68..000000000 --- a/extra/qt5/gcc48.patch +++ /dev/null @@ -1,63 +0,0 @@ -# Author: David E. Narváez <david.narvaez@computer.org> -# AuthorDate: 2013-02-23 23:14:50 -0500 -# Commit: David E. Narváez <david.narvaez@computer.org> -# CommitDate: 2013-02-23 23:14:50 -0500 -# -# Rename qAbs Function for timeval -# -# This decouples it from qAbs which is declared as a constexpr under -# certain compilation flags and enables for qtbase to be compiled with -# GCC 4.8 -# -# Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9 -diff --git a/src/corelib/kernel/qtimerinfo_unix.cpp b/src/corelib/kernel/qtimerinfo_unix.cpp -index 0eee425..7a29247 100644 ---- a/src/corelib/kernel/qtimerinfo_unix.cpp -+++ b/src/corelib/kernel/qtimerinfo_unix.cpp -@@ -87,22 +87,21 @@ - firstTimerInfo = 0; - } - - timeval QTimerInfoList::updateCurrentTime() - { - return (currentTime = qt_gettime()); - } - - #if ((_POSIX_MONOTONIC_CLOCK-0 <= 0) && !defined(Q_OS_MAC) && !defined(Q_OS_INTEGRITY)) || defined(QT_BOOTSTRAPPED) - --template <> --timeval qAbs(const timeval &t) -+timeval qAbsTimeval(const timeval &t) - { - timeval tmp = t; - if (tmp.tv_sec < 0) { - tmp.tv_sec = -tmp.tv_sec - 1; - tmp.tv_usec -= 1000000; - } - if (tmp.tv_sec == 0 && tmp.tv_usec < 0) { - tmp.tv_usec = -tmp.tv_usec; - } - return normalizedTimeval(tmp); -@@ -137,21 +136,21 @@ - *delta = elapsedTime - elapsedTimeTicks; - - previousTicks = currentTicks; - previousTime = currentTime; - - // If tick drift is more than 10% off compared to realtime, we assume that the clock has - // been set. Of course, we have to allow for the tick granularity as well. - timeval tickGranularity; - tickGranularity.tv_sec = 0; - tickGranularity.tv_usec = msPerTick * 1000; -- return elapsedTimeTicks < ((qAbs(*delta) - tickGranularity) * 10); -+ return elapsedTimeTicks < ((qAbsTimeval(*delta) - tickGranularity) * 10); - } - - /* - repair broken timer - */ - void QTimerInfoList::timerRepair(const timeval &diff) - { - // repair all timers - for (int i = 0; i < size(); ++i) { - register QTimerInfo *t = at(i); diff --git a/extra/sdl2/PKGBUILD b/extra/sdl2/PKGBUILD index 8cd8fc037..c554f2083 100644 --- a/extra/sdl2/PKGBUILD +++ b/extra/sdl2/PKGBUILD @@ -2,13 +2,13 @@ pkgname=sdl2 pkgver=2.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)" arch=('i686' 'x86_64') url="http://www.libsdl.org" license=('MIT') depends=('glibc' 'libxext' 'libxrender' 'libx11' 'libgl') -makedepends=('alsa-lib' 'mesa' 'libpulse' 'cmake') +makedepends=('alsa-lib' 'mesa' 'libpulse' 'cmake' 'libxrandr' 'libxinerama') optdepends=('alsa-lib: ALSA audio driver' 'libpulse: PulseAudio audio driver') source=("http://www.libsdl.org/release/SDL2-${pkgver}.tar.gz") diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD index 0eac5ad0c..938c5d56f 100644 --- a/extra/sqlite/PKGBUILD +++ b/extra/sqlite/PKGBUILD @@ -1,13 +1,13 @@ -# $Id: PKGBUILD 193636 2013-08-26 14:58:30Z andyrtr $ +# $Id: PKGBUILD 193758 2013-08-30 08:53:28Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: Tom Newsom <Jeepster@gmx.co.uk> pkgbase="sqlite" pkgname=('sqlite' 'sqlite-tcl') -_amalgamationver=3080000 +_amalgamationver=3080001 _docver=${_amalgamationver} #_docver=3080001 -pkgver=3.8.0 +pkgver=3.8.0.1 pkgrel=1 pkgdesc="A C library that implements an SQL database engine" arch=('i686' 'x86_64' 'mips64el') @@ -18,7 +18,8 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz license.txt) options=('!libtool' '!emptydirs') -sha1sums=('610d01764c2fc6c6220ab88a57ac4de86515ebc8' +sha1sums=('d2fd623a7537e0fad5a2f33169dd9d6def268583' + '89005a0fdd60accd037845895c9b21221d9fc30d' 'f34f6daa4ab3073d74e774aad21d66878cf26853') build() { diff --git a/extra/wayland/PKGBUILD b/extra/wayland/PKGBUILD index 36333f1a6..5884f67a8 100644 --- a/extra/wayland/PKGBUILD +++ b/extra/wayland/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 190120 2013-07-15 21:53:45Z tomegun $ +# $Id: PKGBUILD 193712 2013-08-28 20:08:20Z lcarlier $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: Sébastien Luttringer # Contributor: Joel Teichroeb <joel@teichroeb.net> pkgname=wayland -pkgver=1.2.0 +pkgver=1.2.1 pkgrel=1 pkgdesc='A computer display server protocol' arch=('i686' 'x86_64' 'mips64el') @@ -14,9 +14,11 @@ depends=('libffi' 'expat') makedepends=('doxygen') options=(!libtool) source=("http://wayland.freedesktop.org/releases/$pkgname-$pkgver.tar.xz") +sha1sums=('2214b690cb5a4f9695d287f27730c4368e6ef829') build() { cd $pkgname-$pkgver + ./configure --prefix=/usr \ --disable-static make @@ -24,7 +26,7 @@ build() { package() { cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install install -Dm 644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" } -md5sums=('48d375afb15f3e68a72cf7b4fd8f4a63') diff --git a/extra/xchm/PKGBUILD b/extra/xchm/PKGBUILD index 5e80ecc1f..a339f9e1b 100644 --- a/extra/xchm/PKGBUILD +++ b/extra/xchm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 179976 2013-03-13 18:06:41Z giovanni $ +# $Id: PKGBUILD 193831 2013-09-02 17:00:04Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=xchm -pkgver=1.22 +pkgver=1.23 pkgrel=1 pkgdesc="A cross-platform GUI front-end to chmlib" arch=('i686' 'x86_64' 'mips64el') @@ -13,7 +13,7 @@ install=xchm.install source=("http://downloads.sourceforge.net/sourceforge/xchm/${pkgname}-${pkgver}.tar.gz" 'xchm.desktop' 'xchm.xml') -md5sums=('3856ec4e6e54a80d0811707975fc8995' +md5sums=('486d029bd81071a2d04e7181909b1602' '31fb9692b9ee9f2a205f58b9ff4bc4fe' '4102b0a393f5c60236143cc034664dd0') diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 2129f8250..0113942b9 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192482 2013-08-12 20:25:49Z eric $ +# $Id: PKGBUILD 193690 2013-08-28 00:06:11Z eric $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=xine-lib pkgver=1.2.3 -pkgrel=3 +pkgrel=4 pkgdesc="A multimedia playback engine" arch=('i686' 'x86_64' 'mips64el') url="http://www.xine-project.org" diff --git a/kernels/linux-libre-pae/PKGBUILD b/kernels/linux-libre-pae/PKGBUILD index 6d30bb5d3..5e8721d34 100644 --- a/kernels/linux-libre-pae/PKGBUILD +++ b/kernels/linux-libre-pae/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $ +# $Id: PKGBUILD 193761 2013-08-30 11:11:43Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-pae # Build stock -LIBRE-PAE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.9 +pkgver=${_basekernel}.10 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -24,7 +24,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' '3.10.6-logitech-dj.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '312e4b4203d2e74201a14f1a9633482d' + '673ae6d60b4ce8acad930a06f9fe2e3f' '7dc48829b6bcb5db3779d558c705ab63' 'f302c931bd85309da9d9792b4cc96467' '04b21c79df0a952c22d681dd4f4562df' diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index 7391edac4..601c9559f 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $ +# $Id: PKGBUILD 193761 2013-08-30 11:11:43Z tpowa $ # Maintainer: Joakim Hernberg <jbh@alchemy.lu> # Contributor: Ray Rashif <schiv@archlinux.org> # Contributor: timbosa <tinny_tim@dodo.com.au> @@ -10,12 +10,12 @@ pkgbase=linux-libre-rt # Build stock -LIBRE-RT kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_releasever=9 -_rtpatchver=rt5 +_releasever=10 +_rtpatchver=rt7 _pkgver=${_basekernel}.${_releasever} pkgver=${_basekernel}.${_releasever}_${_rtpatchver} pkgrel=1 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.10 # nearly always the same as pkgver arch=('i686' 'x86_64' 'mips64el') url="http://linux-libre.fsfla.org/" license=('GPL2') @@ -36,8 +36,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn '3.10.6-logitech-dj.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '312e4b4203d2e74201a14f1a9633482d' - '9840bcd0525a85e13cfa95ea95b16ba0' + '673ae6d60b4ce8acad930a06f9fe2e3f' + 'b634614a96f47a564bc32bc87afe587f' '9dad7b1491caf056b10d4fbf54081988' '6fb1660497947ec5c20405dc439b5c5a' '82496e68851d1960543a07ba51cdb44a' @@ -47,7 +47,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' '3ff40ca684cfe719723e627e2cef7cea' - 'd2fb29339d9ec7978af71f80daa27a12') + '714134bcb52e243898036beacca2e7b7') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD index 03649c605..f5ac5b701 100644 --- a/kernels/linux-libre-xen/PKGBUILD +++ b/kernels/linux-libre-xen/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $ +# $Id: PKGBUILD 193761 2013-08-30 11:11:43Z tpowa $ # Contributor: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ pkgbase=linux-libre-xen # Build stock -LIBRE-XEN kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -pkgver=${_basekernel}.9 +pkgver=${_basekernel}.10 pkgrel=1 arch=('i686') url="http://linux-libre.fsfla.org/" @@ -24,7 +24,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn 'criu-no-expert.patch' '3.10.6-logitech-dj.patch') md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '312e4b4203d2e74201a14f1a9633482d' + '673ae6d60b4ce8acad930a06f9fe2e3f' 'f104314d8db864b1702c50ea97134be3' 'b7c2805bb287a644c0a303bf7721e534' '04b21c79df0a952c22d681dd4f4562df' diff --git a/libre/arora-libre/PKGBUILD b/libre/arora-libre/PKGBUILD new file mode 100644 index 000000000..0b9aa4f4c --- /dev/null +++ b/libre/arora-libre/PKGBUILD @@ -0,0 +1,56 @@ +# $Id: PKGBUILD 188496 2013-06-15 04:38:11Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> +# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> + +_pkgname=arora +pkgname=arora-libre +pkgver=0.11.0 +pkgrel=4 +pkgdesc='Lightweight cross-platform Web browser, without nonfree flash recommendation and non-privacy search providers' +url='http://code.google.com/p/arora/' +license=('GPL') +arch=('i686' 'x86_64' 'mips64el') +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver +depends=('qtwebkit' 'desktop-file-utils') +source=("http://${_pkgname}.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz" + 'searchengines.qrc' + 'libre.patch' + 'duckduckgo-html.xml' + 'seeks-search.xml' + 'wikipedia-en.xml' + 'yacy.xml') +sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31' + 'd64bdfe9022f8b4b0745a0d9cc1094ee80bbc897' + '3982032d669077644d485f4d04d4ae4891bdb0e3' + 'e96f2d92b24daad0cfa28d02a003b92042651de0' + '07bc208fbc3bf3d08192b2c07e550525953fc0b2' + '3eea200350f7436bb2d744f8b6af1b5bbb758e51' + '2d515947a8cbeea831490727e88c89ebee17c313') + +install=install + +prepare() { + cd "${srcdir}/${_pkgname}-${pkgver}" + # remove non-privacy search providers + rm -r src/data/searchengines/* + install -m644 $srcdir/searchengines.qrc src/data/searchengines + install -m644 "$srcdir/"{duckduckgo-html,seeks-search,wikipedia-en,yacy}.xml src/data/searchengines + # remove nonfree flash recommendation + patch -Np1 -i $srcdir/libre.patch + sed -i '\|Flash|d' src/settings.cpp +} + +build() { + cd "${srcdir}/${_pkgname}-${pkgver}" + qmake-qt4 PREFIX='/usr' 'CONFIG-=debug' -r + make +} + +package() { + cd "${srcdir}/${_pkgname}-${pkgver}" + make INSTALL_ROOT="${pkgdir}" install +} diff --git a/libre/arora-libre/duckduckgo-html.xml b/libre/arora-libre/duckduckgo-html.xml new file mode 100644 index 000000000..9b979fa31 --- /dev/null +++ b/libre/arora-libre/duckduckgo-html.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> + <ShortName>DuckDuckGo HTML</ShortName> + <Description>Search DuckDuckGo HTML</Description> + <InputEncoding>UTF-8</InputEncoding> + <Image width="16" height="16">http://duckduckgo.com/favicon.ico</Image> + <Url type="text/html" template="https://duckduckgo.com/html/?q={searchTerms}"/> +</OpenSearchDescription> diff --git a/extra/arora/install b/libre/arora-libre/install index b0409600c..b0409600c 100644 --- a/extra/arora/install +++ b/libre/arora-libre/install diff --git a/libre/arora-libre/libre.patch b/libre/arora-libre/libre.patch new file mode 100644 index 000000000..6bb6c6b43 --- /dev/null +++ b/libre/arora-libre/libre.patch @@ -0,0 +1,30 @@ +diff --git a/src/settings.ui b/src/settings.ui +index 7d4f66e..758beb3 100644 +--- a/src/settings.ui ++++ b/src/settings.ui +@@ -413,25 +413,6 @@ + </property> + </spacer> + </item> +- <item row="2" column="1"> +- <widget class="QCheckBox" name="clickToFlash"> +- <property name="sizePolicy"> +- <sizepolicy hsizetype="Expanding" vsizetype="Fixed"> +- <horstretch>0</horstretch> +- <verstretch>0</verstretch> +- </sizepolicy> +- </property> +- <property name="toolTip"> +- <string>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </string> +- </property> +- <property name="text"> +- <string>Use ClickToFlash on flash plugins</string> +- </property> +- <property name="checked"> +- <bool>true</bool> +- </property> +- </widget> +- </item> + <item row="3" column="0" colspan="2"> + <widget class="QCheckBox" name="enableJavascript"> + <property name="text"> diff --git a/libre/arora-libre/searchengines.qrc b/libre/arora-libre/searchengines.qrc new file mode 100644 index 000000000..93cd9b80d --- /dev/null +++ b/libre/arora-libre/searchengines.qrc @@ -0,0 +1,8 @@ +<!DOCTYPE RCC><RCC version="1.0"> +<qresource prefix="/searchengines"> + <file>duckduckgo-html.xml</file> + <file>seeks-search.xml</file> + <file>wikipedia-en.xml</file> + <file>yacy.xml</file> +</qresource> +</RCC> diff --git a/libre/arora-libre/seeks-search.xml b/libre/arora-libre/seeks-search.xml new file mode 100644 index 000000000..f79d87047 --- /dev/null +++ b/libre/arora-libre/seeks-search.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> + <ShortName>Seeks Search</ShortName> + <Tags>Seeks</Tags> + <Description>Real-time p2p pattern matching network for social websearch.</Description> + <Contact>ebenazer@seeks-project.info</Contact> + <InputEncoding>UTF-8</InputEncoding> + <SyndicationRight>open</SyndicationRight> + <Image width="16" height="16" type="image/png">http://www.seeks.fr/public/images/seek_icon_16x16_transparent.png</Image> + <Url type="text/html" template="http://www.seeks.fr/search/txt/{searchTerms}"/> +</OpenSearchDescription> diff --git a/libre/arora-libre/wikipedia-en.xml b/libre/arora-libre/wikipedia-en.xml new file mode 100644 index 000000000..ea590759f --- /dev/null +++ b/libre/arora-libre/wikipedia-en.xml @@ -0,0 +1 @@ +<?xml version="1.0"?><OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/" xmlns:moz="http://www.mozilla.org/2006/browser/search/"><ShortName>Wikipedia (en)</ShortName><Description>Wikipedia (en)</Description><Image height="16" width="16" type="image/x-icon">http://bits.wikimedia.org/favicon/wikipedia.ico</Image><Url type="text/html" method="get" template="http://en.wikipedia.org/w/index.php?title=Special:Search&search={searchTerms}" /><Url type="application/x-suggestions+json" method="get" template="http://en.wikipedia.org/w/api.php?action=opensearch&search={searchTerms}&namespace=0" /><Url type="application/x-suggestions+xml" method="get" template="http://en.wikipedia.org/w/api.php?action=opensearch&format=xml&search={searchTerms}&namespace=0" /><moz:SearchForm>http://en.wikipedia.org/wiki/Special:Search</moz:SearchForm></OpenSearchDescription>
\ No newline at end of file diff --git a/libre/arora-libre/yacy.xml b/libre/arora-libre/yacy.xml new file mode 100644 index 000000000..9c97f16cc --- /dev/null +++ b/libre/arora-libre/yacy.xml @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<OpenSearchDescription + xmlns="http://a9.com/-/spec/opensearch/1.1/" + xmlns:suggestions="http://www.opensearch.org/specifications/opensearch/extensions/suggestions/1.1"> + <ShortName>YaCy</ShortName> + <LongName>YaCy.net - P2P Web Search</LongName> + <Image type="image/gif">http://search.ipredator.se/env/grafics/yacy.png</Image> + <Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAAAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////Chiu+fBm+fRq+fRq+fRq+fRq+fRq8ehXMmk////////////////////////////++exjUqGfZsnjYsXbYsXbYsXbZsnjTp2W+fBr///////////////////////////+9exfs2r/69/L58+z58+z58+z59e/z59bChSn///////////////////////////+9fBnnz638+fX69O369e748un38Ob59O3Ll0fVrGz////////////////////////Jk0HJlUjXuYrWt4jVtYPr28T58+r59OzPn1fPnlX////////////////////////Rolu8eRXCiTPEjTvCijbNnlj169359e7Zs3vLlkf////////////////////////UqmrAgSLt3MP27eH1693169327+T59Ozo0rG/gB////////////////////////////+/gCDv4Mn48+v38Of59Oz58+v48+vr2b2+fRv///////////////////////////+9ehXr17n58+z48ejo0bDp07T48+zx49DBhCj///////////////////////////+/fhzjyJ/59Oz59OzQoVvNmU759Oz58+vKlUbXrnH////////////////////////LlkfUqmn59Oz48+vZtHzNm1D48+v59OzPoFjOnlX////////////////////////OnVPOnFL59e348+vq1rnEiC7u38j69vDXsHTIkT3////////////////////////UqWjIkD327+T58+3s2bzAgSLp07T79/Pmzqq+fBn///////////////////////////+/fx7v4Mr7+PTx5NDHkD3kyqP8+vjs2r+9exf///////////////////////////++fBjQoFnVq2zTp2bGjTjJk0LWrW7SpWC+exf////////////////////////////Nm1C6dQy7eBG8eBK9exe8ehS7dxC6dQzLlkj////////////AH///wB8x+sAf///AD/+PwA///8AP///AD///4A9PU+APoz/gB///4AdxvOAHoz/gB3368AfjU/AHT1PwB/+P +</Image> + <Language>en-us</Language> + <OutputEncoding>UTF-8</OutputEncoding> + <InputEncoding>UTF-8</InputEncoding> + <AdultContent>true</AdultContent> + <Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer '_anonufe-29422893-0'.</Description> + + <Url type="text/html" method="GET" template="http://search.ipredator.se/yacysearch.html?query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&nav=all" /> + <Url type="application/rss+xml" method="GET" template="http://search.ipredator.se/yacysearch.rss?nav=&query={searchTerms}&startRecord={startIndex?}&maximumRecords={count?}&verify=false" /> + + <Url type="application/x-suggestions+json" template="http://search.ipredator.se/suggest.json?query={searchTerms}"/> + <Url type="application/x-suggestions+xml" template="http://search.ipredator.se/suggest.xml?query={searchTerms}"/> + <!-- syntax according to http://www.loc.gov/standards/sru/. Set verify=true to get snippets in the search results --> + <Developer>See https://gitorious.org/+yacy-developers</Developer> + <Query role="example" searchTerms="yacy+open+source" /> + <Tags>YaCy Open Source P2P Web Search</Tags> + <Contact>See http://search.ipredator.se/ViewProfile.html?hash=localhash</Contact> + <Attribution>YaCy Software &copy; 2004-2012 by Michael Christen et al., YaCy.net; Content: ask peer owner</Attribution> + <SyndicationRight>open</SyndicationRight> +</OpenSearchDescription> diff --git a/libre/bbswitch-libre/PKGBUILD b/libre/bbswitch-libre/PKGBUILD index cb7c71655..3696452e4 100644 --- a/libre/bbswitch-libre/PKGBUILD +++ b/libre/bbswitch-libre/PKGBUILD @@ -7,7 +7,7 @@ _pkgname=bbswitch pkgname=bbswitch-libre pkgver=0.7 _extramodules=extramodules-3.10-LIBRE # Don't forget to update bbswitch.install -pkgrel=11 +pkgrel=12 pkgdesc="Kernel module allowing to switch dedicated graphics card on Optimus laptops (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url=("http://github.com/Bumblebee-Project/bbswitch") diff --git a/libre/calibre-libre/PKGBUILD b/libre/calibre-libre/PKGBUILD index 1eb17b175..33370e958 100644 --- a/libre/calibre-libre/PKGBUILD +++ b/libre/calibre-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96275 2013-08-23 10:26:11Z jelle $ +# $Id: PKGBUILD 96478 2013-08-30 14:11:37Z jelle $ # Maintainer: jelle van der Waa <jelle@vdwaa.nl> # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor: Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=calibre pkgname=calibre-libre -pkgver=1.0.0 +pkgver=1.1.0 pkgrel=1 pkgdesc="Ebook management application, with unar support included and nonfree fonts removed" arch=('i686' 'x86_64' 'mips64el') @@ -30,7 +30,7 @@ install=calibre.install source=("http://sourceforge.net/projects/calibre/files/${pkgver}/calibre-${pkgver}.tar.xz" 'desktop_integration.patch' 'calibre-mount-helper') -md5sums=('5f3d0c3630a7289ef1f36d68153ea7a3' +md5sums=('8f76d0776012cb6a5d2b8269552c1b98' '8353d1878c5a498b3e49eddef473605f' '675cd87d41342119827ef706055491e7') diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD index ecd2ace16..c44b6b787 100644 --- a/libre/cgminer-libre/PKGBUILD +++ b/libre/cgminer-libre/PKGBUILD @@ -1,40 +1,49 @@ -# $Id: PKGBUILD 96190 2013-08-21 13:06:15Z 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.0 +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" - # 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 \ @@ -51,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=('2f308c9285755b62608da4a6be3942d08b6cfff218238dbb4c15da7d02c8f2ac46cd7a9fbd69b7a46faa11962a937ba6327aa03852c291e69ff6158e50c1e5b6' +sha512sums=('cccdab8de11b9bc740ba387685a24ae07729eedba0dd02d83d708d66b208cff2c719157a90cc157fa4900a386ae76e7692bdc893f3de9928dbcaacc86a4c05f1' '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41' '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f') diff --git a/libre/cups-filters-libre/PKGBUILD b/libre/cups-filters-libre/PKGBUILD index 2b06286a2..7eda9f68a 100644 --- a/libre/cups-filters-libre/PKGBUILD +++ b/libre/cups-filters-libre/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192539 2013-08-13 18:20:20Z andyrtr $ +# $Id: PKGBUILD 193721 2013-08-29 11:50:04Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=cups-filters-libre _pkgname=cups-filters -pkgver=1.0.36 +pkgver=1.0.37 pkgrel=1 pkgdesc="OpenPrinting CUPS Filters, without foomatic-db-nonfree recommendation" arch=('i686' 'x86_64' 'mips64el') @@ -17,10 +17,8 @@ optdepends=('ghostscript: for non-PostScript printers to print with CUPS to conv backup=(etc/fonts/conf.d/99pdftoopvp.conf etc/cups/cups-browsed.conf) options=(!libtool) -source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz - cups-browsed.service) -md5sums=('c48a991ac408583d33e1d1e84881c470' - '9ef68d7c2a84713fd421f4e87dec0a6e') +source=(http://www.openprinting.org/download/cups-filters/$_pkgname-$pkgver.tar.gz) +md5sums=('42d2dd9745d4d5d626c7b871155cb430') replaces=("${_pkgname}") conflicts=("${_pkgname}") provides=("${_pkgname}=${pkgver}") @@ -49,6 +47,7 @@ package() { # drop static lib rm -f ${pkgdir}/usr/lib/*.a - # add missing systemd support - install -Dm644 ${srcdir}/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service + # add upstream systemd support file + install -Dm644 utils/cups-browsed.service ${pkgdir}/usr/lib/systemd/system/cups-browsed.service + sed -i "s|/usr/sbin/cups-browsed|/usr/bin/cups-browsed|" ${pkgdir}/usr/lib/systemd/system/cups-browsed.service } diff --git a/libre/ghostscript-libre/PKGBUILD b/libre/ghostscript-libre/PKGBUILD index d9be53172..d339089af 100644 --- a/libre/ghostscript-libre/PKGBUILD +++ b/libre/ghostscript-libre/PKGBUILD @@ -1,18 +1,20 @@ -# $Id: PKGBUILD 192537 2013-08-13 17:54:45Z 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.07 -pkgrel=3 +pkgver=9.10 +pkgrel=1 pkgdesc="An interpreter for the PostScript language, without nonfree files" arch=('i686' 'x86_64' 'mips64el') license=('AGPL') #non free files removed depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' - 'libtiff>=4.0.0' 'lcms' 'dbus') -makedepends=('gtk2' 'gnutls') + 'libtiff>=4.0.0' 'lcms2' 'dbus') +makedepends=('gtk2' 'gnutls' 'openjpeg') optdepends=('texlive-core: needed for dvipdf' 'gtk2: needed for gsx') conflicts=('ghostscript') @@ -20,18 +22,18 @@ replaces=('ghostscript') provides=("ghostscript=$pkgver") url="http://www.ghostscript.com/" source=(http://downloads.ghostscript.com/public/ghostscript-${pkgver}.tar.bz2) -options=('!libtool') -md5sums=('eea27befc1e85bef6d4768202f6b03a5') +options=('!libtool' '!makeflags') +md5sums=('7179bb1ed4f6f453147e6f7e1f210ce8') build() { cd ghostscript-${pkgver} - # delete non-free packages + # delete nonfree files grep -l "are not altered" Resource/CMap/* | xargs rm -fv grep -l "not be copied" Resource/CMap/* | xargs rm -fv # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat tiff lcms freetype + rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community ./configure --prefix=/usr \ --enable-dynamic \ @@ -60,7 +62,7 @@ build() { package() { cd ghostscript-${pkgver} - make -j1 DESTDIR="${pkgdir}" \ + make DESTDIR="${pkgdir}" \ cups_serverroot="${pkgdir}"/etc/cups \ cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall @@ -74,7 +76,7 @@ package() { # install IJS cd ijs - make -j1 DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" install # remove filters that are now maintained in cups-filters as upstream home rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} diff --git a/libre/gnu-ghostscript/PKGBUILD b/libre/gnu-ghostscript/PKGBUILD index 46bbb845d..0c124d528 100644 --- a/libre/gnu-ghostscript/PKGBUILD +++ b/libre/gnu-ghostscript/PKGBUILD @@ -2,15 +2,16 @@ _pkgname=ghostscript pkgname=gnu-ghostscript -_gspkgver=9.07 # ghostscript package version +_gspkgver=9.10 # ghostscript package version _pkgver=9.06 pkgver=9.06.0 -pkgrel=4 +pkgrel=6 pkgdesc="An interpreter for the PostScript language maintained by a team of GNU programmers" arch=('i686' 'x86_64' 'mips64el') license=('GPL3') -depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' 'libtiff>=4.0.0' 'lcms2') -makedepends=('gtk2' 'gnutls') +depends=('libxt' 'libcups' 'fontconfig' 'jasper' 'zlib' 'libpng>=1.5.7' 'libjpeg' + 'libtiff>=4.0.0' 'lcms2' 'dbus') +makedepends=('gtk2' 'gnutls' 'openjpeg') optdepends=('texlive-core: needed for dvipdf' 'gtk2: needed for gsx') conflicts=${_pkgname} @@ -19,13 +20,13 @@ url="https://www.gnu.org/software/${_pkgname}/" source=(ftp://ftp.gnu.org/gnu/${_pkgname}/${pkgname}-${pkgver}.tar.xz ijs-automake.patch libtool.patch) -options=('!libtool') +options=('!libtool' '!makeflags') md5sums=('85a5e07a6b91937c157576293b381065' '83bcae456ad4c9fb790be483914dbeba' '5bd5d4966007b460deed866a30a0b3c8') build() { - cd ${srcdir}/${pkgname}-${pkgver} + cd ${pkgname}-${pkgver} # fix build with recent automake patch -p1 -i "$srcdir/ijs-automake.patch" @@ -34,7 +35,7 @@ build() { patch -Np1 -i ${srcdir}/libtool.patch # force it to use system-libs - rm -rf jpeg libpng zlib jasper expat tiff lcms freetype + rm -rf jpeg libpng zlib jasper expat tiff lcms lcms2 freetype openjpeg cups/libs # jbig2dec is in community ./configure --prefix=/usr \ --enable-dynamic \ @@ -48,35 +49,37 @@ build() { --enable-fontconfig \ --enable-freetype \ --without-luratech \ + --without-omni \ --with-system-libtiff \ --disable-compile-inits #--help # needed for linking with system-zlib make # Build IJS - cd ${srcdir}/${pkgname}-${pkgver}/ijs + cd ijs + sed -i "s:AM_PROG_CC_STDC:AC_PROG_CC:g" configure.ac ./autogen.sh ./configure --prefix=/usr --enable-shared --disable-static make } package() { - cd ${srcdir}/${pkgname}-${pkgver} - make -j1 DESTDIR=${pkgdir} \ - cups_serverroot=${pkgdir}/etc/cups \ - cups_serverbin=${pkgdir}/usr/lib/cups install soinstall + cd ${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" \ + cups_serverroot="${pkgdir}"/etc/cups \ + cups_serverbin="${pkgdir}"/usr/lib/cups install soinstall # install missing doc files # http://bugs.archlinux.org/task/18023 - install -m 644 ${srcdir}/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} ${pkgdir}/usr/share/${_pkgname}/$_pkgver/doc/ + install -m 644 "${srcdir}"/${pkgname}-${pkgver}/doc/{Ps2ps2.htm,gs-vms.hlp,gsdoc.el,pscet_status.txt} "${pkgdir}"/usr/share/${_pkgname}/$_pkgver/doc/ mkdir -p ${pkgdir}/usr/share/licenses/${_pkgname} install -m644 LICENSE ${pkgdir}/usr/share/licenses/${_pkgname}/ # remove unwanted localized man-pages - rm -rf $pkgdir/usr/share/man/[^man1]* + rm -rf "$pkgdir"/usr/share/man/[^man1]* # install IJS - cd ${srcdir}/${pkgname}-${pkgver}/ijs - make -j1 DESTDIR=${pkgdir} install + cd ijs + make DESTDIR="${pkgdir}" install # remove filters that are now maintained in cups-filters as upstream home rm -rf "$pkgdir"/usr/lib/cups/filter/{gstopxl,gstoraster} diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD index 6477c774c..0eef753de 100644 --- a/libre/gst-plugins-bad-libre/PKGBUILD +++ b/libre/gst-plugins-bad-libre/PKGBUILD @@ -1,9 +1,10 @@ +# $Id: PKGBUILD 193745 2013-08-30 07:49:47Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> _pkgname=gst-plugins-bad pkgname=$_pkgname-libre -pkgver=1.0.9 +pkgver=1.0.10 pkgrel=1 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support' arch=('i686' 'x86_64' 'mips64el') @@ -16,7 +17,7 @@ conflicts=$_pkgname replaces=$_pkgname options=(!libtool !emptydirs) source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz) -sha256sums=('69d236b1d8188270a3f51f6710146d0ca63c2f1a9f6cfbab3399ef01b9498f75') +sha256sums=('91da60ba2ee5c681f11188a4a456894e7f989435c2102c15eff97bbd4fc4c726') build() { cd $_pkgname-$pkgver @@ -34,7 +35,8 @@ build() { check() { cd $_pkgname-$pkgver - make check + # don't have a camera for the camerabin test + make -k check || : } package() { diff --git a/libre/lib32-libclc-svn/PKGBUILD b/libre/lib32-libclc-svn/PKGBUILD new file mode 100644 index 000000000..c1c7e021c --- /dev/null +++ b/libre/lib32-libclc-svn/PKGBUILD @@ -0,0 +1,41 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +_pkgname=libclc +pkgname=lib32-$_pkgname-svn +pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgrel=2 +arch=x86_64 +pkgdesc='Library requirements of the OpenCL C programming language (32-bit)' +url=http://libclc.llvm.org/ +license=MIT +depends=(lib32-llvm-libs libclc-svn) +makedepends=(clang lib32-llvm python2 svn) +provides=(lib32-$_pkgname) +conflicts=lib32-$_pkgname +source=$_pkgname::svn+http://llvm.org/svn/llvm-project/libclc/trunk +sha512sums=SKIP + +prepare() { + sed -i 's|/usr/bin/python|/usr/bin/python2|g; + ' $srcdir/$_pkgname/{configure,build/ninja_syntax}.py +} + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + + cd $srcdir/$_pkgname + ./configure.py --prefix=/usr\ + --libexecdir=/usr/lib32/clc\ + --pkgconfigdir=/usr/lib32/pkgconfig\ + --with-llvm-config=/usr/bin/llvm-config32 + make +} + +package() { + cd $srcdir/$_pkgname + make DESTDIR=$pkgdir install + install -vDm644 LICENSE.TXT $pkgdir/usr/share/licenses/$pkgname/LICENSE + msg 'remove useless include dir' + rm -vrf $pkgdir/usr/include +} diff --git a/libre/libcl-libre/PKGBUILD b/libre/libcl-libre/PKGBUILD deleted file mode 100644 index 425525492..000000000 --- a/libre/libcl-libre/PKGBUILD +++ /dev/null @@ -1,75 +0,0 @@ -# Maintainer: Márcio Silva <coadde@lavabit.com> - -pkgbase=mesa -pkgname=libcl-libre -pkgver=9.0 -pkgrel=2 -arch=( - i686 - x86_64 - mips64el -) -makedepends=( - clang - dri2proto - git - glproto - imake - libdrm - libxdamage - libxext - libxml2 - llvm - python2 -) -license=( - MIT - Khronos - LGPL -) -url="http://${pkgbase}3d.sourceforge.net" -depends=( - gcc-libs - libdrm - libffi - libxcb - udev -) -conflicts=( - ${pkgname%-libre} -) -provides=( - ${pkgname%-libre} -) -replaces=( - ${pkgname%-libre} -) -pkgdesc='Mesa OpenCL library and ICD loader' -source=( - ftp://ftp.freedesktop.org/pub/$pkgbase/$pkgver/${pkgbase^}Lib-$pkgver.tar.bz2 -) -sha512sums=( - 878dc8e3f87aa4ad8d96599a87c733c15b725251c797cdfa6d03fee3c2959fd81a07ac7363e7a8946cf597303398aa581356b46827e7ffa27b33971d39bd29a2 -) - -build() { - cd $srcdir/${pkgbase^}-$pkgver - - autoreconf -vfi - ./configure --prefix=/usr \ - --enable-opencl \ - --enable-gallium-llvm \ - --enable-r600-llvm-compiler \ - --with-clang-libdir=/usr/lib \ - --with-dri-drivers=i915,i965,nouveau,r200,radeon,swrast \ - --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast - make V=0 -} - -package() { - cd $srcdir/${pkgbase^}-$pkgver - make -C src/gallium/targets/opencl DESTDIR=$pkgdir install - install -m755 -d $pkgdir/usr/share/licenses/${pkgname%-libre} - bin/minstall docs/COPYING $pkgdir/usr/share/licenses/${pkgname%-libre} - bin/minstall docs/license.html $pkgdir/usr/share/licenses/${pkgname%-libre} -} diff --git a/libre/libclc-git/PKGBUILD b/libre/libclc-svn/PKGBUILD index 432751146..3b7034348 100644 --- a/libre/libclc-git/PKGBUILD +++ b/libre/libclc-svn/PKGBUILD @@ -1,28 +1,18 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> _pkgname=libclc -pkgname=$_pkgname-git +pkgname=$_pkgname-svn pkgver=$(LC_ALL=C date -u +%Y%m%d) pkgrel=1 -arch=( - mips64el - x86_64 - i686 -) -pkgdesc='Library requirements of the OpenCL C programming language.' -url=( - http://cgit.freedesktop.org/~tstellar/$_pkgname - http://libclc.llvm.org/ -) +arch=(mips64el x86_64 i686) +pkgdesc='Library requirements of the OpenCL C programming language' +url=http://libclc.llvm.org/ license=MIT -depends=clang -makedepends=( - git - python2 -) +depends=llvm-libs +makedepends=(clang python2 svn) provides=($_pkgname) conflicts=$_pkgname -source=git://people.freedesktop.org/~tstellar/$_pkgname.git +source=$_pkgname::svn+http://llvm.org/svn/llvm-project/libclc/trunk sha512sums=SKIP prepare() { 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/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD index 7746b91a1..24c52e954 100644 --- a/libre/linux-libre/PKGBUILD +++ b/libre/linux-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193503 2013-08-21 12:43:35Z tpowa $ +# $Id: PKGBUILD 193761 2013-08-30 11:11:43Z tpowa $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Maintainer: Thomas Baechler <thomas@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -10,10 +10,10 @@ pkgbase=linux-libre # Build stock -LIBRE kernel #pkgbase=linux-libre-custom # Build kernel with a different name _basekernel=3.10 -_sublevel=9 +_sublevel=10 pkgver=${_basekernel}.${_sublevel} pkgrel=1 -_lxopkgver=${_basekernel}.9 # nearly always the same as pkgver +_lxopkgver=${_basekernel}.10 # 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 '3.10.6-logitech-dj.patch' "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2") md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' - '312e4b4203d2e74201a14f1a9633482d' + '673ae6d60b4ce8acad930a06f9fe2e3f' '8ec987449e0e42a1c98d8ce92b9019c2' '8efbd1f17f37bdaa8649c8a63761bf07' 'e49ac236dfeef709f91a3d993ea7b62c' @@ -43,7 +43,7 @@ md5sums=('d562fd52580a3b6b18b6eeb5921d1d5c' 'f3def2cefdcbb954c21d8505d23cc83c' 'd50c1ac47394e9aec637002ef3392bd1' '3ff40ca684cfe719723e627e2cef7cea' - 'd2fb29339d9ec7978af71f80daa27a12') + '714134bcb52e243898036beacca2e7b7') if [ "$CARCH" != "mips64el" ]; then # don't use the Loongson-specific patches on non-mips64el arches. unset source[${#source[@]}-1] diff --git a/libre/linux-libre/config.i686.3.11 b/libre/linux-libre/config.i686.3.11 index 2e3c074e7..d8b8f5121 100644 --- a/libre/linux-libre/config.i686.3.11 +++ b/libre/linux-libre/config.i686.3.11 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.11.0-rc5 Kernel Configuration +# Linux/x86 3.11.0-rc7 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -2504,7 +2504,7 @@ CONFIG_WIL6210_ISR_COR=y CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m # CONFIG_ATH10K_DEBUG is not set -CONFIG_ATH10K_DEBUGFS=y +CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_TRACING is not set CONFIG_B43=m CONFIG_B43_BCMA=y diff --git a/libre/linux-libre/config.x86_64.3.11 b/libre/linux-libre/config.x86_64.3.11 index 3feff6b10..f64f29253 100644 --- a/libre/linux-libre/config.x86_64.3.11 +++ b/libre/linux-libre/config.x86_64.3.11 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 3.11.0-rc5 Kernel Configuration +# Linux/x86 3.11.0-rc7 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -2419,7 +2419,7 @@ CONFIG_WIL6210_ISR_COR=y CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m # CONFIG_ATH10K_DEBUG is not set -CONFIG_ATH10K_DEBUGFS=y +CONFIG_ATH10K_DEBUGFS=y # CONFIG_ATH10K_TRACING is not set CONFIG_B43=m CONFIG_B43_BCMA=y diff --git a/libre/lirc-libre/PKGBUILD b/libre/lirc-libre/PKGBUILD index a1c0ddbae..674e9440c 100644 --- a/libre/lirc-libre/PKGBUILD +++ b/libre/lirc-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 193472 2013-08-20 22:18:28Z tpowa $ +# $Id: PKGBUILD 193774 2013-08-30 20:49:03Z foutrelis $ # Maintainer: Paul Mattal <paul@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -6,7 +6,7 @@ _pkgbase=lirc pkgbase=lirc-libre pkgname=('lirc-libre' 'lirc-utils-libre') pkgver=0.9.0 -pkgrel=57 +pkgrel=58 epoch=1 _extramodules=extramodules-3.10-LIBRE arch=('i686' 'x86_64' 'mips64el') diff --git a/libre/mesa-libcl/PKGBUILD b/libre/mesa-libcl/PKGBUILD new file mode 100644 index 000000000..828e2bdb9 --- /dev/null +++ b/libre/mesa-libcl/PKGBUILD @@ -0,0 +1,52 @@ +# Maintainer: Márcio Silva <coadde@lavabit.com> + +pkgbase=mesa +_pkgname=libcl +pkgname=$pkgbase-$_pkgname +_pkgflag=libre +pkgver=9.2.0 +pkgrel=2 +pkgdesc='Mesa 3-D OpenCL library' +url=http://${pkgbase}3d.sourceforge.net +license=(MIT Khronos LGPL) +arch=(mips64el x86_64 i686) +depends=( + libclc + $pkgbase +) +optdepends='opencl-headers: headers necessary for OpenCL development' +makedepends=( + clang + dri2proto + glproto + imake + libxml2 + python2 +) +provides=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) +conflicts=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) +replaces=($_pkgname-$_pkgflag $_pkgname opencl-nvidia opencl-nvidia-304xx) +options=(!libtool) +source=ftp://ftp.freedesktop.org/pub/$pkgbase/${pkgver%.0}/${pkgbase^}Lib-$pkgver.tar.bz2 +sha512sums=26c4b41b7e1d5284b87e2997a14424c1ee0713e11fd9dd65932987832e43b96986ed5e88c06fad4616fc912ffb8e17a2314b282cbf38a2640d76c39724965910 + +build() { + cd $srcdir/${pkgbase^}-$pkgver + autoreconf -vfi + ./configure --prefix=/usr\ + --enable-opencl\ + --enable-gallium-llvm\ + --enable-r600-llvm-compiler\ + --with-clang-libdir=/usr/lib\ + --with-llvm-shared-libs\ + --with-gallium-drivers=i915,nouveau,r300,r600,radeonsi,svga,swrast + make V=0 +} + +package() { + cd $srcdir/${pkgbase^}-$pkgver + make -C src/gallium/targets/opencl DESTDIR=$pkgdir install + install -vdm755 $pkgdir/usr/share/licenses/$pkgname + install -vm644 docs/COPYING $pkgdir/usr/share/licenses/$pkgname + install -vm644 docs/license.html $pkgdir/usr/share/licenses/$pkgname/LICENSE +} diff --git a/community/midori-gtk3/PKGBUILD b/libre/midori-gtk3-libre/PKGBUILD index 58ec03246..868c578ab 100644 --- a/community/midori-gtk3/PKGBUILD +++ b/libre/midori-gtk3-libre/PKGBUILD @@ -1,21 +1,24 @@ -# $Id: PKGBUILD 95787 2013-08-16 19:42:18Z arodseth $ +# $Id: PKGBUILD 95784 2013-08-16 19:36:19Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> -pkgname=midori-gtk3 +_pkgname=midori-gtk3 +pkgname=midori-gtk3-libre pkgver=0.5.5 pkgrel=1 -pkgdesc='Lightweight web browser (GTK3)' +pkgdesc='Lightweight web browser (GTK3), without non-privacy search providers' arch=('x86_64' 'i686') url='http://www.midori-browser.org/' license=('LGPL2.1') install='midori.install' -conflicts=('midori') -provides=('midori') +replaces=$_pkgname +conflicts=('midori' "$_pkgname") +provides=('midori' "$_pkgname=$pkgver") depends=('libzeitgeist' 'webkitgtk' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique3' 'gcr') makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg') optdepends=('gst-plugins-base: HTML5 OGG videos support' @@ -23,11 +26,32 @@ optdepends=('gst-plugins-base: HTML5 OGG videos support' 'gst-libav: HTML5 H264 videos support' 'aria2: download utility') options=('!emptydirs') -source=("http://www.midori-browser.org/downloads/${pkgname/-gtk3}_${pkgver}_all_.tar.bz2") +source=("http://www.midori-browser.org/downloads/${_pkgname/-gtk3}_${pkgver}_all_.tar.bz2") sha256sums=('ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62') +prepare() { + cd "$srcdir/${_pkgname/-gtk3}-${pkgver}" + + # remove non-privacy search providers + sed -i 's|Duck Duck Go|DuckDuckGo HTML| + s|duckduckgo[.]com|duckduckgo.com/html| + \|Yahoo|d + \|name=Yahoo|d + \|text=Yahoo Web Search|d + \|uri=http://search[.]yahoo[.]com/search?p=|d + \|token=y|d + \|Google|d + \|name=Google|d + \|text=Web Search|d + \|uri=http://www[.]google[.]com/search?q=%s|d + \|token=g|d + \|Localize text or URL|d + \|translate[.]google[.]com/?q=|d + ' config/search +} + build() { - cd "$srcdir/${pkgname/-gtk3}-${pkgver}" + cd "$srcdir/${_pkgname/-gtk3}-${pkgver}" ./configure \ --prefix=/usr \ @@ -37,7 +61,7 @@ build() { } package() { - cd "$srcdir/${pkgname/-gtk3}-${pkgver}" + cd "$srcdir/${_pkgname/-gtk3}-${pkgver}" make DESTDIR="$pkgdir" install } diff --git a/community/midori-gtk3/midori.install b/libre/midori-gtk3-libre/midori.install index e6af79c5f..e6af79c5f 100644 --- a/community/midori-gtk3/midori.install +++ b/libre/midori-gtk3-libre/midori.install diff --git a/community/midori/PKGBUILD b/libre/midori-libre/PKGBUILD index 154e38359..c417c84b0 100644 --- a/community/midori/PKGBUILD +++ b/libre/midori-libre/PKGBUILD @@ -1,19 +1,24 @@ -# $Id: PKGBUILD 95662 2013-08-15 11:42:39Z arodseth $ +# $Id: PKGBUILD 95661 2013-08-15 11:42:31Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> # Contributor: Andreas Radke <andyrtr@archlinux.org> # Contributor: rabyte <rabyte.at.gmail.dot.com> # Contributor: Johannes Krampf <wuischke.at.amule.dot.org> # Contributor: Bartłomiej Piotrowski <barthalion@gmail.com> +# Maintainer (Parabola): André Silva <emulatorman@parabola.nu> -pkgname=midori +_pkgname=midori +pkgname=midori-libre pkgver=0.5.5 pkgrel=1 -pkgdesc='Lightweight web browser (GTK2)' +pkgdesc='Lightweight web browser (GTK2), without non-privacy search providers' arch=('x86_64' 'i686' 'mips64el') url='http://www.midori-browser.org/' license=('LGPL2.1') install='midori.install' +replaces=$_pkgname +conflicts=$_pkgname +provides=$_pkgname=$pkgver depends=('libzeitgeist' 'webkitgtk2' 'libnotify' 'libxss' 'hicolor-icon-theme' 'desktop-file-utils' 'libunique') makedepends=('bzr' 'python2' 'intltool' 'vala' 'librsvg') optdepends=('gstreamer0.10-base-plugins: HTML5 OGG videos support' @@ -21,18 +26,39 @@ optdepends=('gstreamer0.10-base-plugins: HTML5 OGG videos support' 'gstreamer0.10-ffmpeg: HTML5 H264 videos support' 'aria2: download utility') options=('!emptydirs') -source=("http://www.midori-browser.org/downloads/${pkgname}_${pkgver}_all_.tar.bz2") +source=("http://www.midori-browser.org/downloads/${_pkgname}_${pkgver}_all_.tar.bz2") sha256sums=('ca69382a285222a86028abebd73fed1976735883027ff0adc094b627789bbd62') +prepare() { + cd "$srcdir/${_pkgname/-gtk3}-${pkgver}" + + # remove non-privacy search providers + sed -i 's|Duck Duck Go|DuckDuckGo HTML| + s|duckduckgo[.]com|duckduckgo.com/html| + \|Yahoo|d + \|name=Yahoo|d + \|text=Yahoo Web Search|d + \|uri=http://search[.]yahoo[.]com/search?p=|d + \|token=y|d + \|Google|d + \|name=Google|d + \|text=Web Search|d + \|uri=http://www[.]google[.]com/search?q=%s|d + \|token=g|d + \|Localize text or URL|d + \|translate[.]google[.]com/?q=|d + ' config/search +} + build() { - cd "$srcdir/$pkgname-${pkgver}" + cd "$srcdir/$_pkgname-${pkgver}" ./configure --prefix=/usr make } package() { - cd "$srcdir/$pkgname-${pkgver}" + cd "$srcdir/$_pkgname-${pkgver}" make DESTDIR="$pkgdir" install } diff --git a/community/midori/midori.install b/libre/midori-libre/midori.install index e6af79c5f..e6af79c5f 100644 --- a/community/midori/midori.install +++ b/libre/midori-libre/midori.install diff --git a/libre/mozilla-searchplugins/PKGBUILD b/libre/mozilla-searchplugins/PKGBUILD index 6721ff845..2405ac889 100644 --- a/libre/mozilla-searchplugins/PKGBUILD +++ b/libre/mozilla-searchplugins/PKGBUILD @@ -10,7 +10,7 @@ pkgname=mozilla-searchplugins pkgver=1.4 -pkgrel=1 +pkgrel=2 pkgdesc="System-wide OpenSearch plugins common for Mozilla based browsers." arch=('any') license=('MPL' 'GPL' 'LGPL') @@ -21,7 +21,7 @@ source=( internet-archive.xml parabola-packages.xml::https://parabolagnulinux.org/opensearch/packages/ parabola-wiki-en.xml:: - seeks-search.xml::http://seeks.zat.im/opensearch.xml + seeks-search.xml::http://www.seeks.fr/opensearch.xml # yacy.xml::http://search.ipredator.se/opensearchdescription.xml yacy.xml wikipedia-en.xml::https://en.wikipedia.org/w/opensearch_desc.php @@ -37,6 +37,6 @@ md5sums=('b4cc6bd8353af36ade441916217619e4' '462c68585461f8cdc23c93c46f6ee4cf' '92f834a3a1d85c9ae202955cdfe941eb' 'b9a0893d7f6d41d755c478fd60c44be8' - '76df72680069a41a476539213a569302' + 'dc6c76acf4c68a40710383513d72fa8b' '0f6cb4119f54e90d678827e2928474d4' 'dbdd9b61e89d73cc3a70cbe20a1160e1') diff --git a/libre/mplayer-libre/PKGBUILD b/libre/mplayer-libre/PKGBUILD index 36bf2f4ff..a5bda5d85 100644 --- a/libre/mplayer-libre/PKGBUILD +++ b/libre/mplayer-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 191803 2013-07-30 21:46:38Z bpiotrowski $ +# $Id: PKGBUILD 193127 2013-08-17 00:43:52Z eric $ # Maintainer : Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -8,7 +8,7 @@ _pkgbase=mplayer pkgbase=mplayer-libre pkgname=('mplayer-libre' 'mencoder-libre') pkgver=36285 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64') makedepends=('libxxf86dga' 'libxxf86vm' 'libmad' 'libxinerama' 'sdl' 'lame' 'libtheora' 'xvidcore' 'libmng' 'libxss' 'libgl' 'smbclient' 'aalib' 'jack' 'libcaca' 'x264' 'faad2' 'lirc-utils' 'libxvmc' 'enca' 'libvdpau' 'opencore-amr' 'libdca' 'a52dec' 'schroedinger' 'libvpx' diff --git a/libre/mplayer-vaapi-libre/PKGBUILD b/libre/mplayer-vaapi-libre/PKGBUILD index 9923b356b..71d158d17 100644 --- a/libre/mplayer-vaapi-libre/PKGBUILD +++ b/libre/mplayer-vaapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 94736 2013-07-29 18:51:32Z foutrelis $ +# $Id: PKGBUILD 95856 2013-08-17 15:21:03Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Hugo Doria <hugo@archlinux.org> @@ -9,7 +9,7 @@ _pkgname=mplayer-vaapi pkgname=mplayer-vaapi-libre pkgver=36265 -pkgrel=3 +pkgrel=4 pkgdesc="A movie player, compiled with vaapi support, without nonfree faac support" arch=('i686' 'x86_64') url="http://gitorious.org/vaapi/mplayer" 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/community/netsurf/netsurf.install b/libre/netsurf-libre/netsurf.install index ef816a666..98f3ea190 100644 --- a/community/netsurf/netsurf.install +++ b/libre/netsurf-libre/netsurf.install @@ -1,5 +1,5 @@ post_upgrade() { - gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor + #gtk-update-icon-cache -q -f -t /usr/share/icons/hicolor update-desktop-database -q } diff --git a/libre/qupzilla-libre/PKGBUILD b/libre/qupzilla-libre/PKGBUILD index 75945986a..ba0a64ed1 100644 --- a/libre/qupzilla-libre/PKGBUILD +++ b/libre/qupzilla-libre/PKGBUILD @@ -1,13 +1,13 @@ -# $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 -pkgdesc="Cross-platform QtWebKit browser, with DuckDuckGo HTML support" +pkgver=1.4.4 +pkgrel=1.1 +pkgdesc="Cross-platform QtWebKit browser, without non-privacy search providers" arch=(i686 x86_64 mips64el) url="http://www.qupzilla.com/" license=('GPL3') @@ -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/libre/tomoyo-tools-libre/PKGBUILD b/libre/tomoyo-tools-libre/PKGBUILD index 02a181b55..c3f65109b 100644 --- a/libre/tomoyo-tools-libre/PKGBUILD +++ b/libre/tomoyo-tools-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 92638 2013-06-10 09:53:54Z spupykin $ +# $Id: PKGBUILD 96508 2013-08-30 20:31:24Z foutrelis $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jamie Nguyen <jamie AT tomoyolinux.co.uk> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> @@ -9,7 +9,7 @@ _basever=2.5.0 _timestamp=20130406 _file=53357 pkgver=${_basever}.${_timestamp} -pkgrel=1 +pkgrel=2 pkgdesc='TOMOYO Linux userspace tools for Linux kernels >=3.2 (built for the linux-libre kernel package)' arch=('i686' 'x86_64' 'mips64el') url='http://tomoyo.sourceforge.jp' diff --git a/libre/tp_smapi-libre/PKGBUILD b/libre/tp_smapi-libre/PKGBUILD index 11faf618b..68eb042d1 100644 --- a/libre/tp_smapi-libre/PKGBUILD +++ b/libre/tp_smapi-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96173 2013-08-20 22:21:57Z tpowa $ +# $Id: PKGBUILD 96510 2013-08-30 20:31:38Z foutrelis $ # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de> # Contributor: xduugu # Contributor: nh2 @@ -12,7 +12,7 @@ _pkgname=tp_smapi pkgname=tp_smapi-libre pkgver=0.41 -pkgrel=32 +pkgrel=33 pkgdesc="Modules for ThinkPad's SMAPI functionality (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url='https://github.com/evgeni/tp_smapi' diff --git a/libre/vhba-module-libre/PKGBUILD b/libre/vhba-module-libre/PKGBUILD index b26b45dd1..83e133736 100644 --- a/libre/vhba-module-libre/PKGBUILD +++ b/libre/vhba-module-libre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 96175 2013-08-20 22:22:25Z tpowa $ +# $Id: PKGBUILD 96512 2013-08-30 20:31:50Z foutrelis $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Mateusz Herych <heniekk@gmail.com> # Contributor: Charles Lindsay <charles@chaoslizard.org> @@ -8,7 +8,7 @@ _pkgname=vhba-module pkgname=vhba-module-libre pkgver=20130607 _extramodules=extramodules-3.10-LIBRE -pkgrel=11 +pkgrel=12 pkgdesc="Kernel module that emulates SCSI devices (built for the linux-libre kernel package)" arch=('i686' 'x86_64' 'mips64el') url="http://cdemu.sourceforge.net/" diff --git a/libre/your-freedom_emu/PKGBUILD b/libre/your-freedom_emu/PKGBUILD new file mode 100644 index 000000000..30ace4a38 --- /dev/null +++ b/libre/your-freedom_emu/PKGBUILD @@ -0,0 +1,24 @@ +# Maintainer: Parabola Project <dev@list.parabolagnulinux.org> +pkgname=your-freedom_emu +pkgver=$(LC_ALL=C date -u +%Y%m%d) +pkgrel=1 +pkgdesc="This package removes hardware emulators that emulate technically free games and/or OS (but only there are nonfree games and/or OS)." +arch=('any') +url="https://parabolagnulinux.org" +license=('GPL3') +install=${pkgname}.install +source=(${pkgname}-blacklist-${pkgver}.txt::https://projects.parabolagnulinux.org/blacklist.git/plain/${pkgname}-blacklist.txt) + +package() { + conflicts=($(cut -d: -f1,2 ${pkgname}-blacklist-${pkgver}.txt | \ + sed "s/:$//" | \ + grep -v ":" | \ + grep -v '^#' | \ + sort -u + )) + cd ${srcdir} + install -d ${pkgdir}/usr/share/doc/${pkgname} + install -m644 ${pkgname}-blacklist-${pkgver}.txt ${pkgdir}/usr/share/doc/${pkgname}/ +} + +md5sums=('d3c2fad6dd774c5234d42d4953d09611') diff --git a/libre/your-freedom_emu/your-freedom_emu.install b/libre/your-freedom_emu/your-freedom_emu.install new file mode 100644 index 000000000..cd39eb3e8 --- /dev/null +++ b/libre/your-freedom_emu/your-freedom_emu.install @@ -0,0 +1,27 @@ + +pre_install() { + cat <<EOM + == IMPORTANT NOTICE == + + This package will help you identify emulator packages that are installed + on your system at the time of its installation, as well as protecting + you from (accidentally) installing them. + + Also, if any other emulator package is identified, later updates will ask + you for its removal. + + Have in mind that, if you want to retain certain emulator packages + installed on your system, you'll have to remove your-freedom_emu :) + + Please report back to the Parabola Project on the usual channels: + * https://labs.parabola.nu + * irc://freenode.net/#parabola + * mailto:dev@lists.parabolagnulinux.org +EOM +} + +pre_upgrade() { + pre_install +} + +# vim:set ts=2 sw=2 et: 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/nonprism/pidgin-nonprism/PKGBUILD b/nonprism/pidgin-nonprism/PKGBUILD new file mode 100644 index 000000000..ccf2a9af6 --- /dev/null +++ b/nonprism/pidgin-nonprism/PKGBUILD @@ -0,0 +1,131 @@ +# $Id: PKGBUILD 185869 2013-05-19 16:42:53Z foutrelis $ +# Maintainer: Evangelos Foutras <evangelos@foutrelis.com> +# Contributor: Ionut Biru <ibiru@archlinux.org> +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Alexander Fehr <pizzapunk gmail com> +# Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> + +_pkgname=pidgin +pkgname=('pidgin-nonprism' 'libpurple-nonprism' 'finch-nonprism') +pkgver=2.10.7 +pkgrel=4 +arch=('i686' 'x86_64' 'mips64el') +url="http://pidgin.im/" +license=('GPL') +makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' + 'libidn' 'python2' 'hicolor-icon-theme' 'farstream-0.1' 'avahi' + 'tk' 'ca-certificates' 'intltool' 'networkmanager') +options=('!libtool') +source=(http://downloads.sourceforge.net/$_pkgname/$_pkgname-$pkgver.tar.bz2 + pidgin-2.10.7-link-libirc-to-libsasl2.patch nonprism.patch) +sha256sums=('eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192' + '063723d5dc5726c43137b4b383c9d07c2c008391f6a626faaf6cedd31a2f1e8f' + '54c185493f7139768e316b989a5d23aa9d46662bf69026a92efbf69ad7d00973') + +prepare() { + cd "$srcdir/$_pkgname-$pkgver" + msg 'remove nonfree services' + patch -Np1 -i $srcdir/nonprism.patch + #rm -vrf libpurple/protocols/{gg,jabber/google,msn,mxit,myspace,novell,oscar,yahoo} + #rm -v pidgin/pixmaps/protocols/16/{aim,facebook,gadu-gadu,google-talk,icq,msn,mxit,myspace,novell,yahoo}.png + #rm -v pidgin/pixmaps/protocols/16/scalable/{aim,gadu-gadu,icq,msn,novell,yahoo}.svg + #rm -v pidgin/pixmaps/protocols/22/{aim,facebook,gadu-gadu,google-talk,icq,msn,mxit,myspace,novell,yahoo}.png + #rm -v pidgin/pixmaps/protocols/22/scalable/{aim,gadu-gadu,icq,msn,novell,yahoo}.svg + #rm -v pidgin/pixmaps/protocols/48/{aim,facebook,gadu-gadu,icq,msn,mxit,myspace,novell,yahoo}.png + #rm -v pidgin/pixmaps/protocols/scalable/{aim,gadu-gadu,google-talk,icq,msn,mxit,novell,yahoo}.svg + msg 'remove wrong OS term' + sed -i 's|on Linux|on GNU/Linux|' libpurple/valgrind.h + sed -i 's|On Linux|On GNU/Linux|' libpurple/connection.h +} + +build() { + cd "$srcdir/$_pkgname-$pkgver" + + # https://developer.pidgin.im/ticket/15517 + patch -Np1 -i "$srcdir/pidgin-2.10.7-link-libirc-to-libsasl2.patch" + autoreconf -vi + + # Use Python 2 + sed -i 's/env python$/&2/' */plugins/*.py \ + libpurple/purple-{remote,notifications-example,url-handler} + + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-schemas-install \ + --disable-meanwhile \ + --disable-gnutls \ + --enable-cyrus-sasl \ + --disable-doxygen \ + --enable-nm \ + --with-python=/usr/bin/python2 \ + --with-system-ssl-certs=/etc/ssl/certs + make +} + +package_pidgin-nonprism(){ + pkgdesc="Multi-protocol instant messaging client" + depends=('libpurple' 'startup-notification' 'gtkspell' 'libxss' 'libsm' + 'hicolor-icon-theme') + optdepends=('aspell: for spelling correction') + provides=("$_pkgname=$pkgver") + conflicts=$_pkgname + replaces=$_pkgname + install=pidgin.install + + cd "$srcdir/pidgin-$pkgver" + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C pidgin DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + install -Dm644 pidgin.desktop "$pkgdir"/usr/share/applications/pidgin.desktop + + rm "$pkgdir/usr/share/man/man1/finch.1" +} + +package_libpurple-nonprism(){ + pkgdesc="IM library extracted from Pidgin" + depends=('farstream-0.1' 'libsasl' 'libidn' 'dbus-glib' 'nss') + optdepends=('avahi: Bonjour protocol support' + 'ca-certificates: SSL CA certificates' + 'python2-dbus: for purple-remote and purple-url-handler' + 'tk: Tcl/Tk scripting support') + provides=("${pkgname%-nonprism}=$pkgver") + conflicts=${pkgname%-nonprism} + replaces=${pkgname%-nonprism} + + cd "$srcdir/pidgin-$pkgver" + + for _dir in libpurple share/sounds share/ca-certs m4macros po; do + make -C "$_dir" DESTDIR="$pkgdir" install + done +} + +package_finch-nonprism(){ + pkgdesc="A ncurses-based messaging client" + depends=("libpurple=$pkgver-$pkgrel" 'libx11' 'python2') + provides=("${pkgname%-nonprism}=$pkgver") + conflicts=${pkgname%-nonprism} + replaces=${pkgname%-nonprism} + + cd "$srcdir/pidgin-$pkgver" + + # For linking + make -C libpurple DESTDIR="$pkgdir" install-libLTLIBRARIES + + make -C finch DESTDIR="$pkgdir" install + make -C doc DESTDIR="$pkgdir" install + + # Remove files that are packaged in libpurle + make -C libpurple DESTDIR="$pkgdir" uninstall-libLTLIBRARIES + + rm "$pkgdir"/usr/share/man/man1/pidgin.1 +} + +# vim:set ts=2 sw=2 et: diff --git a/nonprism/pidgin-nonprism/nonprism-b.patch b/nonprism/pidgin-nonprism/nonprism-b.patch new file mode 100644 index 000000000..8e64b73d5 --- /dev/null +++ b/nonprism/pidgin-nonprism/nonprism-b.patch @@ -0,0 +1,5623 @@ +diff -Nur pidgin-2.10.7/config.h.in pidgin-2.10.7-nonprism/config.h.in +--- pidgin-2.10.7/config.h.in 2013-02-11 07:17:16.000000000 -0200 ++++ pidgin-2.10.7-nonprism/config.h.in 2013-08-16 22:16:16.833531712 -0300 +@@ -151,9 +151,6 @@ + /* Define to 1 if you have the `db' library (-ldb). */ + #undef HAVE_LIBDB + +-/* Define to 1 if you have libgadu. */ +-#undef HAVE_LIBGADU +- + /* Define to 1 if you have the `nsl' library (-lnsl). */ + #undef HAVE_LIBNSL + +diff -Nur pidgin-2.10.7/configure pidgin-2.10.7-nonprism/configure +--- pidgin-2.10.7/configure 2013-02-11 07:17:26.000000000 -0200 ++++ pidgin-2.10.7-nonprism/configure 2013-08-27 16:47:16.890662082 -0300 +@@ -716,45 +716,23 @@ + STATIC_LINK_LIBS + STATIC_ZEPHYR_FALSE + STATIC_ZEPHYR_TRUE +-STATIC_YAHOO_FALSE +-STATIC_YAHOO_TRUE + STATIC_SIMPLE_FALSE + STATIC_SIMPLE_TRUE + STATIC_SILC_FALSE + STATIC_SILC_TRUE +-STATIC_SAMETIME_FALSE +-STATIC_SAMETIME_TRUE +-STATIC_OSCAR_FALSE +-STATIC_OSCAR_TRUE +-STATIC_NOVELL_FALSE +-STATIC_NOVELL_TRUE +-STATIC_MXIT_FALSE +-STATIC_MXIT_TRUE +-STATIC_MYSPACE_FALSE +-STATIC_MYSPACE_TRUE +-STATIC_MSN_FALSE +-STATIC_MSN_TRUE + STATIC_JABBER_FALSE + STATIC_JABBER_TRUE + STATIC_IRC_FALSE + STATIC_IRC_TRUE +-STATIC_GG_FALSE +-STATIC_GG_TRUE + STATIC_BONJOUR_FALSE + STATIC_BONJOUR_TRUE + STATIC_PRPLS + DISTRIB_FALSE + DISTRIB_TRUE +-USE_INTERNAL_LIBGADU_FALSE +-USE_INTERNAL_LIBGADU_TRUE +-GADU_LIBS +-GADU_CFLAGS + SILC_LIBS + SILC_CFLAGS + AVAHI_LIBS + AVAHI_CFLAGS +-MEANWHILE_LIBS +-MEANWHILE_CFLAGS + IDN_LIBS + IDN_CFLAGS + USE_VV_FALSE +@@ -1021,14 +999,11 @@ + enable_farstream + enable_vv + enable_idn +-enable_meanwhile + enable_avahi + with_avahi_client_includes + with_avahi_client_libs + with_silc_includes + with_silc_libs +-with_gadu_includes +-with_gadu_libs + enable_distrib + with_static_prpls + with_dynamic_prpls +@@ -1100,14 +1075,10 @@ + FARSTREAM_LIBS + IDN_CFLAGS + IDN_LIBS +-MEANWHILE_CFLAGS +-MEANWHILE_LIBS + AVAHI_CFLAGS + AVAHI_LIBS + SILC_CFLAGS + SILC_LIBS +-GADU_CFLAGS +-GADU_LIBS + DBUS_CFLAGS + DBUS_LIBS + NETWORKMANAGER_CFLAGS +@@ -1773,8 +1744,6 @@ + --disable-farstream compile without farstream support + --disable-vv compile without voice and video support + --disable-idn compile without IDN support +- --disable-meanwhile compile without meanwhile (required for Sametime +- support) + --disable-avahi compile without avahi (required for Bonjour support) + + --disable-plugins compile without plugin support +@@ -1826,9 +1795,6 @@ + --with-silc-includes=DIR + compile the SILC plugin against includes in DIR + --with-silc-libs=DIR compile the SILC plugin against the SILC libs in DIR +- --with-gadu-includes=DIR +- compile the Gadu-Gadu plugin against includes in DIR +- --with-gadu-libs=DIR compile the Gadu-Gadu plugin against the libs in DIR + --with-static-prpls Link to certain protocols statically + --with-dynamic-prpls specify which protocols to build dynamically + --with-krb4=PREFIX compile Zephyr plugin with Kerberos 4 support +@@ -1905,17 +1871,11 @@ + linker flags for FARSTREAM, overriding pkg-config + IDN_CFLAGS C compiler flags for IDN, overriding pkg-config + IDN_LIBS linker flags for IDN, overriding pkg-config +- MEANWHILE_CFLAGS +- C compiler flags for MEANWHILE, overriding pkg-config +- MEANWHILE_LIBS +- linker flags for MEANWHILE, overriding pkg-config + AVAHI_CFLAGS + C compiler flags for AVAHI, overriding pkg-config + AVAHI_LIBS linker flags for AVAHI, overriding pkg-config + SILC_CFLAGS C compiler flags for SILC, overriding pkg-config + SILC_LIBS linker flags for SILC, overriding pkg-config +- GADU_CFLAGS C compiler flags for GADU, overriding pkg-config +- GADU_LIBS linker flags for GADU, overriding pkg-config + DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config + DBUS_LIBS linker flags for DBUS, overriding pkg-config + NETWORKMANAGER_CFLAGS +@@ -18487,105 +18447,6 @@ + fi + fi + +-# Check whether --enable-meanwhile was given. +-if test "${enable_meanwhile+set}" = set; then : +- enableval=$enable_meanwhile; enable_meanwhile="$enableval" +-else +- enable_meanwhile="yes" +-fi +- +-if test "x$enable_meanwhile" = "xyes"; then +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEANWHILE" >&5 +-$as_echo_n "checking for MEANWHILE... " >&6; } +- +-if test -n "$MEANWHILE_CFLAGS"; then +- pkg_cv_MEANWHILE_CFLAGS="$MEANWHILE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$MEANWHILE_LIBS"; then +- pkg_cv_MEANWHILE_LIBS="$MEANWHILE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1` +- else +- MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$MEANWHILE_PKG_ERRORS" >&5 +- +- +- have_meanwhile="no" +- if test "x$force_deps" = "xyes" ; then +- as_fn_error $? " +-Meanwhile development headers not found. +-Use --disable-meanwhile if you do not need meanwhile (Sametime) support. +-" "$LINENO" 5 +- fi +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +- have_meanwhile="no" +- if test "x$force_deps" = "xyes" ; then +- as_fn_error $? " +-Meanwhile development headers not found. +-Use --disable-meanwhile if you do not need meanwhile (Sametime) support. +-" "$LINENO" 5 +- fi +-else +- MEANWHILE_CFLAGS=$pkg_cv_MEANWHILE_CFLAGS +- MEANWHILE_LIBS=$pkg_cv_MEANWHILE_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +- have_meanwhile="yes" +- +-fi +-fi +- +- +- + # Check whether --enable-avahi was given. + if test "${enable_avahi+set}" = set; then : + enableval=$enable_avahi; enable_avahi="$enableval" +@@ -19207,267 +19068,6 @@ + fi + + +-# Check whether --with-gadu-includes was given. +-if test "${with_gadu_includes+set}" = set; then : +- withval=$with_gadu_includes; ac_gadu_includes="$withval" +-else +- ac_gadu_includes="no" +-fi +- +- +-# Check whether --with-gadu-libs was given. +-if test "${with_gadu_libs+set}" = set; then : +- withval=$with_gadu_libs; ac_gadu_libs="$withval" +-else +- ac_gadu_libs="no" +-fi +- +-GADU_CFLAGS="" +-GADU_LIBS="" +-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then +- gadu_manual_check="yes" +-else +- gadu_manual_check="no" +-fi +-if test "x$gadu_manual_check" = "xno"; then +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GADU" >&5 +-$as_echo_n "checking for GADU... " >&6; } +- +-if test -n "$GADU_CFLAGS"; then +- pkg_cv_GADU_CFLAGS="$GADU_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GADU_CFLAGS=`$PKG_CONFIG --cflags "libgadu >= 1.11.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GADU_LIBS"; then +- pkg_cv_GADU_LIBS="$GADU_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GADU_LIBS=`$PKG_CONFIG --libs "libgadu >= 1.11.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GADU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1` +- else +- GADU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GADU_PKG_ERRORS" >&5 +- +- +- gadu_includes="no" +- +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +- gadu_includes="no" +- +-else +- GADU_CFLAGS=$pkg_cv_GADU_CFLAGS +- GADU_LIBS=$pkg_cv_GADU_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +- gadu_includes="yes" +- gadu_libs="yes" +- +-fi +-else +- if test "$ac_gadu_includes" != "no"; then +- GADU_CFLAGS="-I$ac_gadu_includes" +- fi +- CPPFLAGS_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" +- ac_fn_c_check_header_mongrel "$LINENO" "libgadu.h" "ac_cv_header_libgadu_h" "$ac_includes_default" +-if test "x$ac_cv_header_libgadu_h" = xyes; then : +- gadu_includes=yes +-fi +- +- +- CPPFLAGS="$CPPFLAGS_save" +- +- if test "$ac_gadu_libs" != "no"; then +- GADU_LIBS="-L$ac_gadu_libs" +- fi +- GADU_LIBS="$GADU_LIBS -lgadu" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gg_libgadu_version in -lgadu" >&5 +-$as_echo_n "checking for gg_libgadu_version in -lgadu... " >&6; } +-if ${ac_cv_lib_gadu_gg_libgadu_version+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgadu $GADU_LIBS $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char gg_libgadu_version (); +-int +-main () +-{ +-return gg_libgadu_version (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_gadu_gg_libgadu_version=yes +-else +- ac_cv_lib_gadu_gg_libgadu_version=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gadu_gg_libgadu_version" >&5 +-$as_echo "$ac_cv_lib_gadu_gg_libgadu_version" >&6; } +-if test "x$ac_cv_lib_gadu_gg_libgadu_version" = xyes; then : +- gadu_libs=yes +-fi +- +-fi +-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'` +- +-if test "x$gadu_libs" = "xyes"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgadu GPL compatibility" >&5 +-$as_echo_n "checking for libgadu GPL compatibility... " >&6; } +- CPPFLAGS_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <libgadu.h> +-int +-main () +-{ +- +-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL) +-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support." +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <libgadu.h> +-int +-main () +-{ +- +-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e +-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher." +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define HAVE_LIBGADU 1" >>confdefs.h +- +- +-else +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- echo +- echo +- echo "Your supplied copy of libgadu is too old." +- echo "Install version 1.11.0 or newer." +- echo "Then rerun this ./configure" +- echo +- echo "Falling back to using our own copy of libgadu" +- echo +- GADU_LIBS="" +- GADU_CFLAGS="" +- gadu_libs=no +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-else +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- echo +- echo +- echo "libgadu is not compatible with the GPL when compiled with OpenSSL support." +- echo "To compile against system libgadu, please recompile libgadu using:" +- echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared" +- echo "Then rerun this ./configure" +- echo +- echo "Falling back to using our own copy of libgadu" +- echo +- GADU_LIBS="" +- GADU_CFLAGS="" +- gadu_libs=no +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CPPFLAGS="$CPPFLAGS_save" +-fi +- +- if test "x$gadu_libs" != "xyes"; then +- USE_INTERNAL_LIBGADU_TRUE= +- USE_INTERNAL_LIBGADU_FALSE='#' +-else +- USE_INTERNAL_LIBGADU_TRUE='#' +- USE_INTERNAL_LIBGADU_FALSE= +-fi +- +- +-if test "x$gadu_libs" = "x"; then +- gadu_libs=no +-fi +- + + + +@@ -19500,10 +19100,7 @@ + fi + + if test "x$STATIC_PRPLS" = "xall" ; then +- STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" +-fi +-if test "x$have_meanwhile" != "xyes" ; then +- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` ++ STATIC_PRPLS="bonjour irc jabber silc simple zephyr" + fi + if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then + STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` +@@ -19519,46 +19116,22 @@ + extern_init= + load_proto= + for i in $STATIC_PRPLS ; do +- if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la" +- extern_init="$extern_init extern gboolean purple_init_aim_plugin();" +- extern_init="$extern_init extern gboolean purple_init_icq_plugin();" +- load_proto="$load_proto purple_init_aim_plugin();" +- load_proto="$load_proto purple_init_icq_plugin();" +- elif test "x$i" = "xyahoo"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la" +- extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();" +- extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();" +- load_proto="$load_proto purple_init_yahoo_plugin();" +- load_proto="$load_proto purple_init_yahoojp_plugin();" ++ if test "x$i" = "xsilc"; then ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" ++ elif test "x$i" = "xsilc10"; then ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la" + else +- if test "x$i" = "xsilc"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" +- elif test "x$i" = "xsilc10"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la" +- else +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" +- fi +- extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" +- load_proto="$load_proto purple_init_${i}_plugin();" ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" + fi ++ extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" ++ load_proto="$load_proto purple_init_${i}_plugin();" + case $i in + bonjour) static_bonjour=yes ;; +- gg) static_gg=yes ;; + irc) static_irc=yes ;; + jabber) static_jabber=yes ;; +- msn) static_msn=yes ;; +- myspace) static_myspace=yes ;; +- mxit) static_mxit=yes ;; +- novell) static_novell=yes ;; +- oscar) static_oscar=yes ;; +- aim) static_oscar=yes ;; +- icq) static_oscar=yes ;; +- sametime) static_sametime=yes ;; + silc) static_silc=yes ;; + silc10) static_silc=yes ;; + simple) static_simple=yes ;; +- yahoo) static_yahoo=yes ;; + zephyr) static_zephyr=yes ;; + *) echo "Invalid static protocol $i!!" ; exit 1 ;; + esac +@@ -19571,14 +19144,6 @@ + STATIC_BONJOUR_FALSE= + fi + +- if test "x$static_gg" = "xyes"; then +- STATIC_GG_TRUE= +- STATIC_GG_FALSE='#' +-else +- STATIC_GG_TRUE='#' +- STATIC_GG_FALSE= +-fi +- + if test "x$static_irc" = "xyes"; then + STATIC_IRC_TRUE= + STATIC_IRC_FALSE='#' +@@ -19595,54 +19160,6 @@ + STATIC_JABBER_FALSE= + fi + +- if test "x$static_msn" = "xyes"; then +- STATIC_MSN_TRUE= +- STATIC_MSN_FALSE='#' +-else +- STATIC_MSN_TRUE='#' +- STATIC_MSN_FALSE= +-fi +- +- if test "x$static_myspace" = "xyes"; then +- STATIC_MYSPACE_TRUE= +- STATIC_MYSPACE_FALSE='#' +-else +- STATIC_MYSPACE_TRUE='#' +- STATIC_MYSPACE_FALSE= +-fi +- +- if test "x$static_mxit" = "xyes"; then +- STATIC_MXIT_TRUE= +- STATIC_MXIT_FALSE='#' +-else +- STATIC_MXIT_TRUE='#' +- STATIC_MXIT_FALSE= +-fi +- +- if test "x$static_novell" = "xyes"; then +- STATIC_NOVELL_TRUE= +- STATIC_NOVELL_FALSE='#' +-else +- STATIC_NOVELL_TRUE='#' +- STATIC_NOVELL_FALSE= +-fi +- +- if test "x$static_oscar" = "xyes"; then +- STATIC_OSCAR_TRUE= +- STATIC_OSCAR_FALSE='#' +-else +- STATIC_OSCAR_TRUE='#' +- STATIC_OSCAR_FALSE= +-fi +- +- if test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes"; then +- STATIC_SAMETIME_TRUE= +- STATIC_SAMETIME_FALSE='#' +-else +- STATIC_SAMETIME_TRUE='#' +- STATIC_SAMETIME_FALSE= +-fi +- + if test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes"; then + STATIC_SILC_TRUE= + STATIC_SILC_FALSE='#' +@@ -19659,14 +19176,6 @@ + STATIC_SIMPLE_FALSE= + fi + +- if test "x$static_yahoo" = "xyes"; then +- STATIC_YAHOO_TRUE= +- STATIC_YAHOO_FALSE='#' +-else +- STATIC_YAHOO_TRUE='#' +- STATIC_YAHOO_FALSE= +-fi +- + if test "x$static_zephyr" = "xyes"; then + STATIC_ZEPHYR_TRUE= + STATIC_ZEPHYR_FALSE='#' +@@ -19689,10 +19198,7 @@ + fi + + if test "x$DYNAMIC_PRPLS" = "xall" ; then +- DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" +-fi +-if test "x$have_meanwhile" != "xyes"; then +- DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` ++ DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr" + fi + if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then + DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` +@@ -19707,22 +19213,12 @@ + for i in $DYNAMIC_PRPLS ; do + case $i in + bonjour) dynamic_bonjour=yes ;; +- gg) dynamic_gg=yes ;; + irc) dynamic_irc=yes ;; + jabber) dynamic_jabber=yes ;; +- msn) dynamic_msn=yes ;; +- myspace) dynamic_myspace=yes ;; +- mxit) dynamic_mxit=yes ;; +- novell) dynamic_novell=yes ;; + null) dynamic_null=yes ;; +- oscar) dynamic_oscar=yes ;; +- aim) dynamic_oscar=yes ;; +- icq) dynamic_oscar=yes ;; +- sametime) dynamic_sametime=yes ;; + silc) dynamic_silc=yes ;; + silc10) dynamic_silc=yes ;; + simple) dynamic_simple=yes ;; +- yahoo) dynamic_yahoo=yes ;; + zephyr) dynamic_zephyr=yes ;; + *) echo "Invalid dynamic protocol $i!!" ; exit 1 ;; + esac +@@ -21001,7 +20497,7 @@ + fi + + +-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!" ++msg_ssl="None." + looked_for_gnutls="no" + if test "x$enable_gnutls" != "xno"; then + enable_gnutls="no" +@@ -21871,19 +21367,17 @@ + as_fn_error $? " + Neither GnuTLS or NSS SSL development headers found. + Use --disable-nss --disable-gnutls if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable! ++ + " "$LINENO" 5 + elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then + as_fn_error $? " + GnuTLS SSL development headers not found. + Use --disable-gnutls if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support. + " "$LINENO" 5 + elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then + as_fn_error $? " + NSS SSL development headers not found. + Use --disable-nss if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support. + " "$LINENO" 5 + fi + +@@ -23176,7 +22670,7 @@ + fi + + +-ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/myspace/Makefile libpurple/protocols/mxit/Makefile libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec" ++ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/null/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -23344,10 +22838,6 @@ + as_fn_error $? "conditional \"USE_VV\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${USE_INTERNAL_LIBGADU_TRUE}" && test -z "${USE_INTERNAL_LIBGADU_FALSE}"; then +- as_fn_error $? "conditional \"USE_INTERNAL_LIBGADU\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi + if test -z "${DISTRIB_TRUE}" && test -z "${DISTRIB_FALSE}"; then + as_fn_error $? "conditional \"DISTRIB\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -23356,10 +22846,6 @@ + as_fn_error $? "conditional \"STATIC_BONJOUR\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${STATIC_GG_TRUE}" && test -z "${STATIC_GG_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_GG\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi + if test -z "${STATIC_IRC_TRUE}" && test -z "${STATIC_IRC_FALSE}"; then + as_fn_error $? "conditional \"STATIC_IRC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -23368,30 +22854,6 @@ + as_fn_error $? "conditional \"STATIC_JABBER\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${STATIC_MSN_TRUE}" && test -z "${STATIC_MSN_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_MSN\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${STATIC_MYSPACE_TRUE}" && test -z "${STATIC_MYSPACE_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_MYSPACE\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${STATIC_MXIT_TRUE}" && test -z "${STATIC_MXIT_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_MXIT\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${STATIC_NOVELL_TRUE}" && test -z "${STATIC_NOVELL_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_NOVELL\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${STATIC_OSCAR_TRUE}" && test -z "${STATIC_OSCAR_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_OSCAR\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${STATIC_SAMETIME_TRUE}" && test -z "${STATIC_SAMETIME_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_SAMETIME\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi + if test -z "${STATIC_SILC_TRUE}" && test -z "${STATIC_SILC_FALSE}"; then + as_fn_error $? "conditional \"STATIC_SILC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -23400,10 +22862,6 @@ + as_fn_error $? "conditional \"STATIC_SIMPLE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${STATIC_YAHOO_TRUE}" && test -z "${STATIC_YAHOO_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_YAHOO\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi + if test -z "${STATIC_ZEPHYR_TRUE}" && test -z "${STATIC_ZEPHYR_FALSE}"; then + as_fn_error $? "conditional \"STATIC_ZEPHYR\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -24425,20 +23883,12 @@ + "libpurple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/Makefile" ;; + "libpurple/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/Makefile" ;; + "libpurple/protocols/bonjour/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/bonjour/Makefile" ;; +- "libpurple/protocols/gg/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/gg/Makefile" ;; + "libpurple/protocols/irc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/irc/Makefile" ;; + "libpurple/protocols/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/jabber/Makefile" ;; +- "libpurple/protocols/msn/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/msn/Makefile" ;; +- "libpurple/protocols/myspace/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/myspace/Makefile" ;; +- "libpurple/protocols/mxit/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/mxit/Makefile" ;; +- "libpurple/protocols/novell/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/novell/Makefile" ;; + "libpurple/protocols/null/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/null/Makefile" ;; +- "libpurple/protocols/oscar/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/oscar/Makefile" ;; +- "libpurple/protocols/sametime/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/sametime/Makefile" ;; + "libpurple/protocols/silc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc/Makefile" ;; + "libpurple/protocols/silc10/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc10/Makefile" ;; + "libpurple/protocols/simple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/simple/Makefile" ;; +- "libpurple/protocols/yahoo/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/yahoo/Makefile" ;; + "libpurple/protocols/zephyr/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/zephyr/Makefile" ;; + "libpurple/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/tests/Makefile" ;; + "libpurple/purple.h") CONFIG_FILES="$CONFIG_FILES libpurple/purple.h" ;; +@@ -25863,7 +25313,6 @@ + echo Build with Cyrus SASL support. : $enable_cyrus_sasl + echo Use kerberos 4 with zephyr.... : $kerberos + echo Use external libzephyr........ : $zephyr +-echo Use external libgadu.......... : $gadu_libs + echo Install pixmaps............... : $enable_pixmaps + echo Old tray icon compatibility... : $enable_traycompat + echo Install translations.......... : $enable_i18n +diff -Nur pidgin-2.10.7/configure.ac pidgin-2.10.7-nonprism/configure.ac +--- pidgin-2.10.7/configure.ac 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/configure.ac 2013-08-16 23:44:41.800496326 -0300 +@@ -854,28 +854,6 @@ + fi + + dnl ####################################################################### +-dnl # Check for Meanwhile headers (for Sametime) +-dnl ####################################################################### +-AC_ARG_ENABLE(meanwhile, +- [AC_HELP_STRING([--disable-meanwhile], +- [compile without meanwhile (required for Sametime support)])], +- enable_meanwhile="$enableval", enable_meanwhile="yes") +-if test "x$enable_meanwhile" = "xyes"; then +- PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [ +- have_meanwhile="yes" +- ], [ +- have_meanwhile="no" +- if test "x$force_deps" = "xyes" ; then +- AC_MSG_ERROR([ +-Meanwhile development headers not found. +-Use --disable-meanwhile if you do not need meanwhile (Sametime) support. +-]) +- fi]) +-fi +-AC_SUBST(MEANWHILE_CFLAGS) +-AC_SUBST(MEANWHILE_LIBS) +- +-dnl ####################################################################### + dnl # Check for Native Avahi headers (for Bonjour) + dnl ####################################################################### + AC_ARG_ENABLE(avahi, +@@ -1020,100 +998,6 @@ + CPPFLAGS="$CPPFLAGS_save" + fi + +-dnl ####################################################################### +-dnl # Check for Gadu-Gadu client includes and libraries +-dnl ####################################################################### +-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"]) +-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"]) +-GADU_CFLAGS="" +-GADU_LIBS="" +-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then +- gadu_manual_check="yes" +-else +- gadu_manual_check="no" +-fi +-if test "x$gadu_manual_check" = "xno"; then +- PKG_CHECK_MODULES(GADU, [libgadu >= 1.11.0], [ +- gadu_includes="yes" +- gadu_libs="yes" +- ], [ +- gadu_includes="no" +- ]) +-else +- if test "$ac_gadu_includes" != "no"; then +- GADU_CFLAGS="-I$ac_gadu_includes" +- fi +- CPPFLAGS_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" +- AC_CHECK_HEADER(libgadu.h, [gadu_includes=yes]) +- CPPFLAGS="$CPPFLAGS_save" +- +- if test "$ac_gadu_libs" != "no"; then +- GADU_LIBS="-L$ac_gadu_libs" +- fi +- GADU_LIBS="$GADU_LIBS -lgadu" +- AC_CHECK_LIB(gadu, gg_libgadu_version, [gadu_libs=yes], , $GADU_LIBS) +-fi +-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'` +- +-if test "x$gadu_libs" = "xyes"; then +- AC_MSG_CHECKING(for libgadu GPL compatibility) +- CPPFLAGS_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[ +-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL) +-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support." +-#endif +- ]])], [ +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[ +-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e +-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher." +-#endif +- ]])], [ +- AC_MSG_RESULT(yes) +- AC_DEFINE([HAVE_LIBGADU], [1], +- [Define to 1 if you have libgadu.]) +- ], [ +- AC_MSG_RESULT(no) +- echo +- echo +- echo "Your supplied copy of libgadu is too old." +- echo "Install version 1.11.0 or newer." +- echo "Then rerun this ./configure" +- echo +- echo "Falling back to using our own copy of libgadu" +- echo +- GADU_LIBS="" +- GADU_CFLAGS="" +- gadu_libs=no +- ]) +- ], [ +- AC_MSG_RESULT(no) +- echo +- echo +- echo "libgadu is not compatible with the GPL when compiled with OpenSSL support." +- echo "To compile against system libgadu, please recompile libgadu using:" +- echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared" +- echo "Then rerun this ./configure" +- echo +- echo "Falling back to using our own copy of libgadu" +- echo +- GADU_LIBS="" +- GADU_CFLAGS="" +- gadu_libs=no +- ]) +- CPPFLAGS="$CPPFLAGS_save" +-fi +- +-AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes") +- +-if test "x$gadu_libs" = "x"; then +- gadu_libs=no +-fi +- +-AC_SUBST(GADU_LIBS) +-AC_SUBST(GADU_CFLAGS) +- + AC_ARG_ENABLE(distrib,,,enable_distrib=no) + AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes") + DYNAMIC_PRPLS=all +@@ -1123,10 +1007,7 @@ + fi + + if test "x$STATIC_PRPLS" = "xall" ; then +- STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" +-fi +-if test "x$have_meanwhile" != "xyes" ; then +- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` ++ STATIC_PRPLS="bonjour irc jabber silc simple zephyr" + fi + if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then + STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` +@@ -1143,64 +1024,31 @@ + load_proto= + for i in $STATIC_PRPLS ; do + dnl Ugly special case for "libsilcpurple.la": +- dnl ... and Ugly special case for multi-protocol oscar and yahoo +- if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la" +- extern_init="$extern_init extern gboolean purple_init_aim_plugin();" +- extern_init="$extern_init extern gboolean purple_init_icq_plugin();" +- load_proto="$load_proto purple_init_aim_plugin();" +- load_proto="$load_proto purple_init_icq_plugin();" +- elif test "x$i" = "xyahoo"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la" +- extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();" +- extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();" +- load_proto="$load_proto purple_init_yahoo_plugin();" +- load_proto="$load_proto purple_init_yahoojp_plugin();" ++ if test "x$i" = "xsilc"; then ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" ++ elif test "x$i" = "xsilc10"; then ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la" + else +- if test "x$i" = "xsilc"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" +- elif test "x$i" = "xsilc10"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la" +- else +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" +- fi +- extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" +- load_proto="$load_proto purple_init_${i}_plugin();" ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" + fi ++ extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" ++ load_proto="$load_proto purple_init_${i}_plugin();" + case $i in + bonjour) static_bonjour=yes ;; +- gg) static_gg=yes ;; + irc) static_irc=yes ;; + jabber) static_jabber=yes ;; +- msn) static_msn=yes ;; +- myspace) static_myspace=yes ;; +- mxit) static_mxit=yes ;; +- novell) static_novell=yes ;; +- oscar) static_oscar=yes ;; +- aim) static_oscar=yes ;; +- icq) static_oscar=yes ;; +- sametime) static_sametime=yes ;; + silc) static_silc=yes ;; + silc10) static_silc=yes ;; + simple) static_simple=yes ;; +- yahoo) static_yahoo=yes ;; + zephyr) static_zephyr=yes ;; + *) echo "Invalid static protocol $i!!" ; exit 1 ;; + esac + done + AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes") +-AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes") + AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") + AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") +-AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes") +-AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes") +-AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes") +-AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes") +-AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") +-AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") + AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes") + AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes") +-AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes") + AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes") + AC_SUBST(STATIC_LINK_LIBS) + AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto }, +@@ -1208,10 +1056,7 @@ + + AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) + if test "x$DYNAMIC_PRPLS" = "xall" ; then +- DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" +-fi +-if test "x$have_meanwhile" != "xyes"; then +- DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` ++ DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr" + fi + if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then + DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` +@@ -1226,22 +1071,12 @@ + for i in $DYNAMIC_PRPLS ; do + case $i in + bonjour) dynamic_bonjour=yes ;; +- gg) dynamic_gg=yes ;; + irc) dynamic_irc=yes ;; + jabber) dynamic_jabber=yes ;; +- msn) dynamic_msn=yes ;; +- myspace) dynamic_myspace=yes ;; +- mxit) dynamic_mxit=yes ;; +- novell) dynamic_novell=yes ;; + null) dynamic_null=yes ;; +- oscar) dynamic_oscar=yes ;; +- aim) dynamic_oscar=yes ;; +- icq) dynamic_oscar=yes ;; +- sametime) dynamic_sametime=yes ;; + silc) dynamic_silc=yes ;; + silc10) dynamic_silc=yes ;; + simple) dynamic_simple=yes ;; +- yahoo) dynamic_yahoo=yes ;; + zephyr) dynamic_zephyr=yes ;; + *) echo "Invalid dynamic protocol $i!!" ; exit 1 ;; + esac +@@ -1713,7 +1548,7 @@ + [enable_nss="$enableval"], + [enable_nss="yes"]) + +-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!" ++msg_ssl="None." + looked_for_gnutls="no" + dnl # + dnl # Check for GnuTLS if it's specified. +@@ -2124,19 +1959,16 @@ + AC_MSG_ERROR([ + Neither GnuTLS or NSS SSL development headers found. + Use --disable-nss --disable-gnutls if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable! + ]) + elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then + AC_MSG_ERROR([ + GnuTLS SSL development headers not found. + Use --disable-gnutls if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support. + ]) + elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then + AC_MSG_ERROR([ + NSS SSL development headers not found. + Use --disable-nss if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support. + ]) + fi + +@@ -2577,20 +2409,12 @@ + libpurple/Makefile + libpurple/protocols/Makefile + libpurple/protocols/bonjour/Makefile +- libpurple/protocols/gg/Makefile + libpurple/protocols/irc/Makefile + libpurple/protocols/jabber/Makefile +- libpurple/protocols/msn/Makefile +- libpurple/protocols/myspace/Makefile +- libpurple/protocols/mxit/Makefile +- libpurple/protocols/novell/Makefile + libpurple/protocols/null/Makefile +- libpurple/protocols/oscar/Makefile +- libpurple/protocols/sametime/Makefile + libpurple/protocols/silc/Makefile + libpurple/protocols/silc10/Makefile + libpurple/protocols/simple/Makefile +- libpurple/protocols/yahoo/Makefile + libpurple/protocols/zephyr/Makefile + libpurple/tests/Makefile + libpurple/purple.h +@@ -2635,7 +2459,6 @@ + echo Build with Cyrus SASL support. : $enable_cyrus_sasl + echo Use kerberos 4 with zephyr.... : $kerberos + echo Use external libzephyr........ : $zephyr +-echo Use external libgadu.......... : $gadu_libs + echo Install pixmaps............... : $enable_pixmaps + echo Old tray icon compatibility... : $enable_traycompat + echo Install translations.......... : $enable_i18n +diff -Nur pidgin-2.10.7/doc/finch.1.in pidgin-2.10.7-nonprism/doc/finch.1.in +--- pidgin-2.10.7/doc/finch.1.in 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/doc/finch.1.in 2013-08-16 21:01:16.682280145 -0300 +@@ -30,11 +30,8 @@ + .SH DESCRIPTION + .PP + \fBfinch\fR is a console-based modular messaging client based on libpurple +-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, +-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has ++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has + many common features found in other clients, as well as many unique features. +-Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or +-Yahoo. + + .SH OPTIONS + The following options are provided by \fBfinch\fR using the standard GNU +diff -Nur pidgin-2.10.7/doc/funniest_home_convos.txt pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt +--- pidgin-2.10.7/doc/funniest_home_convos.txt 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt 2013-08-16 23:08:16.148841464 -0300 +@@ -301,8 +301,6 @@ + --- + + 18:33:26 <NoName> hello there +-18:34:03 <NoName> I just wanted to share some bevavior that I think its kinda of +- unsafe when using GAIM with yahoo messenges accounts + 18:34:43 <NoName> Whenever you transfer files between users, no receiving + confirmation is requested, the file gets transfered + automatically +diff -Nur pidgin-2.10.7/doc/pidgin.1.in pidgin-2.10.7-nonprism/doc/pidgin.1.in +--- pidgin-2.10.7/doc/pidgin.1.in 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/doc/pidgin.1.in 2013-08-16 21:00:30.964181946 -0300 +@@ -29,11 +29,8 @@ + .SH DESCRIPTION + .PP + \fBpidgin\fR is a graphical modular messaging client based on libpurple +-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, +-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has ++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has + many common features found in other clients, as well as many unique features. +-Pidgin is not endorsed by or affiliated with America Online, ICQ, Microsoft, or +-Yahoo. + .PP + Pidgin can be extended by plugins written in multiple programming languages and + controlled through DBus or \fBpurple-remote\fR. +diff -Nur pidgin-2.10.7/libpurple/account.c pidgin-2.10.7-nonprism/libpurple/account.c +--- pidgin-2.10.7/libpurple/account.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/account.c 2013-08-16 23:31:48.026518940 -0300 +@@ -482,55 +482,6 @@ + /********************************************************************* + * Reading from disk * + *********************************************************************/ +-static void +-migrate_yahoo_japan(PurpleAccount *account) +-{ +- /* detect a Yahoo! JAPAN account that existed prior to 2.6.0 and convert it +- * to use the new prpl-yahoojp. Also remove the account-specific settings +- * we no longer need */ +- +- if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) { +- if(purple_account_get_bool(account, "yahoojp", FALSE)) { +- const char *serverjp = purple_account_get_string(account, "serverjp", NULL); +- const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL); +- +- g_return_if_fail(serverjp != NULL); +- g_return_if_fail(xferjp_host != NULL); +- +- purple_account_set_string(account, "server", serverjp); +- purple_account_set_string(account, "xfer_host", xferjp_host); +- +- purple_account_set_protocol_id(account, "prpl-yahoojp"); +- } +- +- /* these should always be nuked */ +- purple_account_remove_setting(account, "yahoojp"); +- purple_account_remove_setting(account, "serverjp"); +- purple_account_remove_setting(account, "xferjp_host"); +- +- } +-} +- +-static void +-migrate_icq_server(PurpleAccount *account) +-{ +- /* Migrate the login server setting for ICQ accounts. See +- * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794' +- * for details on the change. */ +- +- if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) { +- const char *tmp = purple_account_get_string(account, "server", NULL); +- +- /* Non-secure server */ +- if(purple_strequal(tmp, "login.messaging.aol.com") || +- purple_strequal(tmp, "login.oscar.aol.com")) +- purple_account_set_string(account, "server", "login.icq.com"); +- +- /* Secure server */ +- if(purple_strequal(tmp, "slogin.oscar.aol.com")) +- purple_account_set_string(account, "server", "slogin.icq.com"); +- } +-} + + static void + migrate_xmpp_encryption(PurpleAccount *account) +@@ -615,12 +566,6 @@ + g_free(data); + } + +- /* we do this here because we need access to account settings to determine +- * if we can/should migrate an old Yahoo! JAPAN account */ +- migrate_yahoo_japan(account); +- /* we do this here because we need access to account settings to determine +- * if we can/should migrate an ICQ account's server setting */ +- migrate_icq_server(account); + /* we do this here because we need to do it before the user views the + * Edit Account dialog. */ + migrate_xmpp_encryption(account); +@@ -874,7 +819,6 @@ + return NULL; + } + +- ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */ + g_free(name); + g_free(protocol_id); + +diff -Nur pidgin-2.10.7/libpurple/blist.c pidgin-2.10.7-nonprism/libpurple/blist.c +--- pidgin-2.10.7/libpurple/blist.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/blist.c 2013-08-16 22:53:19.640535242 -0300 +@@ -466,9 +466,7 @@ + + acct_name = xmlnode_get_attrib(bnode, "account"); + protocol = xmlnode_get_attrib(bnode, "protocol"); +- protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */ + proto = xmlnode_get_attrib(bnode, "proto"); +- proto = _purple_oscar_convert(acct_name, proto); /* XXX: Remove */ + + if (!acct_name || (!proto && !protocol)) + return; +diff -Nur pidgin-2.10.7/libpurple/buddyicon.c pidgin-2.10.7-nonprism/libpurple/buddyicon.c +--- pidgin-2.10.7/libpurple/buddyicon.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/buddyicon.c 2013-08-16 23:28:49.244233493 -0300 +@@ -1099,18 +1099,6 @@ + { + PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node); + const char *prpl_id = purple_account_get_protocol_id(account); +- +- if (g_str_equal(prpl_id, "prpl-yahoo") || g_str_equal(prpl_id, "prpl-yahoojp")) +- { +- int checksum = purple_blist_node_get_int(node, "icon_checksum"); +- if (checksum != 0) +- { +- char *checksum_str = g_strdup_printf("%i", checksum); +- purple_blist_node_remove_setting(node, "icon_checksum"); +- purple_blist_node_set_string(node, "icon_checksum", checksum_str); +- g_free(checksum_str); +- } +- } + } + } + } +diff -Nur pidgin-2.10.7/libpurple/ft.h pidgin-2.10.7-nonprism/libpurple/ft.h +--- pidgin-2.10.7/libpurple/ft.h 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/ft.h 2013-08-16 22:51:20.590085226 -0300 +@@ -470,8 +470,6 @@ + * can be used to jump backward in the file if the protocol detects + * that some bit of data needs to be resent or has been sent twice. + * +- * It's used for pausing and resuming an oscar file transfer. +- * + * @param xfer The file transfer. + * @param bytes_sent The new current position in the file. If we're + * sending a file then this is the byte that we will +diff -Nur pidgin-2.10.7/libpurple/gaim-compat.h pidgin-2.10.7-nonprism/libpurple/gaim-compat.h +--- pidgin-2.10.7/libpurple/gaim-compat.h 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/gaim-compat.h 2013-08-16 23:33:16.372629159 -0300 +@@ -2302,16 +2302,8 @@ + #define gaim_init_ssl_plugin purple_init_ssl_plugin + #define gaim_init_ssl_openssl_plugin purple_init_ssl_openssl_plugin + #define gaim_init_ssl_gnutls_plugin purple_init_ssl_gnutls_plugin +-#define gaim_init_gg_plugin purple_init_gg_plugin + #define gaim_init_jabber_plugin purple_init_jabber_plugin +-#define gaim_init_sametime_plugin purple_init_sametime_plugin +-#define gaim_init_msn_plugin purple_init_msn_plugin +-#define gaim_init_novell_plugin purple_init_novell_plugin +-#define gaim_init_qq_plugin purple_init_qq_plugin + #define gaim_init_simple_plugin purple_init_simple_plugin +-#define gaim_init_yahoo_plugin purple_init_yahoo_plugin + #define gaim_init_zephyr_plugin purple_init_zephyr_plugin +-#define gaim_init_aim_plugin purple_init_aim_plugin +-#define gaim_init_icq_plugin purple_init_icq_plugin + + #endif /* _GAIM_COMPAT_H_ */ +diff -Nur pidgin-2.10.7/libpurple/internal.h pidgin-2.10.7-nonprism/libpurple/internal.h +--- pidgin-2.10.7/libpurple/internal.h 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/internal.h 2013-08-17 00:24:37.244172407 -0300 +@@ -43,7 +43,7 @@ + * + * The Singular/Plural/Number ngettext dummy definition below was + * taken from an email to the texinfo mailing list by Manuel Guerrero. +- * Thank you Manuel, and thank you Alex's good friend Google. ++ * Thank you Manuel. + */ + #ifdef ENABLE_NLS + # include <locale.h> +diff -Nur pidgin-2.10.7/libpurple/media/backend-fs2.c pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c +--- pidgin-2.10.7/libpurple/media/backend-fs2.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c 2013-08-17 00:23:19.488440821 -0300 +@@ -1661,18 +1661,6 @@ + g_object_set(G_OBJECT(session->session), + "no-rtcp-timeout", 0, NULL); + +- /* +- * Hack to make x264 work with Gmail video. +- */ +- if (is_nice && !strcmp(sess_id, "google-video")) { +- FsElementAddedNotifier *notifier = +- fs_element_added_notifier_new(); +- g_signal_connect(G_OBJECT(notifier), "element-added", +- G_CALLBACK(gst_element_added_cb), NULL); +- fs_element_added_notifier_add(notifier, +- GST_BIN(priv->conference)); +- } +- + session->id = g_strdup(sess_id); + session->backend = self; + session->type = type; +diff -Nur pidgin-2.10.7/libpurple/plugins/psychic.c pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c +--- pidgin-2.10.7/libpurple/plugins/psychic.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c 2013-08-27 21:18:22.251908751 -0300 +@@ -20,8 +20,7 @@ + #define PLUGIN_NAME N_("Psychic Mode") + #define PLUGIN_SUMMARY N_("Psychic mode for incoming conversation") + #define PLUGIN_DESC N_("Causes conversation windows to appear as other" \ +- " users begin to message you. This works for" \ +- " AIM, ICQ, XMPP, Sametime, and Yahoo!") ++ " users begin to message you. This works for XMPP") + #define PLUGIN_AUTHOR "Christopher O'Brien <siege@preoccupied.net>" + + +diff -Nur pidgin-2.10.7/libpurple/pounce.c pidgin-2.10.7-nonprism/libpurple/pounce.c +--- pidgin-2.10.7/libpurple/pounce.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/pounce.c 2013-08-16 23:02:20.671021669 -0300 +@@ -409,7 +409,6 @@ + g_free(data->account_name); + data->account_name = g_strdup(buffer); + tmp = data->protocol_id; +- data->protocol_id = g_strdup(_purple_oscar_convert(buffer, tmp)); + g_free(tmp); + } + else if (purple_strequal(element_name, "pouncee")) { +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/auth_cyrus.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_cyrus.c +--- pidgin-2.10.7/libpurple/protocols/jabber/auth_cyrus.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_cyrus.c 2013-08-17 00:14:13.334946817 -0300 +@@ -320,7 +320,7 @@ + xmlnode_set_namespace(auth, NS_XMPP_SASL); + xmlnode_set_attrib(auth, "mechanism", js->current_mech); + +- xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); ++ xmlnode_set_attrib(auth, "xmlns:ga", ""); + xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); + + if (clientout) { +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/auth_plain.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_plain.c +--- pidgin-2.10.7/libpurple/protocols/jabber/auth_plain.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/auth_plain.c 2013-08-17 00:19:44.801822370 -0300 +@@ -40,7 +40,7 @@ + auth = xmlnode_new("auth"); + xmlnode_set_namespace(auth, NS_XMPP_SASL); + +- xmlnode_set_attrib(auth, "xmlns:ga", "http://www.google.com/talk/protocol/auth"); ++ xmlnode_set_attrib(auth, "xmlns:ga", ""); + xmlnode_set_attrib(auth, "ga:client-uses-full-bind-result", "true"); + + response = g_string_new(""); +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/buddy.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/buddy.c +--- pidgin-2.10.7/libpurple/protocols/jabber/buddy.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/buddy.c 2013-08-17 00:22:49.080836449 -0300 +@@ -38,7 +38,6 @@ + #include "xdata.h" + #include "pep.h" + #include "adhoccommands.h" +-#include "google/google.h" + + typedef struct { + long idle_seconds; +@@ -945,17 +944,7 @@ + + /* Republish our vcard if the photo is different than the server's */ + if (js->initial_avatar_hash && !purple_strequal(vcard_hash, js->initial_avatar_hash)) { +- /* +- * Google Talk has developed the behavior that it will not accept +- * a vcard set in the first 10 seconds (or so) of the connection; +- * it returns an error (namespaces trimmed): +- * <error code="500" type="wait"><internal-server-error/></error>. +- */ +- if (js->googletalk) +- js->vcard_timer = purple_timeout_add_seconds(10, set_own_vcard_cb, +- js); +- else +- jabber_set_info(js->gc, purple_account_get_user_info(account)); ++ jabber_set_info(js->gc, purple_account_get_user_info(account)); + } else if (vcard_hash) { + /* A photo is in the vCard. Advertise its hash */ + js->avatar_hash = vcard_hash; +@@ -1861,13 +1850,6 @@ + NULL, NULL); + m = g_list_append(m, act); + } +- +- if (js->googletalk) { +- act = purple_menu_action_new(_("Initiate _Chat"), +- PURPLE_CALLBACK(google_buddy_node_chat), +- NULL, NULL); +- m = g_list_append(m, act); +- } + + /* + * This if-condition implements parts of XEP-0100: Gateway Interaction +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/disco.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/disco.c +--- pidgin-2.10.7/libpurple/protocols/jabber/disco.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/disco.c 2013-08-27 22:49:34.275219711 -0300 +@@ -30,9 +30,6 @@ + #include "adhoccommands.h" + #include "buddy.h" + #include "disco.h" +-#include "google/google.h" +-#include "google/gmail.h" +-#include "google/jingleinfo.h" + #include "iq.h" + #include "jabber.h" + #include "jingle/jingle.h" +@@ -142,44 +139,6 @@ + xmlnode_set_attrib(feature, "var", feat->namespace); + } + } +-#ifdef USE_VV +- } else if (g_str_equal(node, CAPS0115_NODE "#" "voice-v1")) { +- /* +- * HUGE HACK! We advertise this ext (see jabber_presence_create_js +- * where we add <c/> to the <presence/>) for the Google Talk +- * clients that don't actually check disco#info features. +- * +- * This specific feature is redundant but is what +- * node='http://mail.google.com/xmpp/client/caps', ver='1.1' +- * advertises as 'voice-v1'. +- */ +- xmlnode *feature = xmlnode_new_child(query, "feature"); +- xmlnode_set_attrib(feature, "var", NS_GOOGLE_VOICE); +- } else if (g_str_equal(node, CAPS0115_NODE "#" "video-v1")) { +- /* +- * HUGE HACK! We advertise this ext (see jabber_presence_create_js +- * where we add <c/> to the <presence/>) for the Google Talk +- * clients that don't actually check disco#info features. +- * +- * This specific feature is redundant but is what +- * node='http://mail.google.com/xmpp/client/caps', ver='1.1' +- * advertises as 'video-v1'. +- */ +- xmlnode *feature = xmlnode_new_child(query, "feature"); +- xmlnode_set_attrib(feature, "var", NS_GOOGLE_VIDEO); +- } else if (g_str_equal(node, CAPS0115_NODE "#" "camera-v1")) { +- /* +- * HUGE HACK! We advertise this ext (see jabber_presence_create_js +- * where we add <c/> to the <presence/>) for the Google Talk +- * clients that don't actually check disco#info features. +- * +- * This specific feature is redundant but is what +- * node='http://mail.google.com/xmpp/client/caps', ver='1.1' +- * advertises as 'camera-v1'. +- */ +- xmlnode *feature = xmlnode_new_child(query, "feature"); +- xmlnode_set_attrib(feature, "var", NS_GOOGLE_CAMERA); +-#endif + } else { + xmlnode *error, *inf; + +@@ -419,7 +378,7 @@ + + } + +-/* should probably share this code with google.c, or maybe from 2.7.0 ++/* maybe from 2.7.0 + introduce an abstracted hostname -> IP function in dns.c */ + static void + jabber_disco_stun_lookup_cb(GSList *hosts, gpointer data, +@@ -538,16 +497,7 @@ + + g_free(js->server_name); + js->server_name = g_strdup(name); +- if (!strcmp(name, "Google Talk")) { +- purple_debug_info("jabber", "Google Talk!\n"); +- js->googletalk = TRUE; +- +- /* autodiscover stun and relays */ +- if (purple_network_get_stun_ip() == NULL || +- purple_strequal(purple_network_get_stun_ip(), "")) { +- jabber_google_send_jingle_info(js); +- } +- } else if (purple_network_get_stun_ip() == NULL || ++ if (purple_network_get_stun_ip() == NULL || + purple_strequal(purple_network_get_stun_ip(), "")) { + js->srv_query_data = + purple_srv_resolve_account( +@@ -565,12 +515,7 @@ + if (!var) + continue; + +- if (!strcmp(NS_GOOGLE_MAIL_NOTIFY, var)) { +- js->server_caps |= JABBER_CAP_GMAIL_NOTIFY; +- jabber_gmail_init(js); +- } else if (!strcmp(NS_GOOGLE_ROSTER, var)) { +- js->server_caps |= JABBER_CAP_GOOGLE_ROSTER; +- } else if (!strcmp("http://jabber.org/protocol/commands", var)) { ++ if (!strcmp("http://jabber.org/protocol/commands", var)) { + js->server_caps |= JABBER_CAP_ADHOC; + } else if (!strcmp(NS_SIMPLE_BLOCKING, var)) { + js->server_caps |= JABBER_CAP_BLOCKING; +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/iq.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/iq.c +--- pidgin-2.10.7/libpurple/protocols/jabber/iq.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/iq.c 2013-08-17 00:19:05.943958296 -0300 +@@ -28,10 +28,6 @@ + + #include "buddy.h" + #include "disco.h" +-#include "google/gmail.h" +-#include "google/google.h" +-#include "google/jingleinfo.h" +-#include "google/google_session.h" + #include "iq.h" + #include "jingle/jingle.h" + #include "oob.h" +@@ -461,13 +457,7 @@ + signal_iq_handlers = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, NULL); + + jabber_iq_register_handler("jingle", JINGLE, jingle_parse); +- jabber_iq_register_handler("mailbox", NS_GOOGLE_MAIL_NOTIFY, +- jabber_gmail_poke); +- jabber_iq_register_handler("new-mail", NS_GOOGLE_MAIL_NOTIFY, +- jabber_gmail_poke); + jabber_iq_register_handler("ping", NS_PING, jabber_ping_parse); +- jabber_iq_register_handler("query", NS_GOOGLE_JINGLE_INFO, +- jabber_google_handle_jingle_info); + jabber_iq_register_handler("query", NS_BYTESTREAMS, + jabber_bytestreams_parse); + jabber_iq_register_handler("query", NS_DISCO_INFO, jabber_disco_info_parse); +@@ -481,8 +471,6 @@ + jabber_iq_register_handler("query", "jabber:iq:version", + jabber_iq_version_parse); + #ifdef USE_VV +- jabber_iq_register_handler("session", NS_GOOGLE_SESSION, +- jabber_google_session_parse); + #endif + jabber_iq_register_handler("block", NS_SIMPLE_BLOCKING, jabber_blocklist_parse_push); + jabber_iq_register_handler("unblock", NS_SIMPLE_BLOCKING, jabber_blocklist_parse_push); +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jabber.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.c +--- pidgin-2.10.7/libpurple/protocols/jabber/jabber.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.c 2013-08-27 23:23:55.191865468 -0300 +@@ -51,9 +51,6 @@ + #include "chat.h" + #include "data.h" + #include "disco.h" +-#include "google/google.h" +-#include "google/google_roster.h" +-#include "google/google_session.h" + #include "ibb.h" + #include "iq.h" + #include "jutil.h" +@@ -1003,9 +1000,6 @@ + js->stun_ip = NULL; + js->stun_port = 0; + js->stun_query = NULL; +- js->google_relay_token = NULL; +- js->google_relay_host = NULL; +- js->google_relay_requests = NULL; + + /* if we are idle, set idle-ness on the stream (this could happen if we get + disconnected and the reconnects while being idle. I don't think it makes +@@ -1679,8 +1673,6 @@ + } + g_free(js->server_name); + g_free(js->certificate_CN); +- g_free(js->gmail_last_time); +- g_free(js->gmail_last_tid); + g_free(js->old_msg); + g_free(js->old_avatarhash); + g_free(js->old_artist); +@@ -1709,21 +1701,6 @@ + js->stun_query = NULL; + } + +- /* remove Google relay-related stuff */ +- g_free(js->google_relay_token); +- g_free(js->google_relay_host); +- if (js->google_relay_requests) { +- while (js->google_relay_requests) { +- PurpleUtilFetchUrlData *url_data = +- (PurpleUtilFetchUrlData *) js->google_relay_requests->data; +- purple_util_fetch_url_cancel(url_data); +- g_free(url_data); +- js->google_relay_requests = +- g_list_delete_link(js->google_relay_requests, +- js->google_relay_requests); +- } +- } +- + g_free(js); + + gc->proto_data = NULL; +@@ -1916,12 +1893,6 @@ + if (js == NULL) + return; + +- if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) +- { +- jabber_google_roster_add_deny(js, who); +- return; +- } +- + if (!(js->server_caps & JABBER_CAP_BLOCKING)) + { + purple_notify_error(NULL, _("Server doesn't support blocking"), +@@ -1952,12 +1923,6 @@ + if (js == NULL) + return; + +- if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) +- { +- jabber_google_roster_rem_deny(js, who); +- return; +- } +- + if (!(js->server_caps & JABBER_CAP_BLOCKING)) + return; + +@@ -3310,13 +3275,7 @@ + jbr = jabber_buddy_find_resource(jb, resource); + g_free(resource); + +- if (type & PURPLE_MEDIA_AUDIO && +- !jabber_resource_has_capability(jbr, +- JINGLE_APP_RTP_SUPPORT_AUDIO) && +- jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE)) +- return jabber_google_session_initiate(js, who, type); +- else +- return jingle_rtp_initiate_media(js, who, type); ++ return jingle_rtp_initiate_media(js, who, type); + } + + jb = jabber_buddy_find(js, who, FALSE); +@@ -3500,11 +3459,6 @@ + caps |= PURPLE_MEDIA_CAPS_MODIFY_SESSION | + PURPLE_MEDIA_CAPS_CHANGE_DIRECTION; + } +- if (jabber_resource_has_capability(jbr, NS_GOOGLE_VOICE)) { +- caps |= PURPLE_MEDIA_CAPS_AUDIO; +- if (jabber_resource_has_capability(jbr, NS_GOOGLE_VIDEO)) +- caps |= PURPLE_MEDIA_CAPS_AUDIO_VIDEO; +- } + + total |= caps; + } +@@ -3869,10 +3823,6 @@ + jabber_add_feature(JINGLE, 0); + + #ifdef USE_VV +- jabber_add_feature(NS_GOOGLE_PROTOCOL_SESSION, jabber_audio_enabled); +- jabber_add_feature(NS_GOOGLE_VOICE, jabber_audio_enabled); +- jabber_add_feature(NS_GOOGLE_VIDEO, jabber_video_enabled); +- jabber_add_feature(NS_GOOGLE_CAMERA, jabber_video_enabled); + jabber_add_feature(JINGLE_APP_RTP, 0); + jabber_add_feature(JINGLE_APP_RTP_SUPPORT_AUDIO, jabber_audio_enabled); + jabber_add_feature(JINGLE_APP_RTP_SUPPORT_VIDEO, jabber_video_enabled); +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jabber.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.h +--- pidgin-2.10.7/libpurple/protocols/jabber/jabber.h 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jabber.h 2013-08-17 00:10:38.778345348 -0300 +@@ -36,12 +36,6 @@ + JABBER_CAP_IQ_SEARCH = 1 << 7, + JABBER_CAP_IQ_REGISTER = 1 << 8, + +- /* Google Talk extensions: +- * http://code.google.com/apis/talk/jep_extensions/extensions.html +- */ +- JABBER_CAP_GMAIL_NOTIFY = 1 << 9, +- JABBER_CAP_GOOGLE_ROSTER = 1 << 10, +- + JABBER_CAP_PING = 1 << 11, + JABBER_CAP_ADHOC = 1 << 12, + JABBER_CAP_BLOCKING = 1 << 13, +@@ -195,12 +189,8 @@ + gboolean reinit; + + JabberCapabilities server_caps; +- gboolean googletalk; + char *server_name; + +- char *gmail_last_time; +- char *gmail_last_tid; +- + char *serverFQDN; + + #ifdef HAVE_CYRUS_SASL +@@ -276,12 +266,6 @@ + gchar *stun_ip; + int stun_port; + PurpleDnsQueryData *stun_query; +- +- /* stuff for Google's relay handling */ +- gchar *google_relay_token; +- gchar *google_relay_host; +- GList *google_relay_requests; /* the HTTP requests to get */ +- /* relay info */ + }; + + typedef gboolean (JabberFeatureEnabled)(JabberStream *js, const gchar *namespace); +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.c +--- pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.c 2013-08-17 00:17:51.991679891 -0300 +@@ -486,13 +486,11 @@ + + if (has_account_stun) { + purple_debug_info("jabber", +- "setting param stun-ip for stream using Google auto-config: %s\n", + js->stun_ip); + params[next_index].name = "stun-ip"; + g_value_init(¶ms[next_index].value, G_TYPE_STRING); + g_value_set_string(¶ms[next_index].value, js->stun_ip); + purple_debug_info("jabber", +- "setting param stun-port for stream using Google auto-config: %d\n", + js->stun_port); + next_index++; + params[next_index].name = "stun-port"; +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.h +--- pidgin-2.10.7/libpurple/protocols/jabber/jingle/jingle.h 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/jingle/jingle.h 2013-08-27 23:02:43.456476444 -0300 +@@ -79,8 +79,7 @@ + void jingle_terminate_sessions(JabberStream *js); + + #ifdef USE_VV +-/* create a GParam array given autoconfigured STUN (and later perhaps TURN). +- if google_talk is TRUE, set compatability mode to GOOGLE_TALK */ ++/* create a GParam array given autoconfigured STUN (and later perhaps TURN).*/ + GParameter *jingle_get_params(JabberStream *js, const gchar *relay_ip, + guint relay_udp, guint relay_tcp, guint relay_ssltcp, + const gchar *relay_username, const gchar *relay_password, guint *num_params); +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/libxmpp.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/libxmpp.c +--- pidgin-2.10.7/libpurple/protocols/jabber/libxmpp.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/libxmpp.c 2013-08-17 00:13:06.222881329 -0300 +@@ -41,7 +41,6 @@ + #include "si.h" + #include "message.h" + #include "presence.h" +-#include "google/google.h" + #include "pep.h" + #include "usermood.h" + #include "usertune.h" +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.am +--- pidgin-2.10.7/libpurple/protocols/jabber/Makefile.am 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.am 2013-08-17 00:18:17.592468560 -0300 +@@ -27,20 +27,6 @@ + data.h \ + disco.c \ + disco.h \ +- google/gmail.c \ +- google/gmail.h \ +- google/google.c \ +- google/google.h \ +- google/google_presence.c \ +- google/google_presence.h \ +- google/google_roster.c \ +- google/google_roster.h \ +- google/google_session.c \ +- google/google_session.h \ +- google/jingleinfo.c \ +- google/jingleinfo.h \ +- google/relay.c \ +- google/relay.h \ + ibb.c \ + ibb.h \ + iq.c \ +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.in +--- pidgin-2.10.7/libpurple/protocols/jabber/Makefile.in 2013-02-11 07:17:20.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/Makefile.in 2013-08-17 00:12:44.605549467 -0300 +@@ -104,12 +104,7 @@ + auth.h auth_digest_md5.c auth_digest_md5.h auth_plain.c \ + auth_scram.c auth_scram.h buddy.c buddy.h bosh.c bosh.h caps.c \ + caps.h chat.c chat.h data.c data.h disco.c disco.h \ +- google/gmail.c google/gmail.h google/google.c google/google.h \ +- google/google_presence.c google/google_presence.h \ +- google/google_roster.c google/google_roster.h \ +- google/google_session.c google/google_session.h \ +- google/jingleinfo.c google/jingleinfo.h google/relay.c \ +- google/relay.h ibb.c ibb.h iq.c iq.h jabber.c jabber.h \ ++ ibb.c ibb.h iq.c iq.h jabber.c jabber.h \ + jingle/jingle.c jingle/jingle.h jingle/content.c \ + jingle/content.h jingle/iceudp.c jingle/iceudp.h \ + jingle/rawudp.c jingle/rawudp.h jingle/rtp.c jingle/rtp.h \ +@@ -126,9 +121,7 @@ + libjabber_la-auth_scram.lo libjabber_la-buddy.lo \ + libjabber_la-bosh.lo libjabber_la-caps.lo libjabber_la-chat.lo \ + libjabber_la-data.lo libjabber_la-disco.lo \ +- libjabber_la-gmail.lo libjabber_la-google.lo \ +- libjabber_la-google_presence.lo libjabber_la-google_roster.lo \ +- libjabber_la-google_session.lo libjabber_la-jingleinfo.lo \ ++ libjabber_la-jingleinfo.lo \ + libjabber_la-relay.lo libjabber_la-ibb.lo libjabber_la-iq.lo \ + libjabber_la-jabber.lo libjabber_la-jingle.lo \ + libjabber_la-content.lo libjabber_la-iceudp.lo \ +@@ -244,8 +237,6 @@ + FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@ + FARSTREAM_LIBS = @FARSTREAM_LIBS@ + FGREP = @FGREP@ +-GADU_CFLAGS = @GADU_CFLAGS@ +-GADU_LIBS = @GADU_LIBS@ + GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +@@ -307,8 +298,6 @@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@ +-MEANWHILE_LIBS = @MEANWHILE_LIBS@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MONO_CFLAGS = @MONO_CFLAGS@ +@@ -457,13 +446,8 @@ + JABBERSOURCES = adhoccommands.c adhoccommands.h auth.c auth.h \ + auth_digest_md5.c auth_digest_md5.h auth_plain.c auth_scram.c \ + auth_scram.h buddy.c buddy.h bosh.c bosh.h caps.c caps.h \ +- chat.c chat.h data.c data.h disco.c disco.h google/gmail.c \ +- google/gmail.h google/google.c google/google.h \ +- google/google_presence.c google/google_presence.h \ +- google/google_roster.c google/google_roster.h \ +- google/google_session.c google/google_session.h \ +- google/jingleinfo.c google/jingleinfo.h google/relay.c \ +- google/relay.h ibb.c ibb.h iq.c iq.h jabber.c jabber.h \ ++ chat.c chat.h data.c data.h disco.c disco.h \ ++ ibb.c ibb.h iq.c iq.h jabber.c jabber.h \ + jingle/jingle.c jingle/jingle.h jingle/content.c \ + jingle/content.h jingle/iceudp.c jingle/iceudp.h \ + jingle/rawudp.c jingle/rawudp.h jingle/rtp.c jingle/rtp.h \ +@@ -600,11 +584,6 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-content.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-data.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-disco.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-gmail.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_presence.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_roster.Plo@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-google_session.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-ibb.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-iceudp.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libjabber_la-iq.Plo@am__quote@ +@@ -731,55 +710,6 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-disco.lo `test -f 'disco.c' || echo '$(srcdir)/'`disco.c + +-libjabber_la-gmail.lo: google/gmail.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-gmail.lo -MD -MP -MF $(DEPDIR)/libjabber_la-gmail.Tpo -c -o libjabber_la-gmail.lo `test -f 'google/gmail.c' || echo '$(srcdir)/'`google/gmail.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-gmail.Tpo $(DEPDIR)/libjabber_la-gmail.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/gmail.c' object='libjabber_la-gmail.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-gmail.lo `test -f 'google/gmail.c' || echo '$(srcdir)/'`google/gmail.c +- +-libjabber_la-google.lo: google/google.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google.Tpo -c -o libjabber_la-google.lo `test -f 'google/google.c' || echo '$(srcdir)/'`google/google.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google.Tpo $(DEPDIR)/libjabber_la-google.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/google.c' object='libjabber_la-google.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google.lo `test -f 'google/google.c' || echo '$(srcdir)/'`google/google.c +- +-libjabber_la-google_presence.lo: google/google_presence.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_presence.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_presence.Tpo -c -o libjabber_la-google_presence.lo `test -f 'google/google_presence.c' || echo '$(srcdir)/'`google/google_presence.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_presence.Tpo $(DEPDIR)/libjabber_la-google_presence.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/google_presence.c' object='libjabber_la-google_presence.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_presence.lo `test -f 'google/google_presence.c' || echo '$(srcdir)/'`google/google_presence.c +- +-libjabber_la-google_roster.lo: google/google_roster.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_roster.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_roster.Tpo -c -o libjabber_la-google_roster.lo `test -f 'google/google_roster.c' || echo '$(srcdir)/'`google/google_roster.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_roster.Tpo $(DEPDIR)/libjabber_la-google_roster.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/google_roster.c' object='libjabber_la-google_roster.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_roster.lo `test -f 'google/google_roster.c' || echo '$(srcdir)/'`google/google_roster.c +- +-libjabber_la-google_session.lo: google/google_session.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-google_session.lo -MD -MP -MF $(DEPDIR)/libjabber_la-google_session.Tpo -c -o libjabber_la-google_session.lo `test -f 'google/google_session.c' || echo '$(srcdir)/'`google/google_session.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-google_session.Tpo $(DEPDIR)/libjabber_la-google_session.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/google_session.c' object='libjabber_la-google_session.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-google_session.lo `test -f 'google/google_session.c' || echo '$(srcdir)/'`google/google_session.c +- +-libjabber_la-jingleinfo.lo: google/jingleinfo.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-jingleinfo.lo -MD -MP -MF $(DEPDIR)/libjabber_la-jingleinfo.Tpo -c -o libjabber_la-jingleinfo.lo `test -f 'google/jingleinfo.c' || echo '$(srcdir)/'`google/jingleinfo.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-jingleinfo.Tpo $(DEPDIR)/libjabber_la-jingleinfo.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/jingleinfo.c' object='libjabber_la-jingleinfo.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-jingleinfo.lo `test -f 'google/jingleinfo.c' || echo '$(srcdir)/'`google/jingleinfo.c +- +-libjabber_la-relay.lo: google/relay.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-relay.lo -MD -MP -MF $(DEPDIR)/libjabber_la-relay.Tpo -c -o libjabber_la-relay.lo `test -f 'google/relay.c' || echo '$(srcdir)/'`google/relay.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-relay.Tpo $(DEPDIR)/libjabber_la-relay.Plo +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='google/relay.c' object='libjabber_la-relay.lo' libtool=yes @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -c -o libjabber_la-relay.lo `test -f 'google/relay.c' || echo '$(srcdir)/'`google/relay.c +- + libjabber_la-ibb.lo: ibb.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libjabber_la_CFLAGS) $(CFLAGS) -MT libjabber_la-ibb.lo -MD -MP -MF $(DEPDIR)/libjabber_la-ibb.Tpo -c -o libjabber_la-ibb.lo `test -f 'ibb.c' || echo '$(srcdir)/'`ibb.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libjabber_la-ibb.Tpo $(DEPDIR)/libjabber_la-ibb.Plo +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/message.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/message.c +--- pidgin-2.10.7/libpurple/protocols/jabber/message.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/message.c 2013-08-17 00:20:08.115874207 -0300 +@@ -30,7 +30,6 @@ + #include "buddy.h" + #include "chat.h" + #include "data.h" +-#include "google/google.h" + #include "message.h" + #include "xmlnode.h" + #include "pep.h" +@@ -151,11 +150,6 @@ + jbr->thread_id = g_strdup(jbr->thread_id); + } + +- if (jm->js->googletalk && jm->xhtml == NULL) { +- char *tmp = jm->body; +- jm->body = jabber_google_format_to_html(jm->body); +- g_free(tmp); +- } + serv_got_im(gc, jm->from, jm->xhtml ? jm->xhtml : jm->body, 0, jm->sent); + } + +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/namespaces.h pidgin-2.10.7-nonprism/libpurple/protocols/jabber/namespaces.h +--- pidgin-2.10.7/libpurple/protocols/jabber/namespaces.h 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/namespaces.h 2013-08-17 00:11:17.449534779 -0300 +@@ -95,18 +95,4 @@ + /* XEP-0264 File Transfer Thumbnails (Thumbs) */ + #define NS_THUMBS "urn:xmpp:thumbs:0" + +-/* Google extensions */ +-#define NS_GOOGLE_CAMERA "http://www.google.com/xmpp/protocol/camera/v1" +-#define NS_GOOGLE_VIDEO "http://www.google.com/xmpp/protocol/video/v1" +-#define NS_GOOGLE_VOICE "http://www.google.com/xmpp/protocol/voice/v1" +-#define NS_GOOGLE_JINGLE_INFO "google:jingleinfo" +- +-#define NS_GOOGLE_MAIL_NOTIFY "google:mail:notify" +-#define NS_GOOGLE_ROSTER "google:roster" +- +-#define NS_GOOGLE_PROTOCOL_SESSION "http://www.google.com/xmpp/protocol/session" +-#define NS_GOOGLE_SESSION "http://www.google.com/session" +-#define NS_GOOGLE_SESSION_PHONE "http://www.google.com/session/phone" +-#define NS_GOOGLE_SESSION_VIDEO "http://www.google.com/session/video" +- + #endif /* PURPLE_JABBER_NAMESPACES_H_ */ +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/presence.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/presence.c +--- pidgin-2.10.7/libpurple/protocols/jabber/presence.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/presence.c 2013-08-17 00:16:58.436696950 -0300 +@@ -34,8 +34,6 @@ + + #include "buddy.h" + #include "chat.h" +-#include "google/google.h" +-#include "google/google_presence.h" + #include "presence.h" + #include "iq.h" + #include "jutil.h" +@@ -208,9 +206,6 @@ + /* changing the buzz state has to trigger a re-broadcasting of the presence for caps */ + + tune = purple_presence_get_status(p, "tune"); +- if (js->googletalk && !stripped && purple_status_is_active(tune)) { +- stripped = jabber_google_presence_outgoing(tune); +- } + + #define CHANGED(a,b) ((!a && b) || (a && a[0] == '\0' && b && b[0] != '\0') || \ + (a && !b) || (a && a[0] != '\0' && b && b[0] == '\0') || (a && b && strcmp(a,b))) +@@ -361,11 +356,6 @@ + #ifdef USE_VV + /* + * MASSIVE HUGE DISGUSTING HACK +- * This is a huge hack. As far as I can tell, Google Talk's gmail client +- * doesn't bother to check the actual features we advertise; they +- * just assume that if we specify a 'voice-v1' ext (ignoring that +- * these are to be assigned no semantic value), we support receiving voice +- * calls. + * + * Ditto for 'video-v1'. + */ +@@ -883,7 +873,6 @@ + + jbr = jabber_buddy_find_resource(presence->jb, NULL); + if (jbr) { +- jabber_google_presence_incoming(js, buddy_name, jbr); + purple_prpl_got_user_status(account, buddy_name, + jabber_buddy_state_get_status_id(jbr->state), + "priority", jbr->priority, +diff -Nur pidgin-2.10.7/libpurple/protocols/jabber/roster.c pidgin-2.10.7-nonprism/libpurple/protocols/jabber/roster.c +--- pidgin-2.10.7/libpurple/protocols/jabber/roster.c 2013-02-11 07:16:52.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/jabber/roster.c 2013-08-17 00:09:16.245807467 -0300 +@@ -27,8 +27,6 @@ + + #include "buddy.h" + #include "chat.h" +-#include "google/google.h" +-#include "google/google_roster.h" + #include "presence.h" + #include "roster.h" + #include "iq.h" +@@ -83,11 +81,6 @@ + iq = jabber_iq_new_query(js, JABBER_IQ_GET, "jabber:iq:roster"); + query = xmlnode_get_child(iq->node, "query"); + +- if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) { +- xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER); +- xmlnode_set_attrib(query, "gr:ext", "2"); +- } +- + jabber_iq_set_callback(iq, roster_request_cb, NULL); + jabber_iq_send(iq); + } +@@ -244,10 +237,6 @@ + } else { + GSList *groups = NULL; + +- if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) +- if (!jabber_google_roster_incoming(js, item)) +- continue; +- + for(group = xmlnode_get_child(item, "group"); group; group = xmlnode_get_next_twin(group)) { + char *group_name = xmlnode_get_data(group); + +@@ -349,11 +338,6 @@ + + g_slist_free(groups); + +- if (js->server_caps & JABBER_CAP_GOOGLE_ROSTER) { +- jabber_google_roster_outgoing(js, query, item); +- xmlnode_set_attrib(query, "xmlns:gr", NS_GOOGLE_ROSTER); +- xmlnode_set_attrib(query, "gr:ext", "2"); +- } + jabber_iq_send(iq); + } + +diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am +--- pidgin-2.10.7/libpurple/protocols/Makefile.am 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am 2013-08-16 22:37:55.011207011 -0300 +@@ -1,5 +1,5 @@ + EXTRA_DIST = Makefile.mingw + +-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr ++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr + + SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS) +diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in +--- pidgin-2.10.7/libpurple/protocols/Makefile.in 2013-02-11 07:17:19.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in 2013-08-16 23:50:36.651423353 -0300 +@@ -160,8 +160,6 @@ + FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@ + FARSTREAM_LIBS = @FARSTREAM_LIBS@ + FGREP = @FGREP@ +-GADU_CFLAGS = @GADU_CFLAGS@ +-GADU_LIBS = @GADU_LIBS@ + GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +@@ -223,8 +221,6 @@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@ +-MEANWHILE_LIBS = @MEANWHILE_LIBS@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MONO_CFLAGS = @MONO_CFLAGS@ +@@ -365,7 +361,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + EXTRA_DIST = Makefile.mingw +-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr ++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr + SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS) + all: all-recursive + +diff -Nur pidgin-2.10.7/libpurple/prpl.h pidgin-2.10.7-nonprism/libpurple/prpl.h +--- pidgin-2.10.7/libpurple/prpl.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/prpl.h 2013-08-16 22:29:46.145754932 -0300 +@@ -161,15 +161,11 @@ + + /** + * Notify on new mail. +- * +- * MSN and Yahoo notify you when you have new mail. + */ + OPT_PROTO_MAIL_CHECK = 0x00000020, + + /** + * Images in IMs. +- * +- * Oscar lets you send images in direct IMs. + */ + OPT_PROTO_IM_IMAGE = 0x00000040, + +@@ -184,16 +180,13 @@ + /** + * Allows font size to be specified in sane point size + * +- * Probably just XMPP and Y!M ++ * Probably just XMPP + */ + OPT_PROTO_USE_POINTSIZE = 0x00000100, + + /** + * Set the Register button active even when the username has not + * been specified. +- * +- * Gadu-Gadu doesn't need a username to register new account (because +- * usernames are assigned by the server). + */ + OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200, + +@@ -467,9 +460,7 @@ + void (*convo_closed)(PurpleConnection *, const char *who); + + /** +- * Convert the username @a who to its canonical form. (For example, +- * AIM treats "fOo BaR" and "foobar" as the same user; this function +- * should return the same normalized string for both of those.) ++ * Convert the username @a who to its canonical form. + */ + const char *(*normalize)(const PurpleAccount *, const char *who); + +@@ -923,7 +914,7 @@ + * @param who Whose attention to request. + * @param type_code An index into the prpl's attention_types list determining the type + * of the attention request command to send. 0 if prpl only defines one +- * (for example, Yahoo and MSN), but some protocols define more (MySpaceIM). ++ * , but some protocols define more. + * + * Note that you can't send arbitrary PurpleAttentionType's, because there is + * only a fixed set of attention commands. +diff -Nur pidgin-2.10.7/libpurple/purple-url-handler pidgin-2.10.7-nonprism/libpurple/purple-url-handler +--- pidgin-2.10.7/libpurple/purple-url-handler 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/purple-url-handler 2013-08-16 21:16:42.951304560 -0300 +@@ -117,70 +117,6 @@ + def addbuddy(account, screenname, group="", alias=""): + cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias) + +- +-def aim(uri): +- protocol = "prpl-aim" +- match = re.match(r"^aim:([^?]*)(\?(.*))", uri) +- if not match: +- print "Invalid aim URI: %s" % uri +- return +- +- command = urllib.unquote_plus(match.group(1)) +- paramstring = match.group(3) +- params = {} +- if paramstring: +- for param in paramstring.split("&"): +- key, value = extendlist(param.split("=", 1), 2, "") +- params[key] = urllib.unquote_plus(value) +- accountname = params.get("account", "") +- screenname = params.get("screenname", "") +- +- account = findaccount(protocol, accountname) +- +- if command.lower() == "goim": +- goim(account, screenname, params.get("message")) +- elif command.lower() == "gochat": +- gochat(account, params) +- elif command.lower() == "addbuddy": +- addbuddy(account, screenname, params.get("group", "")) +- +-def gg(uri): +- protocol = "prpl-gg" +- match = re.match(r"^gg:(.*)", uri) +- if not match: +- print "Invalid gg URI: %s" % uri +- return +- +- screenname = urllib.unquote_plus(match.group(1)) +- account = findaccount(protocol) +- goim(account, screenname) +- +-def icq(uri): +- protocol = "prpl-icq" +- match = re.match(r"^icq:([^?]*)(\?(.*))", uri) +- if not match: +- print "Invalid icq URI: %s" % uri +- return +- +- command = urllib.unquote_plus(match.group(1)) +- paramstring = match.group(3) +- params = {} +- if paramstring: +- for param in paramstring.split("&"): +- key, value = extendlist(param.split("=", 1), 2, "") +- params[key] = urllib.unquote_plus(value) +- accountname = params.get("account", "") +- screenname = params.get("screenname", "") +- +- account = findaccount(protocol, accountname) +- +- if command.lower() == "goim": +- goim(account, screenname, params.get("message")) +- elif command.lower() == "gochat": +- gochat(account, params) +- elif command.lower() == "addbuddy": +- addbuddy(account, screenname, params.get("group", "")) +- + def irc(uri): + protocol = "prpl-irc" + match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri) +@@ -221,34 +157,6 @@ + channel = "#" + channel + gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg")) + +-def msnim(uri): +- protocol = "prpl-msn" +- match = re.match(r"^msnim:([^?]*)(\?(.*))", uri) +- if not match: +- print "Invalid msnim URI: %s" % uri +- return +- +- command = urllib.unquote_plus(match.group(1)) +- paramstring = match.group(3) +- params = {} +- if paramstring: +- for param in paramstring.split("&"): +- key, value = extendlist(param.split("=", 1), 2, "") +- params[key] = urllib.unquote_plus(value) +- screenname = params.get("contact", "") +- +- account = findaccount(protocol) +- +- if command.lower() == "chat": +- goim(account, screenname) +- elif command.lower() == "add": +- addbuddy(account, screenname) +- +-def myim(uri): +- protocol = "prpl-myspace" +- print "TODO: send uri: ", uri +- assert False, "Not implemented" +- + def sip(uri): + protocol = "prpl-simple" + match = re.match(r"^sip:(.*)", uri) +@@ -300,57 +208,6 @@ + else: + goim(account, screenname) + +-def gtalk(uri): +- protocol = "prpl-jabber" +- match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri) +- if not match: +- print "Invalid gtalk URI: %s" % uri +- return +- +- command = urllib.unquote_plus(match.group(1)) +- paramstring = match.group(3) +- params = {} +- if paramstring: +- for param in paramstring.split("&"): +- key, value = extendlist(param.split("=", 1), 2, "") +- params[key] = urllib.unquote_plus(value) +- accountname = params.get("from_jid", "") +- jid = params.get("jid", "") +- +- account = findaccount(protocol, accountname) +- +- if command.lower() == "chat": +- goim(account, jid) +- elif command.lower() == "call": +- # XXX V&V prompt to establish call +- goim(account, jid) +- +-def ymsgr(uri): +- protocol = "prpl-yahoo" +- match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri) +- if not match: +- print "Invalid ymsgr URI: %s" % uri +- return +- +- command = urllib.unquote_plus(match.group(1)) +- screenname = urllib.unquote_plus(match.group(3)) +- paramstring = match.group(5) +- params = {} +- if paramstring: +- for param in paramstring.split("&"): +- key, value = extendlist(param.split("=", 1), 2, "") +- params[key] = urllib.unquote_plus(value) +- +- account = findaccount(protocol) +- +- if command.lower() == "sendim": +- goim(account, screenname, params.get("m")) +- elif command.lower() == "chat": +- gochat(account, {"room": screenname}) +- elif command.lower() == "addfriend": +- addbuddy(account, screenname) +- +- + def main(argv=sys.argv): + if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h": + print "Usage: %s URI" % argv[0] +diff -Nur pidgin-2.10.7/libpurple/savedstatuses.c pidgin-2.10.7-nonprism/libpurple/savedstatuses.c +--- pidgin-2.10.7/libpurple/savedstatuses.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/savedstatuses.c 2013-08-16 22:52:44.582754543 -0300 +@@ -387,7 +387,6 @@ + const char *protocol; + acct_name = xmlnode_get_data(node); + protocol = xmlnode_get_attrib(node, "protocol"); +- protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */ + if ((acct_name != NULL) && (protocol != NULL)) + ret->account = purple_accounts_find(acct_name, protocol); + g_free(acct_name); +diff -Nur pidgin-2.10.7/libpurple/server.h pidgin-2.10.7-nonprism/libpurple/server.h +--- pidgin-2.10.7/libpurple/server.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/server.h 2013-08-16 23:30:04.149920853 -0300 +@@ -69,7 +69,7 @@ + * @param who Whose attention to request. + * @param type_code An index into the prpl's attention_types list determining the type + * of the attention request command to send. 0 if prpl only defines one +- * (for example, Yahoo and MSN), but some protocols define more (MySpaceIM). ++ * , but some protocols define more. + * + * Note that you can't send arbitrary PurpleAttentionType's, because there is + * only a fixed set of attention commands. +diff -Nur pidgin-2.10.7/libpurple/status.h pidgin-2.10.7-nonprism/libpurple/status.h +--- pidgin-2.10.7/libpurple/status.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/status.h 2013-08-16 22:52:22.542054119 -0300 +@@ -43,8 +43,7 @@ + * one of your AIM buddies has set himself as "away." You have a + * PurpleBuddy node for this person in your buddy list. Purple wants + * to mark this buddy as "away," so it creates a new PurpleStatus. +- * The PurpleStatus has its PurpleStatusType set to the "away" state +- * for the oscar PRPL. The PurpleStatus also contains the buddy's ++ * The PurpleStatus also contains the buddy's + * away message. PurpleStatuses are sometimes saved, depending on + * the context. The current PurpleStatuses associated with each of + * your accounts are saved so that the next time you start Purple, +diff -Nur pidgin-2.10.7/libpurple/tests/check_libpurple.c pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c +--- pidgin-2.10.7/libpurple/tests/check_libpurple.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c 2013-08-16 22:55:33.731462302 -0300 +@@ -88,8 +88,6 @@ + srunner_add_suite(sr, jabber_digest_md5_suite()); + srunner_add_suite(sr, jabber_jutil_suite()); + srunner_add_suite(sr, jabber_scram_suite()); +- srunner_add_suite(sr, oscar_util_suite()); +- srunner_add_suite(sr, yahoo_util_suite()); + srunner_add_suite(sr, util_suite()); + srunner_add_suite(sr, xmlnode_suite()); + +diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.am pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am +--- pidgin-2.10.7/libpurple/tests/Makefile.am 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am 2013-08-16 22:56:03.189064778 -0300 +@@ -14,8 +14,6 @@ + test_jabber_digest_md5.c \ + test_jabber_jutil.c \ + test_jabber_scram.c \ +- test_oscar_util.c \ +- test_yahoo_util.c \ + test_util.c \ + test_xmlnode.c \ + $(top_builddir)/libpurple/util.h +@@ -31,8 +29,6 @@ + + check_libpurple_LDADD=\ + $(top_builddir)/libpurple/protocols/jabber/libjabber.la \ +- $(top_builddir)/libpurple/protocols/oscar/liboscar.la \ +- $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \ + $(top_builddir)/libpurple/libpurple.la \ + @CHECK_LIBS@ \ + $(GLIB_LIBS) +diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.in pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in +--- pidgin-2.10.7/libpurple/tests/Makefile.in 2013-02-11 07:17:23.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in 2013-08-16 23:53:20.713146759 -0300 +@@ -65,8 +65,8 @@ + CONFIG_CLEAN_VPATH_FILES = + am__check_libpurple_SOURCES_DIST = check_libpurple.c tests.h \ + test_cipher.c test_jabber_caps.c test_jabber_digest_md5.c \ +- test_jabber_jutil.c test_jabber_scram.c test_oscar_util.c \ +- test_yahoo_util.c test_util.c test_xmlnode.c \ ++ test_jabber_jutil.c test_jabber_scram.c \ ++ test_util.c test_xmlnode.c \ + $(top_builddir)/libpurple/util.h + @HAVE_CHECK_TRUE@am_check_libpurple_OBJECTS = \ + @HAVE_CHECK_TRUE@ check_libpurple-check_libpurple.$(OBJEXT) \ +@@ -75,15 +75,11 @@ + @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_digest_md5.$(OBJEXT) \ + @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_jutil.$(OBJEXT) \ + @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_scram.$(OBJEXT) \ +-@HAVE_CHECK_TRUE@ check_libpurple-test_oscar_util.$(OBJEXT) \ +-@HAVE_CHECK_TRUE@ check_libpurple-test_yahoo_util.$(OBJEXT) \ + @HAVE_CHECK_TRUE@ check_libpurple-test_util.$(OBJEXT) \ + @HAVE_CHECK_TRUE@ check_libpurple-test_xmlnode.$(OBJEXT) + check_libpurple_OBJECTS = $(am_check_libpurple_OBJECTS) + am__DEPENDENCIES_1 = + @HAVE_CHECK_TRUE@check_libpurple_DEPENDENCIES = $(top_builddir)/libpurple/protocols/jabber/libjabber.la \ +-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/oscar/liboscar.la \ +-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \ + @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/libpurple.la \ + @HAVE_CHECK_TRUE@ $(am__DEPENDENCIES_1) + AM_V_lt = $(am__v_lt_@AM_V@) +@@ -177,8 +173,6 @@ + FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@ + FARSTREAM_LIBS = @FARSTREAM_LIBS@ + FGREP = @FGREP@ +-GADU_CFLAGS = @GADU_CFLAGS@ +-GADU_LIBS = @GADU_LIBS@ + GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +@@ -240,8 +234,6 @@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@ +-MEANWHILE_LIBS = @MEANWHILE_LIBS@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MONO_CFLAGS = @MONO_CFLAGS@ +@@ -389,8 +381,6 @@ + @HAVE_CHECK_TRUE@ test_jabber_digest_md5.c \ + @HAVE_CHECK_TRUE@ test_jabber_jutil.c \ + @HAVE_CHECK_TRUE@ test_jabber_scram.c \ +-@HAVE_CHECK_TRUE@ test_oscar_util.c \ +-@HAVE_CHECK_TRUE@ test_yahoo_util.c \ + @HAVE_CHECK_TRUE@ test_util.c \ + @HAVE_CHECK_TRUE@ test_xmlnode.c \ + @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/util.h +@@ -406,8 +396,6 @@ + + @HAVE_CHECK_TRUE@check_libpurple_LDADD = \ + @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/jabber/libjabber.la \ +-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/oscar/liboscar.la \ +-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \ + @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/libpurple.la \ + @HAVE_CHECK_TRUE@ @CHECK_LIBS@ \ + @HAVE_CHECK_TRUE@ $(GLIB_LIBS) +@@ -471,10 +459,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_digest_md5.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_jutil.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_scram.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_oscar_util.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_util.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_xmlnode.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_yahoo_util.Po@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -581,34 +567,6 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_jabber_scram.obj `if test -f 'test_jabber_scram.c'; then $(CYGPATH_W) 'test_jabber_scram.c'; else $(CYGPATH_W) '$(srcdir)/test_jabber_scram.c'; fi` + +-check_libpurple-test_oscar_util.o: test_oscar_util.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c +- +-check_libpurple-test_oscar_util.obj: test_oscar_util.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi` +- +-check_libpurple-test_yahoo_util.o: test_yahoo_util.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c +- +-check_libpurple-test_yahoo_util.obj: test_yahoo_util.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi` +- + check_libpurple-test_util.o: test_util.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_util.Tpo -c -o check_libpurple-test_util.o `test -f 'test_util.c' || echo '$(srcdir)/'`test_util.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_util.Tpo $(DEPDIR)/check_libpurple-test_util.Po +diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_caps.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c +--- pidgin-2.10.7/libpurple/tests/test_jabber_caps.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c 2013-08-17 00:25:08.235128437 -0300 +@@ -33,7 +33,7 @@ + START_TEST(test_calculate_caps) + { + assert_caps_calculate_match("sha1", "GNjxthSckUNvAIoCCJFttjl6VL8=", +- "<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='google:mail:notify'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>"); ++ "<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>"); + } + END_TEST + +diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c +--- pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c 2013-08-27 22:53:21.524229291 -0300 +@@ -99,19 +99,19 @@ + + START_TEST(test_jabber_id_new) + { +- assert_valid_jid("gmail.com"); +- assert_valid_jid("gmail.com/Test"); +- assert_valid_jid("gmail.com/Test@"); +- assert_valid_jid("gmail.com/@"); +- assert_valid_jid("gmail.com/Test@alkjaweflkj"); +- assert_valid_jid("mark.doliner@gmail.com"); +- assert_valid_jid("mark.doliner@gmail.com/Test12345"); +- assert_valid_jid("mark.doliner@gmail.com/Test@12345"); +- assert_valid_jid("mark.doliner@gmail.com/Te/st@12@//345"); ++ assert_valid_jid("mail.com"); ++ assert_valid_jid("mail.com/Test"); ++ assert_valid_jid("mail.com/Test@"); ++ assert_valid_jid("mail.com/@"); ++ assert_valid_jid("mail.com/Test@alkjaweflkj"); ++ assert_valid_jid("mark.doliner@mail.com"); ++ assert_valid_jid("mark.doliner@mail.com/Test12345"); ++ assert_valid_jid("mark.doliner@mail.com/Test@12345"); ++ assert_valid_jid("mark.doliner@mail.com/Te/st@12@//345"); + assert_valid_jid("わいど@conference.jabber.org"); + assert_valid_jid("まりるーむ@conference.jabber.org"); +- assert_valid_jid("mark.doliner@gmail.com/まりるーむ"); +- assert_valid_jid("mark.doliner@gmail/stuff.org"); ++ assert_valid_jid("mark.doliner@mail.com/まりるーむ"); ++ assert_valid_jid("mark.doliner@mail/stuff.org"); + assert_valid_jid("stuart@nödåtXäYZ.se"); + assert_valid_jid("stuart@nödåtXäYZ.se/まりるーむ"); + assert_valid_jid("mark.doliner@わいど.org"); +@@ -123,17 +123,17 @@ + assert_valid_jid("pa=ul@10.0.42.230"); + assert_valid_jid("pa,ul@10.0.42.230"); + +- assert_invalid_jid("@gmail.com"); +- assert_invalid_jid("@@gmail.com"); +- assert_invalid_jid("mark.doliner@@gmail.com/Test12345"); +- assert_invalid_jid("mark@doliner@gmail.com/Test12345"); +- assert_invalid_jid("@gmail.com/Test@12345"); ++ assert_invalid_jid("@mail.com"); ++ assert_invalid_jid("@@mail.com"); ++ assert_invalid_jid("mark.doliner@@mail.com/Test12345"); ++ assert_invalid_jid("mark@doliner@mail.com/Test12345"); ++ assert_invalid_jid("@mail.com/Test@12345"); + assert_invalid_jid("/Test@12345"); + assert_invalid_jid("mark.doliner@"); + assert_invalid_jid("mark.doliner/"); +- assert_invalid_jid("mark.doliner@gmail_stuff.org"); +- assert_invalid_jid("mark.doliner@gmail[stuff.org"); +- assert_invalid_jid("mark.doliner@gmail\\stuff.org"); ++ assert_invalid_jid("mark.doliner@mail_stuff.org"); ++ assert_invalid_jid("mark.doliner@mail[stuff.org"); ++ assert_invalid_jid("mark.doliner@mail\\stuff.org"); + assert_invalid_jid("paul@[::1]124"); + assert_invalid_jid("paul@2[::1]124/as"); + assert_invalid_jid("paul@まつ.おおかみ/\x01"); +diff -Nur pidgin-2.10.7/libpurple/tests/tests.h pidgin-2.10.7-nonprism/libpurple/tests/tests.h +--- pidgin-2.10.7/libpurple/tests/tests.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/tests.h 2013-08-16 22:56:18.999567027 -0300 +@@ -13,8 +13,6 @@ + Suite * jabber_digest_md5_suite(void); + Suite * jabber_jutil_suite(void); + Suite * jabber_scram_suite(void); +-Suite * oscar_util_suite(void); +-Suite * yahoo_util_suite(void); + Suite * util_suite(void); + Suite * xmlnode_suite(void); + +diff -Nur pidgin-2.10.7/libpurple/util.c pidgin-2.10.7-nonprism/libpurple/util.c +--- pidgin-2.10.7/libpurple/util.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/util.c 2013-08-16 23:29:38.062434329 -0300 +@@ -3451,8 +3451,7 @@ + * is set to TRUE if this URL is https, otherwise it is set to + * FALSE. But that change will break the API. + * +- * This is important for Yahoo! web messenger login. They now +- * force https login, and if you access the web messenger login ++ * They now force https login, and if you access the web messenger login + * page via http then it redirects you to the https version, but + * purple_util_fetch_url() ignores the "https" and attempts to + * fetch the URL via http again, which gets redirected again. +@@ -4943,18 +4942,6 @@ + return buf; + } + +-const char *_purple_oscar_convert(const char *act, const char *protocol) +-{ +- if (act && purple_strequal(protocol, "prpl-oscar")) { +- int i; +- for (i = 0; act[i] != '\0'; i++) +- if (!isdigit(act[i])) +- return "prpl-aim"; +- return "prpl-icq"; +- } +- return protocol; +-} +- + void purple_restore_default_signal_handlers(void) + { + #ifndef _WIN32 +diff -Nur pidgin-2.10.7/libpurple/util.h pidgin-2.10.7-nonprism/libpurple/util.h +--- pidgin-2.10.7/libpurple/util.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/util.h 2013-08-16 23:31:12.535403448 -0300 +@@ -456,8 +456,7 @@ + /** + * Extracts a field of data from HTML. + * +- * This is a scary function. See protocols/msn/msn.c and +- * protocols/yahoo/yahoo_profile.c for example usage. ++ * This is a scary function. + * + * @param str The string to parse. + * @param len The size of str. +@@ -1450,16 +1449,6 @@ + const char *purple_escape_filename(const char *str); + + /** +- * This is added temporarily to assist the split of oscar into aim and icq. +- * This should not be used by plugins. +- * +- * @deprecated This function should not be used in new code and should be +- * removed in 3.0.0. The aim/icq prpl split happened a long +- * time ago, and we don't need to keep migrating old data. +- */ +-const char *_purple_oscar_convert(const char *act, const char *protocol); +- +-/** + * Restore default signal handlers for signals which might reasonably have + * handlers. This should be called by a fork()'d child process, since child processes + * inherit the handlers of the parent. +diff -Nur pidgin-2.10.7/pidgin/gtkaccount.c pidgin-2.10.7-nonprism/pidgin/gtkaccount.c +--- pidgin-2.10.7/pidgin/gtkaccount.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkaccount.c 2013-08-27 22:45:35.495576079 -0300 +@@ -563,16 +563,11 @@ + if (value == NULL) + value = purple_account_user_split_get_default_value(split); + +- /* Google Talk default domain hackery! */ + menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); + item = gtk_menu_get_active(GTK_MENU(menu)); +- if (value == NULL && g_object_get_data(G_OBJECT(item), "fakegoogle") && ++ if (value == NULL && g_object_get_data(G_OBJECT(item), "") && + !strcmp(purple_account_user_split_get_text(split), _("Domain"))) +- value = "gmail.com"; +- +- if (value == NULL && g_object_get_data(G_OBJECT(item), "fakefacebook") && +- !strcmp(purple_account_user_split_get_text(split), _("Domain"))) +- value = "chat.facebook.com"; ++ value = ""; + + if (value != NULL) + gtk_entry_set_text(GTK_ENTRY(entry), value); +@@ -925,10 +920,6 @@ + model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); + opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); + +- if (g_object_get_data(G_OBJECT(item), "fakefacebook") && +- !strcmp(opt_entry->setting, "connection_security")) +- str_value = "opportunistic_tls"; +- + /* Loop through list of PurpleKeyValuePair items */ + for (node = list; node != NULL; node = node->next) { + if (node->data != NULL) { +diff -Nur pidgin-2.10.7/pidgin/gtkblist.c pidgin-2.10.7-nonprism/pidgin/gtkblist.c +--- pidgin-2.10.7/pidgin/gtkblist.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkblist.c 2013-08-16 23:10:16.549286879 -0300 +@@ -2126,10 +2126,6 @@ + char *temp_vcard; + char *s, *c; + char *alias = NULL; +- GList *aims = NULL; +- GList *icqs = NULL; +- GList *yahoos = NULL; +- GList *msns = NULL; + GList *jabbers = NULL; + + s = temp_vcard = g_strdup(vcard); +@@ -2168,24 +2164,14 @@ + /* We only want to worry about a few fields here. */ + if (!strcmp(field, "FN")) + alias = g_strdup(value); +- else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") || +- !strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") || +- !strcmp(field, "X-JABBER")) ++ else if (!strcmp(field, "X-JABBER")) + { + char **values = g_strsplit(value, ":", 0); + char **im; + + for (im = values; *im != NULL; im++) + { +- if (!strcmp(field, "X-AIM")) +- aims = g_list_append(aims, g_strdup(*im)); +- else if (!strcmp(field, "X-ICQ")) +- icqs = g_list_append(icqs, g_strdup(*im)); +- else if (!strcmp(field, "X-YAHOO")) +- yahoos = g_list_append(yahoos, g_strdup(*im)); +- else if (!strcmp(field, "X-MSN")) +- msns = g_list_append(msns, g_strdup(*im)); +- else if (!strcmp(field, "X-JABBER")) ++ if (!strcmp(field, "X-JABBER")) + jabbers = g_list_append(jabbers, g_strdup(*im)); + } + +@@ -2195,18 +2181,13 @@ + + g_free(temp_vcard); + +- if (aims == NULL && icqs == NULL && yahoos == NULL && +- msns == NULL && jabbers == NULL) ++ if (jabbers == NULL) + { + g_free(alias); + + return FALSE; + } + +- add_buddies_from_vcard("prpl-aim", group, aims, alias); +- add_buddies_from_vcard("prpl-icq", group, icqs, alias); +- add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias); +- add_buddies_from_vcard("prpl-msn", group, msns, alias); + add_buddies_from_vcard("prpl-jabber", group, jabbers, alias); + + g_free(alias); +diff -Nur pidgin-2.10.7/pidgin/gtkdialogs.c pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c +--- pidgin-2.10.7/pidgin/gtkdialogs.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c 2013-08-16 21:37:21.863154130 -0300 +@@ -615,16 +615,6 @@ + #endif + #endif + +-#if defined(_WIN32) || defined(USE_INTERNAL_LIBGADU) +- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Internal<br/>"); +-#else +-#ifdef HAVE_LIBGADU +- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Enabled<br/>"); +-#else +- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Disabled<br/>"); +-#endif +-#endif +- + #ifdef USE_GTKSPELL + g_string_append(str, " <b>GtkSpell:</b> Enabled<br/>"); + #else +diff -Nur pidgin-2.10.7/pidgin/gtkimhtml.c pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c +--- pidgin-2.10.7/pidgin/gtkimhtml.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c 2013-08-16 22:59:51.862994429 -0300 +@@ -2440,7 +2440,6 @@ + static gboolean smooth_scroll_cb(gpointer data); + + /* +- <KingAnt> marv: The two IM image functions in oscar are purple_odc_send_im and purple_odc_incoming + + + [19:58] <Robot101> marv: images go into the imgstore, a refcounted... well.. hash. :) +diff -Nur pidgin-2.10.7/pidgin/gtknotify.c pidgin-2.10.7-nonprism/pidgin/gtknotify.c +--- pidgin-2.10.7/pidgin/gtknotify.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtknotify.c 2013-08-27 23:37:23.037593200 -0300 +@@ -1263,10 +1263,6 @@ + command = g_strdup_printf("xdg-open %s", escaped); + g_free(tmp); + } +- else if (purple_running_osx() == TRUE) +- { +- command = g_strdup_printf("open %s", escaped); +- } + else if (!strcmp(web_browser, "epiphany") || + !strcmp(web_browser, "galeon")) + { +@@ -1289,30 +1285,31 @@ + { + command = g_strdup_printf("kfmclient openURL %s", escaped); + /* +- * Does Konqueror have options to open in new tab ++ * Does Konqueror-libre have options to open in new tab + * and/or current window? + */ + } +- else if (!strcmp(web_browser, "mozilla") || +- !strcmp(web_browser, "mozilla-firebird") || +- !strcmp(web_browser, "firefox") || +- !strcmp(web_browser, "seamonkey")) ++ else if (!strcmp(web_browser, "iceweasel") || ++ !strcmp(web_browser, "icecat") || ++ !strcmp(web_browser, "iceape")) + { + char *args = ""; + + command = g_strdup_printf("%s %s", web_browser, escaped); + + /* +- * Firefox 0.9 and higher require a "-a firefox" option when ++ * Iceweasel-libre 0.9 and higher require a "-a iceweasel" option when + * using -remote commands. This breaks older versions of + * mozilla. So we include this other handly little string +- * when calling firefox. If the API for remote calls changes +- * any more in firefox then firefox should probably be split ++ * when calling iceweasel. If the API for remote calls changes ++ * any more in iceweasel then iceweasel should probably be split + * apart from mozilla-firebird and mozilla... but this is good + * for now. + */ +- if (!strcmp(web_browser, "firefox")) +- args = "-a firefox"; ++ if (!strcmp(web_browser, "iceweasel")) ++ args = "-a iceweasel"; ++ else if (!strcmp(web_browser, "icecat")) ++ args = "-a icecat"; + + if (place == PIDGIN_BROWSER_NEW_WINDOW) + remote_command = g_strdup_printf("%s %s -remote " +@@ -1327,58 +1324,12 @@ + "openURL(%s)", + web_browser, args, escaped); + } +- else if (!strcmp(web_browser, "netscape")) +- { +- command = g_strdup_printf("netscape %s", escaped); +- +- if (place == PIDGIN_BROWSER_NEW_WINDOW) +- { +- remote_command = g_strdup_printf("netscape -remote " +- "openURL(%s,new-window)", +- escaped); +- } +- else if (place == PIDGIN_BROWSER_CURRENT) +- { +- remote_command = g_strdup_printf("netscape -remote " +- "openURL(%s)", escaped); +- } +- } +- else if (!strcmp(web_browser, "opera")) +- { +- if (place == PIDGIN_BROWSER_NEW_WINDOW) +- command = g_strdup_printf("opera -newwindow %s", escaped); +- else if (place == PIDGIN_BROWSER_NEW_TAB) +- command = g_strdup_printf("opera -newpage %s", escaped); +- else if (place == PIDGIN_BROWSER_CURRENT) +- { +- remote_command = g_strdup_printf("opera -remote " +- "openURL(%s)", escaped); +- command = g_strdup_printf("opera %s", escaped); +- } +- else +- command = g_strdup_printf("opera %s", escaped); +- +- } +- else if (!strcmp(web_browser, "google-chrome")) +- { +- /* Google Chrome doesn't have command-line arguments that control the +- * opening of links from external calls. This is controlled solely from +- * a preference within Google Chrome. */ +- command = g_strdup_printf("google-chrome %s", escaped); +- } +- else if (!strcmp(web_browser, "chrome")) +- { +- /* Chromium doesn't have command-line arguments that control the +- * opening of links from external calls. This is controlled solely from +- * a preference within Chromium. */ +- command = g_strdup_printf("chrome %s", escaped); +- } +- else if (!strcmp(web_browser, "chromium-browser")) ++ else if (!strcmp(web_browser, "chromium")) + { +- /* Chromium doesn't have command-line arguments that control the ++ /* Chromium-libre doesn't have command-line arguments that control the + * opening of links from external calls. This is controlled solely from +- * a preference within Chromium. */ +- command = g_strdup_printf("chromium-browser %s", escaped); ++ * a preference within Chromium-libre. */ ++ command = g_strdup_printf("chromium %s", escaped); + } + else if (!strcmp(web_browser, "custom")) + { +diff -Nur pidgin-2.10.7/pidgin/gtkprefs.c pidgin-2.10.7-nonprism/pidgin/gtkprefs.c +--- pidgin-2.10.7/pidgin/gtkprefs.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkprefs.c 2013-08-27 22:55:58.523782666 -0300 +@@ -1851,24 +1851,15 @@ + + /* Sorted reverse alphabetically */ + static const struct browser possible_browsers[] = { +- {N_("Seamonkey"), "seamonkey"}, +- {N_("Opera"), "opera"}, +- {N_("Netscape"), "netscape"}, +- {N_("Mozilla"), "mozilla"}, +- {N_("Konqueror"), "kfmclient"}, +- {N_("Google Chrome"), "google-chrome"}, +- /* Do not move the line below. Code below expects gnome-open to be in +- * this list immediately after xdg-open! */ ++ {N_("Iceape-libre"), "iceape"}, ++ {N_("Konqueror-libre"), "kfmclient"}, + {N_("Desktop Default"), "xdg-open"}, + {N_("GNOME Default"), "gnome-open"}, +- {N_("Galeon"), "galeon"}, +- {N_("Firefox"), "firefox"}, +- {N_("Firebird"), "mozilla-firebird"}, +- {N_("Epiphany"), "epiphany"}, +- /* Translators: please do not translate "chromium-browser" here! */ +- {N_("Chromium (chromium-browser)"), "chromium-browser"}, +- /* Translators: please do not translate "chrome" here! */ +- {N_("Chromium (chrome)"), "chrome"} ++ {N_("Iceweasel-libre"), "iceweasel"}, ++ {N_("Icecat"), "icecat"}, ++ {N_("Epiphany-libre"), "epiphany"}, ++ /* Translators: please do not translate "chromium" here! */ ++ {N_("Chromium-libre (chromium)"), "chromium"}, + }; + static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers); + +diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c +--- pidgin-2.10.7/pidgin/gtkutils.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkutils.c 2013-08-16 19:59:22.633298587 -0300 +@@ -677,7 +677,6 @@ + GdkPixbuf *pixbuf = NULL; + GtkSizeGroup *sg; + GList *p; +- const char *gtalk_name = NULL, *facebook_name = NULL; + int i; + + aop_menu = g_malloc0(sizeof(AopMenu)); +@@ -686,55 +685,12 @@ + gtk_widget_show(aop_menu->menu); + sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + +- if (purple_find_prpl("prpl-jabber")) { +- gtalk_name = _("Google Talk"); +- facebook_name = _("Facebook (XMPP)"); +- } +- + for (p = purple_plugins_get_protocols(), i = 0; + p != NULL; + p = p->next, i++) { + + plugin = (PurplePlugin *)p->data; + +- if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) { +- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", +- "16", "google-talk.png", NULL); +- GtkWidget *item; +- +- pixbuf = pidgin_pixbuf_new_from_file(filename); +- g_free(filename); +- +- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), +- item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol")); +- g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1)); +- +- if (pixbuf) +- g_object_unref(pixbuf); +- +- gtalk_name = NULL; +- i++; +- } +- +- if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) { +- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", +- "16", "facebook.png", NULL); +- GtkWidget *item; +- +- pixbuf = pidgin_pixbuf_new_from_file(filename); +- g_free(filename); +- +- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), +- item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol")); +- g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1)); +- +- if (pixbuf) +- g_object_unref(pixbuf); +- +- facebook_name = NULL; +- i++; +- } +- + pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL); + + gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), +diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.c pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c +--- pidgin-2.10.7/pidgin/gtkwhiteboard.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c 2013-08-16 23:25:21.614375960 -0300 +@@ -339,13 +339,10 @@ + */ + /* XXXX because otherwise gettext will see this string, even though it's + * in an #if 0 block. Remove the XXXX if you want to use this code. +- * But, it really shouldn't be a Yahoo-specific string. ;) */ ++ */ + purple_conv_im_write(PURPLE_CONV_IM(conv), "", XXXX_("Sent Doodle request."), + PURPLE_MESSAGE_NICK | PURPLE_MESSAGE_RECV, time(NULL)); + +- yahoo_doodle_command_send_request(gc, to); +- yahoo_doodle_command_send_ready(gc, to); +- + /* Insert this 'session' in the list. At this point, it's only a requested + * session. + */ +@@ -554,15 +551,13 @@ + if(event->button == 1 && pixmap != NULL) + { + /* If the brush was never moved, express two sets of two deltas That's a +- * 'point,' but not for Yahoo! ++ * 'point,' + */ + /* if((event->x == LastX) && (event->y == LastY)) */ + if(MotionCount == 0) + { + int index; + +- /* For Yahoo!, a (0 0) indicates the end of drawing */ +- /* FIXME: Yahoo Doodle specific! */ + for(index = 0; index < 2; index++) + { + draw_list = g_list_append(draw_list, 0); +diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.h pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h +--- pidgin-2.10.7/pidgin/gtkwhiteboard.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h 2013-08-27 23:28:41.018759351 -0300 +@@ -37,8 +37,7 @@ + #define BRUSH_STATE_DOWN 1 + #define BRUSH_STATE_MOTION 2 + +-/* XXX: This seems duplicated with the Yahoo! Doodle prpl code. +- * XXX: How should they work together? */ ++/* XXX: How should they work together? */ + #define PALETTE_NUM_COLORS 7 + + /** +diff -Nur pidgin-2.10.7/pidgin/Makefile.am pidgin-2.10.7-nonprism/pidgin/Makefile.am +--- pidgin-2.10.7/pidgin/Makefile.am 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/Makefile.am 2013-08-16 21:03:34.936610745 -0300 +@@ -160,10 +160,6 @@ + $(GTK_LIBS) \ + $(top_builddir)/libpurple/libpurple.la + +-if USE_INTERNAL_LIBGADU +-INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU +-endif +- + AM_CPPFLAGS = \ + -DDATADIR=\"$(datadir)\" \ + -DLIBDIR=\"$(libdir)/pidgin/\" \ +@@ -179,6 +175,5 @@ + $(GTK_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GTKSPELL_CFLAGS) \ +- $(LIBXML_CFLAGS) \ +- $(INTGG_CFLAGS) ++ $(LIBXML_CFLAGS) + endif # ENABLE_GTK +diff -Nur pidgin-2.10.7/pidgin/Makefile.in pidgin-2.10.7-nonprism/pidgin/Makefile.in +--- pidgin-2.10.7/pidgin/Makefile.in 2013-02-11 07:17:23.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/Makefile.in 2013-08-16 23:56:44.729405978 -0300 +@@ -286,8 +286,6 @@ + FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@ + FARSTREAM_LIBS = @FARSTREAM_LIBS@ + FGREP = @FGREP@ +-GADU_CFLAGS = @GADU_CFLAGS@ +-GADU_LIBS = @GADU_LIBS@ + GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +@@ -349,8 +347,6 @@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@ +-MEANWHILE_LIBS = @MEANWHILE_LIBS@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MONO_CFLAGS = @MONO_CFLAGS@ +@@ -645,7 +641,6 @@ + @ENABLE_GTK_TRUE@ $(GTK_LIBS) \ + @ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la + +-@ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU + @ENABLE_GTK_TRUE@AM_CPPFLAGS = \ + @ENABLE_GTK_TRUE@ -DDATADIR=\"$(datadir)\" \ + @ENABLE_GTK_TRUE@ -DLIBDIR=\"$(libdir)/pidgin/\" \ +diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in +--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in 2013-08-16 23:13:41.759061988 -0300 +@@ -28,8 +28,7 @@ + + + [XMPP] +-# Following XEP-0038 + GTalk + our default set, in default set order +-# The GTalk strings come from ticket #3307. ++# Following XEP-0038 + our default set, in default set order + happy.png :) :-) =) + excited.png :-D :-d :D :d =D =d + sad.png :-( :( +@@ -47,7 +46,7 @@ + foot-in-mouth.png :-! + shout.png >:o >:O + +-# Following XEP-0038 + GTalk ++# Following XEP-0038 + angry.png >:-( >:( X-( x-( + good.png :yes: + bad.png :no: +@@ -75,515 +74,3 @@ + ! skywalker.png C:-) c:-) C:) c:) + ! monkey.png :-(|) :(|) 8-|) + ! cyclops.png O-) o-) +- +- +-# Following AIM 6.1 +-[AIM] +-happy.png :-) :) +-wink.png ;-) ;) +-sad.png :-( :( +-tongue.png :P :p :-P :-p +-shocked.png =-O +-kiss.png :-* +-shout.png >:o +-excited.png :-D :D +-moneymouth.png :-$ +-foot-in-mouth.png :-! +-embarrassed.png :-[ +-angel.png O:-) +-thinking.png :-\\ :-/ +-crying.png :'( +-shut-mouth.png :-X +-glasses-cool.png 8-) +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following Windows Live Messenger 8.1 +-[MSN] +-happy.png :) :-) +-excited.png :D :d :-D :-d +-wink.png ;) ;-) +-shocked.png :-O :-o :O :o +-tongue.png :-P :P :-p :p +-glasses-cool.png (H) (h) +-angry.png :@ :-@ +-embarrassed.png :$ :-$ +-confused.png :S :s :-S :-s +-sad.png :( :-( +-crying.png :'( +-neutral.png :| :-| +-devil.png (6) +-angel.png (A) (a) +-in_love.png (L) (l) +-love-over.png (U) (u) +-msn.png (M) (m) +-cat.png (@) +-dog.png (&) +-moon.png (S) +-star.png (*) +-film.png (~) +-musical-note.png (8) +-mail.png (E) (e) +-rose.png (F) (f) +-rose-dead.png (W) (w) +-clock.png (O) (o) +-kiss.png (K) (k) +-present.png (G) (g) +-cake.png (^) +-camera.png (P) (p) +-lamp.png (I) (i) +-coffee.png (C) (c) +-phone.png (T) (t) +-hug-left.png ({) +-hug-right.png (}) +-beer.png (B) (b) +-drink.png (D) (d) +-boy.png (Z) (z) +-girl.png (X) (x) +-good.png (Y) (y) +-bad.png (N) (n) +-vampire.png :[ :-[ +-goat.png (nah) +-sun.png (#) +-rainbow.png (R) (r) +-quiet.png :-# +-teeth.png 8o| +-glasses-nerdy.png 8-| +-sarcastic.png ^o) +-secret.png :-* +-sick.png +o( +-snail.png (sn) +-turtle.png (tu) +-plate.png (pl) +-bowl.png (||) +-pizza.png (pi) +-soccerball.png (so) +-car.png (au) +-airplane.png (ap) +-umbrella.png (um) +-island.png (ip) +-computer.png (co) +-mobile.png (mp) +-brb.png (brb) +-rain.png (st) +-highfive.png (h5) +-coins.png (mo) +-sheep.png (bah) +-dont-know.png :^) +-thinking.png *-) +-thunder.png (li) +-party.png <:o) +-eyeroll.png 8-) +-sleepy.png |-) +-bunny.png ('.') +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +-# Hidden MSN emotes +-cigarette.png (ci) (CI) +-handcuffs.png (%) +-console.png (xx) (XX) +-fingers-crossed.png (yn) (YN) +- +- +-# Following QQ 2006 +-[QQ] +-shocked.png /:O /jy /surprised +-curl-lip.png /:~ /pz /curl_lip +-desire.png /:* /se /desire +-dazed.png /:| /dazed +-party.png /8-) /dy /revel +-crying.png /:< /ll /cry +-bashful.png /:$ /hx /bashful +-shut-mouth.png /:X /bz /shut_mouth +-sleeping.png /:Z /shui /sleep +-weep.png /:'( /dk /weep +-embarrassed.png /:-| /gg /embarassed +-pissed-off.png /:@ /fn /pissed_off +-act-up.png /:P /tp /act_up +-excited.png /:D /cy /toothy_smile +-happy.png /:) /wx /small_smile +-sad.png /:( /ng /sad +-glasses-cool.png /:+ /kuk /cool +-doctor.png /:# /feid /SARS +-silly.png /:Q /zk /crazy +-sick.png /:T /tu /vomit +-snicker.png /;p /tx /titter +-cute.png /;-D /ka /cute +-disdain.png /;d /by /disdain +-arrogant.png /;o /am /arrogant +-starving.png /:g /jie /starving +-sleepy.png /|-) /kun /sleepy +-terror.png /:! /jk /terror +-hot.png /:L /sweat +-smirk.png /:> /hanx /smirk +-soldier.png /:; /db /soldier +-struggle.png /;f /fendou /struggle +-curse.png /:-S /zhm /curse +-question.png /? /yiw /question +-quiet.png /;x /xu /shh +-hypnotized.png /;@ /yun /dizzy +-excruciating.png /:8 /zhem /excrutiating +-freaked-out.png /;! /shuai /freaked_out +-skeleton.png /!!! /kl /skeleton +-hammer.png /xx /qiao /hammer +-bye.png /bye /zj /bye +-go-away.png /go /shan /go +-afraid.png /shake /fad /shake +-amorous.png /love /aiq /love +-jump.png /jump /tiao /jump +-search.png /find /zhao /search +-lashes.png /& /mm /beautiful_eyebrows +-pig.png /pig /zt /pig +-cat.png /cat /mm /cat +-dog.png /dog /xg /dog +-hug-left.png /hug /yb /hug +-coins.png /$ /qianc /money +-lamp.png /! /dp /lightbulb +-bowl.png /cup /bei /cup +-cake.png /cake /dg /cake +-thunder.png /li /shd /lightning +-bomb.png /bome /zhd /bomb +-knife.png /kn /dao /knife +-soccerball.png /footb /zq /soccer +-musical-note.png /music /yy /music +-poop.png /shit /bb /shit +-coffee.png /coffee /kf /coffee +-hungry.png /eat /fan /eat +-pill.png /pill /yw /pill +-rose.png /rose /mg /rose +-wilt.png /fade /dx /wilt +-kiss.png /kiss /wen /kiss +-in_love.png /heart /xin /heart +-love-over.png /break /xs /broken_heart +-meeting.png /meeting /hy /meeting +-present.png /gift /lw /gift +-phone.png /phone /dh /phone +-clock.png /time /sj /time +-mail.png /email /yj /email +-tv.png /TV /ds /TV +-sun.png /sun /ty /sun +-moon.png /moon /yl /moon +-good.png /strong /qiang /thumbs_up +-bad.png /weak /ruo /thumbs_down +-handshake.png /share /ws /handshake +-victory.png /v /shl /victory +-beauty.png /<J> /mn /beauty +-qq.png /<QQ> /qz /qq +-blowkiss.png /<L> /fw /blow_kiss +-angry.png /<O> /oh /angry +-liquor.png /<B> /bj /baijiu +-can.png /<U> /qsh /soda +-watermelon.png /<W> /xigua /watermelon +-rain.png /<!!> /xy /rain +-cloudy.png /<~> /duoy /cloudy +-snowman.png /<Z> /xr /snowman +-star.png /<*> /xixing /star +-girl.png /<00> /nv /woman +-boy.png /<11> /nan /man +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following ICQ 6.0 +-[ICQ] +-happy.png :-) :) +-neutral.png :-$ +-sad.png :-( :( +-shocked.png =-O +-wink.png ;-) ;) +-tongue.png :-P :P :-p :p +-music.png [:-} +-laugh.png *JOKINGLY* +-sleeping.png *TIRED* +-crying.png :'( :'-( +-sick.png :-! +-kissed.png *KISSED* +-stop.png *STOP* +-kiss.png :-{} :-* +-kissing.png *KISSING* +-victory.png *YAHOO* +-silly.png %) +-embarrassed.png :-[ +-devil.png ]:-> +-angel.png O:-) +-rose.png @}->-- +-shut-mouth.png :-X :X :-x :x +-bomb.png @= +-thinking.png :-\\ :-/ +-good.png *THUMBS\ UP* +-shout.png >:o >:O :-@ +-beer.png *DRINK* +-excited.png :-D :D +-glasses-cool.png 8-) +-amorous.png *IN\ LOVE* +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-hypnotized.png @-) +-on-the-phone.png :)] +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-glasses-nerdy.png :-B :-b +-quiet.png :-$ +-drool.png =P~ =p~ +-lying.png :^O :^o +-call-me.png :-c +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-laugh.png :)) :-)) +-bye.png =; +-arrogant.png [-( +-thinking.png :-? +-waiting.png :-w :-W +-at-wits-end.png ~x( ~X( +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-clown.png :o) :O) +-doh.png #-o #-O +-weep.png :-< +-go-away.png :-h +-lashes.png ;;) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-silly.png 8-} +-clap.png =D> =d> +-mad-tongue.png >:P >:p +-time-out.png :-t :-T +-hug-left.png >:D< >:d< +-love-over.png =(( +-hot.png #:-S #:-s +-rotfl.png =)) :-j :-J +-loser.png L-) l-) +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +-cowboy.png <):) +-desire.png 8-> +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +-# Hidden Yahoo emotes +-alien.png =:) >-) +-beat-up.png b-( B-( +-chicken.png ~:> +-coffee.png ~o) ~O) +-cow.png 3:-O 3:-o +-dance.png \\:D/ \\:d/ +-rose.png @};- +-dont-know.png :-L :-l +-skeleton.png 8-X 8-x +-lamp.png *-:) +-monkey.png :(|) +-coins.png $-) +-peace.png :)>- +-pig.png :@) +-pray.png [-o< [-O< +-pumpkin.png (~~) +-shame.png [-X [-x +-flag.png **== +-clover.png %%- +-musical-note.png :-" +-giggle.png ;)) +-worship.png ^:)^ +-star.png (*) +-waving.png >:/ +-talktohand.png :-@ +- +-# Only available after activating the Yahoo! Fighter IMVironment +-male-fighter1.png o-> O-> +-male-fighter2.png o=> O=> +-female-fighter.png o-+ O-+ +-yin-yang.png (%) +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo JAPAN] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-hypnotized.png @-) +-on-the-phone.png :)] +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-glasses-nerdy.png :-B :-b +-quiet.png :-$ +-drool.png =P~ =p~ +-lying.png :^O :^o +-call-me.png :-c +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-laugh.png :)) :-)) +-bye.png =; +-arrogant.png [-( +-thinking.png :-? +-waiting.png :-w :-W +-at-wits-end.png ~x( ~X( +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-clown.png :o) :O) +-doh.png #-o #-O +-weep.png :-< +-go-away.png :-h +-lashes.png ;;) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-silly.png 8-} +-clap.png =D> =d> +-mad-tongue.png >:P >:p +-time-out.png :-t :-T +-hug-left.png >:D< >:d< +-love-over.png =(( +-hot.png #:-S #:-s +-rotfl.png =)) :-j :-J +-loser.png L-) l-) +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +-cowboy.png <):) +-desire.png 8-> +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) +- +-# Hidden Yahoo emotes +-alien.png =:) >-) +-beat-up.png b-( B-( +-chicken.png ~:> +-coffee.png ~o) ~O) +-cow.png 3:-O 3:-o +-dance.png \\:D/ \\:d/ +-rose.png @};- +-dont-know.png :-L :-l +-skeleton.png 8-X 8-x +-lamp.png *-:) +-monkey.png :(|) +-coins.png $-) +-peace.png :)>- +-pig.png :@) +-pray.png [-o< [-O< +-pumpkin.png (~~) +-shame.png [-X [-x +-flag.png **== +-clover.png %%- +-musical-note.png :-" +-giggle.png ;)) +-worship.png ^:)^ +-star.png (*) +-waving.png >:/ +-talktohand.png :-@ +- +-# Only available after activating the Yahoo! Fighter IMVironment +-male-fighter1.png o-> O-> +-male-fighter2.png o=> O=> +-female-fighter.png o-+ O-+ +-yin-yang.png (%) +- +- +-# Following MySpaceIM Beta 1.0.697.0 +-[MySpaceIM] +-excited.png :D :-D +-devil.png }:) +-confused.png :Z +-glasses-nerdy.png B) +-bulgy-eyes.png %) +-freaked-out.png :E +-happy.png :) :-) +-amorous.png :X +-laugh.png :)) +-mohawk.png -: +-mad-tongue.png X( +-messed.png X) +-glasses-nerdy.png Q) +-doh.png :G +-pirate.png P) +-shocked.png :O +-sidefrown.png :{ +-sinister.png :B +-smirk.png :, +-neutral.png :| +-tongue.png :P :p +-pissed-off.png B| +-wink.png ;-) ;) +-sad.png :[ +-kiss.png :x +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# MXit standard emoticons +-[MXit] +-happy.png :-) :) +-sad.png :-( :( +-wink.png ;-) ;) +-excited.png :-D :D :-> :> +-neutral.png :-| :| +-shocked.png :-O :O +-tongue.png :-P :P +-embarrassed.png :-$ :$ +-glasses-cool.png 8-) +-in_love.png (H) +-rose.png (F) +-### Added in v3.0 +-boy.png (m) +-girl.png (f) +-star.png (*) +-chilli.png (c) +-kiss.png (x) +-lamp.png (i) +-pissed-off.png :e :-e +-shut-mouth.png :-x :x +-thunder.png (z) +-coffee.png (U) +-mrgreen.png (G) +-### Added in v5.0 +-sick.png :o( +-excruciating.png :-{ :{ +-amorous.png :-} :} +-eyeroll.png 8-o 8o +-crying.png :'( +-thinking.png :-? :? +-drool.png :-~ :~ +-sleeping.png :-z :z +-lying.png :L) +-glasses-nerdy.png 8-| 8| +-pirate.png P-) +-### Added in v5.9.7 +-bored.png :-[ :[ +-cold.png :-< :< +-confused.png :-, :, +-hungry.png :-C :C +-stressed.png :-s :s +diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme +--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme 2013-02-11 07:17:58.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme 2013-08-16 23:15:55.929941297 -0300 +@@ -28,8 +28,7 @@ + + + [XMPP] +-# Following XEP-0038 + GTalk + our default set, in default set order +-# The GTalk strings come from ticket #3307. ++# Following XEP-0038 + our default set, in default set order + happy.png :) :-) =) + excited.png :-D :-d :D :d =D =d + sad.png :-( :( +@@ -47,7 +46,7 @@ + foot-in-mouth.png :-! + shout.png >:o >:O + +-# Following XEP-0038 + GTalk ++# Following XEP-0038 + angry.png >:-( >:( X-( x-( + good.png :yes: + bad.png :no: +@@ -75,515 +74,3 @@ + ! skywalker.png C:-) c:-) C:) c:) + ! monkey.png :-(|) :(|) 8-|) + ! cyclops.png O-) o-) +- +- +-# Following AIM 6.1 +-[AIM] +-happy.png :-) :) +-wink.png ;-) ;) +-sad.png :-( :( +-tongue.png :P :p :-P :-p +-shocked.png =-O +-kiss.png :-* +-shout.png >:o +-excited.png :-D :D +-moneymouth.png :-$ +-foot-in-mouth.png :-! +-embarrassed.png :-[ +-angel.png O:-) +-thinking.png :-\\ :-/ +-crying.png :'( +-shut-mouth.png :-X +-glasses-cool.png 8-) +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following Windows Live Messenger 8.1 +-[MSN] +-happy.png :) :-) +-excited.png :D :d :-D :-d +-wink.png ;) ;-) +-shocked.png :-O :-o :O :o +-tongue.png :-P :P :-p :p +-glasses-cool.png (H) (h) +-angry.png :@ :-@ +-embarrassed.png :$ :-$ +-confused.png :S :s :-S :-s +-sad.png :( :-( +-crying.png :'( +-neutral.png :| :-| +-devil.png (6) +-angel.png (A) (a) +-in_love.png (L) (l) +-love-over.png (U) (u) +-msn.png (M) (m) +-cat.png (@) +-dog.png (&) +-moon.png (S) +-star.png (*) +-film.png (~) +-musical-note.png (8) +-mail.png (E) (e) +-rose.png (F) (f) +-rose-dead.png (W) (w) +-clock.png (O) (o) +-kiss.png (K) (k) +-present.png (G) (g) +-cake.png (^) +-camera.png (P) (p) +-lamp.png (I) (i) +-coffee.png (C) (c) +-phone.png (T) (t) +-hug-left.png ({) +-hug-right.png (}) +-beer.png (B) (b) +-drink.png (D) (d) +-boy.png (Z) (z) +-girl.png (X) (x) +-good.png (Y) (y) +-bad.png (N) (n) +-vampire.png :[ :-[ +-goat.png (nah) +-sun.png (#) +-rainbow.png (R) (r) +-quiet.png :-# +-teeth.png 8o| +-glasses-nerdy.png 8-| +-sarcastic.png ^o) +-secret.png :-* +-sick.png +o( +-snail.png (sn) +-turtle.png (tu) +-plate.png (pl) +-bowl.png (||) +-pizza.png (pi) +-soccerball.png (so) +-car.png (au) +-airplane.png (ap) +-umbrella.png (um) +-island.png (ip) +-computer.png (co) +-mobile.png (mp) +-brb.png (brb) +-rain.png (st) +-highfive.png (h5) +-coins.png (mo) +-sheep.png (bah) +-dont-know.png :^) +-thinking.png *-) +-thunder.png (li) +-party.png <:o) +-eyeroll.png 8-) +-sleepy.png |-) +-bunny.png ('.') +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +-# Hidden MSN emotes +-cigarette.png (ci) (CI) +-handcuffs.png (%) +-console.png (xx) (XX) +-fingers-crossed.png (yn) (YN) +- +- +-# Following QQ 2006 +-[QQ] +-shocked.png /:O /jy /surprised +-curl-lip.png /:~ /pz /curl_lip +-desire.png /:* /se /desire +-dazed.png /:| /dazed +-party.png /8-) /dy /revel +-crying.png /:< /ll /cry +-bashful.png /:$ /hx /bashful +-shut-mouth.png /:X /bz /shut_mouth +-sleeping.png /:Z /shui /sleep +-weep.png /:'( /dk /weep +-embarrassed.png /:-| /gg /embarassed +-pissed-off.png /:@ /fn /pissed_off +-act-up.png /:P /tp /act_up +-excited.png /:D /cy /toothy_smile +-happy.png /:) /wx /small_smile +-sad.png /:( /ng /sad +-glasses-cool.png /:+ /kuk /cool +-doctor.png /:# /feid /SARS +-silly.png /:Q /zk /crazy +-sick.png /:T /tu /vomit +-snicker.png /;p /tx /titter +-cute.png /;-D /ka /cute +-disdain.png /;d /by /disdain +-arrogant.png /;o /am /arrogant +-starving.png /:g /jie /starving +-sleepy.png /|-) /kun /sleepy +-terror.png /:! /jk /terror +-hot.png /:L /sweat +-smirk.png /:> /hanx /smirk +-soldier.png /:; /db /soldier +-struggle.png /;f /fendou /struggle +-curse.png /:-S /zhm /curse +-question.png /? /yiw /question +-quiet.png /;x /xu /shh +-hypnotized.png /;@ /yun /dizzy +-excruciating.png /:8 /zhem /excrutiating +-freaked-out.png /;! /shuai /freaked_out +-skeleton.png /!!! /kl /skeleton +-hammer.png /xx /qiao /hammer +-bye.png /bye /zj /bye +-go-away.png /go /shan /go +-afraid.png /shake /fad /shake +-amorous.png /love /aiq /love +-jump.png /jump /tiao /jump +-search.png /find /zhao /search +-lashes.png /& /mm /beautiful_eyebrows +-pig.png /pig /zt /pig +-cat.png /cat /mm /cat +-dog.png /dog /xg /dog +-hug-left.png /hug /yb /hug +-coins.png /$ /qianc /money +-lamp.png /! /dp /lightbulb +-bowl.png /cup /bei /cup +-cake.png /cake /dg /cake +-thunder.png /li /shd /lightning +-bomb.png /bome /zhd /bomb +-knife.png /kn /dao /knife +-soccerball.png /footb /zq /soccer +-musical-note.png /music /yy /music +-poop.png /shit /bb /shit +-coffee.png /coffee /kf /coffee +-hungry.png /eat /fan /eat +-pill.png /pill /yw /pill +-rose.png /rose /mg /rose +-wilt.png /fade /dx /wilt +-kiss.png /kiss /wen /kiss +-in_love.png /heart /xin /heart +-love-over.png /break /xs /broken_heart +-meeting.png /meeting /hy /meeting +-present.png /gift /lw /gift +-phone.png /phone /dh /phone +-clock.png /time /sj /time +-mail.png /email /yj /email +-tv.png /TV /ds /TV +-sun.png /sun /ty /sun +-moon.png /moon /yl /moon +-good.png /strong /qiang /thumbs_up +-bad.png /weak /ruo /thumbs_down +-handshake.png /share /ws /handshake +-victory.png /v /shl /victory +-beauty.png /<J> /mn /beauty +-qq.png /<QQ> /qz /qq +-blowkiss.png /<L> /fw /blow_kiss +-angry.png /<O> /oh /angry +-liquor.png /<B> /bj /baijiu +-can.png /<U> /qsh /soda +-watermelon.png /<W> /xigua /watermelon +-rain.png /<!!> /xy /rain +-cloudy.png /<~> /duoy /cloudy +-snowman.png /<Z> /xr /snowman +-star.png /<*> /xixing /star +-girl.png /<00> /nv /woman +-boy.png /<11> /nan /man +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following ICQ 6.0 +-[ICQ] +-happy.png :-) :) +-neutral.png :-$ +-sad.png :-( :( +-shocked.png =-O +-wink.png ;-) ;) +-tongue.png :-P :P :-p :p +-music.png [:-} +-laugh.png *JOKINGLY* +-sleeping.png *TIRED* +-crying.png :'( :'-( +-sick.png :-! +-kissed.png *KISSED* +-stop.png *STOP* +-kiss.png :-{} :-* +-kissing.png *KISSING* +-victory.png *YAHOO* +-silly.png %) +-embarrassed.png :-[ +-devil.png ]:-> +-angel.png O:-) +-rose.png @}->-- +-shut-mouth.png :-X :X :-x :x +-bomb.png @= +-thinking.png :-\\ :-/ +-good.png *THUMBS\ UP* +-shout.png >:o >:O :-@ +-beer.png *DRINK* +-excited.png :-D :D +-glasses-cool.png 8-) +-amorous.png *IN\ LOVE* +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-hypnotized.png @-) +-on-the-phone.png :)] +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-glasses-nerdy.png :-B :-b +-quiet.png :-$ +-drool.png =P~ =p~ +-lying.png :^O :^o +-call-me.png :-c +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-laugh.png :)) :-)) +-bye.png =; +-arrogant.png [-( +-thinking.png :-? +-waiting.png :-w :-W +-at-wits-end.png ~x( ~X( +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-clown.png :o) :O) +-doh.png #-o #-O +-weep.png :-< +-go-away.png :-h +-lashes.png ;;) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-silly.png 8-} +-clap.png =D> =d> +-mad-tongue.png >:P >:p +-time-out.png :-t :-T +-hug-left.png >:D< >:d< +-love-over.png =(( +-hot.png #:-S #:-s +-rotfl.png =)) :-j :-J +-loser.png L-) l-) +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +-cowboy.png <):) +-desire.png 8-> +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +-# Hidden Yahoo emotes +-alien.png =:) >-) +-beat-up.png b-( B-( +-chicken.png ~:> +-coffee.png ~o) ~O) +-cow.png 3:-O 3:-o +-dance.png \\:D/ \\:d/ +-rose.png @};- +-dont-know.png :-L :-l +-skeleton.png 8-X 8-x +-lamp.png *-:) +-monkey.png :(|) +-coins.png $-) +-peace.png :)>- +-pig.png :@) +-pray.png [-o< [-O< +-pumpkin.png (~~) +-shame.png [-X [-x +-flag.png **== +-clover.png %%- +-musical-note.png :-" +-giggle.png ;)) +-worship.png ^:)^ +-star.png (*) +-waving.png >:/ +-talktohand.png :-@ +- +-# Only available after activating the Yahoo! Fighter IMVironment +-male-fighter1.png o-> O-> +-male-fighter2.png o=> O=> +-female-fighter.png o-+ O-+ +-yin-yang.png (%) +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo JAPAN] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-hypnotized.png @-) +-on-the-phone.png :)] +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-glasses-nerdy.png :-B :-b +-quiet.png :-$ +-drool.png =P~ =p~ +-lying.png :^O :^o +-call-me.png :-c +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-laugh.png :)) :-)) +-bye.png =; +-arrogant.png [-( +-thinking.png :-? +-waiting.png :-w :-W +-at-wits-end.png ~x( ~X( +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-clown.png :o) :O) +-doh.png #-o #-O +-weep.png :-< +-go-away.png :-h +-lashes.png ;;) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-silly.png 8-} +-clap.png =D> =d> +-mad-tongue.png >:P >:p +-time-out.png :-t :-T +-hug-left.png >:D< >:d< +-love-over.png =(( +-hot.png #:-S #:-s +-rotfl.png =)) :-j :-J +-loser.png L-) l-) +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +-cowboy.png <):) +-desire.png 8-> +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) +- +-# Hidden Yahoo emotes +-alien.png =:) >-) +-beat-up.png b-( B-( +-chicken.png ~:> +-coffee.png ~o) ~O) +-cow.png 3:-O 3:-o +-dance.png \\:D/ \\:d/ +-rose.png @};- +-dont-know.png :-L :-l +-skeleton.png 8-X 8-x +-lamp.png *-:) +-monkey.png :(|) +-coins.png $-) +-peace.png :)>- +-pig.png :@) +-pray.png [-o< [-O< +-pumpkin.png (~~) +-shame.png [-X [-x +-flag.png **== +-clover.png %%- +-musical-note.png :-" +-giggle.png ;)) +-worship.png ^:)^ +-star.png (*) +-waving.png >:/ +-talktohand.png :-@ +- +-# Only available after activating the Yahoo! Fighter IMVironment +-male-fighter1.png o-> O-> +-male-fighter2.png o=> O=> +-female-fighter.png o-+ O-+ +-yin-yang.png (%) +- +- +-# Following MySpaceIM Beta 1.0.697.0 +-[MySpaceIM] +-excited.png :D :-D +-devil.png }:) +-confused.png :Z +-glasses-nerdy.png B) +-bulgy-eyes.png %) +-freaked-out.png :E +-happy.png :) :-) +-amorous.png :X +-laugh.png :)) +-mohawk.png -: +-mad-tongue.png X( +-messed.png X) +-glasses-nerdy.png Q) +-doh.png :G +-pirate.png P) +-shocked.png :O +-sidefrown.png :{ +-sinister.png :B +-smirk.png :, +-neutral.png :| +-tongue.png :P :p +-pissed-off.png B| +-wink.png ;-) ;) +-sad.png :[ +-kiss.png :x +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# MXit standard emoticons +-[MXit] +-happy.png :-) :) +-sad.png :-( :( +-wink.png ;-) ;) +-excited.png :-D :D :-> :> +-neutral.png :-| :| +-shocked.png :-O :O +-tongue.png :-P :P +-embarrassed.png :-$ :$ +-glasses-cool.png 8-) +-in_love.png (H) +-rose.png (F) +-### Added in v3.0 +-boy.png (m) +-girl.png (f) +-star.png (*) +-chilli.png (c) +-kiss.png (x) +-lamp.png (i) +-pissed-off.png :e :-e +-shut-mouth.png :-x :x +-thunder.png (z) +-coffee.png (U) +-mrgreen.png (G) +-### Added in v5.0 +-sick.png :o( +-excruciating.png :-{ :{ +-amorous.png :-} :} +-eyeroll.png 8-o 8o +-crying.png :'( +-thinking.png :-? :? +-drool.png :-~ :~ +-sleeping.png :-z :z +-lying.png :L) +-glasses-nerdy.png 8-| 8| +-pirate.png P-) +-### Added in v5.9.7 +-bored.png :-[ :[ +-cold.png :-< :< +-confused.png :-, :, +-hungry.png :-C :C +-stressed.png :-s :s +diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in +--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in 2013-08-16 23:19:01.815778718 -0300 +@@ -22,8 +22,7 @@ + + + [XMPP] +-# Following XEP-0038 + GTalk + our default set, in default set order +-# The GTalk strings come from ticket #3307. ++# Following XEP-0038 + our default set, in default set order + happy.png :) :-) =) + excited.png :-D :-d :D :d =D =d + sad.png :-( :( +@@ -38,7 +37,7 @@ + angel.png O:-) o:-) + shut-mouth.png :-X + +-# Following XEP-0038 + GTalk ++# Following XEP-0038 + angry.png >:-( >:( X-( x-( + rose.png @->-- :rose: + phone.png :telephone: +@@ -53,269 +52,3 @@ + neutral.png :| :-| + + # Hidden icons from the default set. +- +- +-# Following AIM 6.1 +-[AIM] +-happy.png :-) :) +-wink.png ;-) ;) +-sad.png :-( :( +-tongue.png :P :p :-P :-p +-shocked.png =-O +-kiss.png :-* +-excited.png :-D :D +-embarrassed.png :-[ +-angel.png O:-) +-thinking.png :-\\ :-/ +-crying.png :'( +-shut-mouth.png :-X +-glasses-cool.png 8-) +- +- +-# Following Windows Live Messenger 8.1 +-[MSN] +-happy.png :) :-) +-excited.png :D :d :-D :-d +-wink.png ;) ;-) +-shocked.png :-O :-o :O :o +-tongue.png :-P :P :-p :p +-glasses-cool.png (H) (h) +-angry.png :@ :-@ +-embarrassed.png :$ :-$ +-confused.png :S :s :-S :-s +-sad.png :( :-( +-crying.png :'( +-neutral.png :| :-| +-devil.png (6) +-angel.png (A) (a) +-in_love.png (L) (l) +-star.png (*) +-musical-note.png (8) +-rose.png (F) (f) +-kiss.png (K) (k) +-camera.png (P) (p) +-lamp.png (I) (i) +-coffee.png (C) (c) +-phone.png (T) (t) +-hug-left.png ({) +-hug-right.png (}) +-beer.png (B) (b) +-boy.png (Z) (z) +-girl.png (X) (x) +-sarcastic.png ^o) +-sick.png +o( +-plate.png (pl) +-mobile.png (mp) +-dont-know.png :^) +-thinking.png *-) +-thunder.png (li) +-party.png <:o) +-eyeroll.png 8-) +-sleepy.png |-) +- +-# Hidden MSN emotes +-cigarette.png (ci) (CI) +-console.png (xx) (XX) +- +- +-# Following QQ 2006 +-[QQ] +-shocked.png /:O /jy /surprised +-party.png /8-) /dy /revel +-crying.png /:< /ll /cry +-shut-mouth.png /:X /bz /shut_mouth +-sleeping.png /:Z /shui /sleep +-embarrassed.png /:-| /gg /embarassed +-pissed-off.png /:@ /fn /pissed_off +-excited.png /:D /cy /toothy_smile +-happy.png /:) /wx /small_smile +-sad.png /:( /ng /sad +-glasses-cool.png /:+ /kuk /cool +-sick.png /:T /tu /vomit +-sleepy.png /|-) /kun /sleepy +-hot.png /:L /sweat +-question.png /? /yiw /question +-excruciating.png /:8 /zhem /excrutiating +-afraid.png /shake /fad /shake +-amorous.png /love /aiq /love +-search.png /find /zhao /search +-hug-left.png /hug /yb /hug +-lamp.png /! /dp /lightbulb +-thunder.png /li /shd /lightning +-musical-note.png /music /yy /music +-coffee.png /coffee /kf /coffee +-hungry.png /eat /fan /eat +-rose.png /rose /mg /rose +-kiss.png /kiss /wen /kiss +-in_love.png /heart /xin /heart +-meeting.png /meeting /hy /meeting +-phone.png /phone /dh /phone +-tv.png /TV /ds /TV +-angry.png /<O> /oh /angry +-girl.png /<00> /nv /woman +-boy.png /<11> /nan /man +- +- +-# Following ICQ 6.0 +-[ICQ] +-happy.png :-) :) +-neutral.png :-$ +-sad.png :-( :( +-shocked.png =-O +-wink.png ;-) ;) +-tongue.png :-P :P :-p :p +-music.png [:-} +-sleeping.png *TIRED* +-crying.png :'( :'-( +-sick.png :-! +-kiss.png :-{} :-* +-embarrassed.png :-[ +-devil.png ]:-> +-angel.png O:-) +-rose.png @}->-- +-shut-mouth.png :-X :X :-x :x +-thinking.png :-\\ :-/ +-beer.png *DRINK* +-excited.png :-D :D +-glasses-cool.png 8-) +-amorous.png *IN\ LOVE* +- +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-drool.png =P~ =p~ +-lying.png :^O :^o +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-thinking.png :-? +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-hug-left.png >:D< >:d< +-hot.png #:-S #:-s +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +- +-# Hidden Yahoo emotes +-coffee.png ~o) ~O) +-rose.png @};- +-dont-know.png :-L :-l +-lamp.png *-:) +-shame.png [-X [-x +-musical-note.png :-" +-star.png (*) +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo JAPAN] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-wink.png ;) ;-) +-thinking.png :-? +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-hug-left.png >:D< >:d< +-party.png <:-P <:-p +- +-# Hidden Yahoo emotes +-coffee.png ~o) ~O) +-rose.png @};- +-dont-know.png :-L :-l +-lamp.png *-:) +-shame.png [-X [-x +-musical-note.png :-" +-star.png (*) +- +- +-# Following MySpaceIM Beta 1.0.697.0 +-[MySpaceIM] +-excited.png :D :-D +-devil.png }:) +-confused.png :Z +-happy.png :) :-) +-amorous.png :X +-pirate.png P) +-shocked.png :O +-neutral.png :| +-tongue.png :P :p +-pissed-off.png B| +-wink.png ;-) ;) +-sad.png :[ +-kiss.png :x +- +-# MXit standard emoticons +-[MXit] +-happy.png :-) :) +-sad.png :-( :( +-wink.png ;-) ;) +-excited.png :-D :D :-> :> +-neutral.png :-| :| +-shocked.png :-O :O +-tongue.png :-P :P +-embarrassed.png :-$ :$ +-glasses-cool.png 8-) +-in_love.png (H) +-rose.png (F) +-### Added in v3.0 +-boy.png (m) +-girl.png (f) +-star.png (*) +-chilli.png (c) +-kiss.png (x) +-lamp.png (i) +-pissed-off.png :e :-e +-shut-mouth.png :-x :x +-thunder.png (z) +-coffee.png (U) +-mrgreen.png (G) +-### Added in v5.0 +-sick.png :o( +-excruciating.png :-{ :{ +-amorous.png :-} :} +-eyeroll.png 8-o 8o +-crying.png :'( +-thinking.png :-? :? +-drool.png :-~ :~ +-sleeping.png :-z :z +-lying.png :L) +-glasses-nerdy.png 8-| 8| +-pirate.png P-) +-### Added in v5.9.7 +-bored.png :-[ :[ +-cold.png :-< :< +-confused.png :-, :, +-hungry.png :-C :C +-stressed.png :-s :s +diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme +--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme 2013-02-11 07:17:58.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme 2013-08-16 23:17:03.828740061 -0300 +@@ -22,8 +22,7 @@ + + + [XMPP] +-# Following XEP-0038 + GTalk + our default set, in default set order +-# The GTalk strings come from ticket #3307. ++# Following XEP-0038 + our default set, in default set order + happy.png :) :-) =) + excited.png :-D :-d :D :d =D =d + sad.png :-( :( +@@ -38,7 +37,7 @@ + angel.png O:-) o:-) + shut-mouth.png :-X + +-# Following XEP-0038 + GTalk ++# Following XEP-0038 + angry.png >:-( >:( X-( x-( + rose.png @->-- :rose: + phone.png :telephone: +@@ -53,269 +52,3 @@ + neutral.png :| :-| + + # Hidden icons from the default set. +- +- +-# Following AIM 6.1 +-[AIM] +-happy.png :-) :) +-wink.png ;-) ;) +-sad.png :-( :( +-tongue.png :P :p :-P :-p +-shocked.png =-O +-kiss.png :-* +-excited.png :-D :D +-embarrassed.png :-[ +-angel.png O:-) +-thinking.png :-\\ :-/ +-crying.png :'( +-shut-mouth.png :-X +-glasses-cool.png 8-) +- +- +-# Following Windows Live Messenger 8.1 +-[MSN] +-happy.png :) :-) +-excited.png :D :d :-D :-d +-wink.png ;) ;-) +-shocked.png :-O :-o :O :o +-tongue.png :-P :P :-p :p +-glasses-cool.png (H) (h) +-angry.png :@ :-@ +-embarrassed.png :$ :-$ +-confused.png :S :s :-S :-s +-sad.png :( :-( +-crying.png :'( +-neutral.png :| :-| +-devil.png (6) +-angel.png (A) (a) +-in_love.png (L) (l) +-star.png (*) +-musical-note.png (8) +-rose.png (F) (f) +-kiss.png (K) (k) +-camera.png (P) (p) +-lamp.png (I) (i) +-coffee.png (C) (c) +-phone.png (T) (t) +-hug-left.png ({) +-hug-right.png (}) +-beer.png (B) (b) +-boy.png (Z) (z) +-girl.png (X) (x) +-sarcastic.png ^o) +-sick.png +o( +-plate.png (pl) +-mobile.png (mp) +-dont-know.png :^) +-thinking.png *-) +-thunder.png (li) +-party.png <:o) +-eyeroll.png 8-) +-sleepy.png |-) +- +-# Hidden MSN emotes +-cigarette.png (ci) (CI) +-console.png (xx) (XX) +- +- +-# Following QQ 2006 +-[QQ] +-shocked.png /:O /jy /surprised +-party.png /8-) /dy /revel +-crying.png /:< /ll /cry +-shut-mouth.png /:X /bz /shut_mouth +-sleeping.png /:Z /shui /sleep +-embarrassed.png /:-| /gg /embarassed +-pissed-off.png /:@ /fn /pissed_off +-excited.png /:D /cy /toothy_smile +-happy.png /:) /wx /small_smile +-sad.png /:( /ng /sad +-glasses-cool.png /:+ /kuk /cool +-sick.png /:T /tu /vomit +-sleepy.png /|-) /kun /sleepy +-hot.png /:L /sweat +-question.png /? /yiw /question +-excruciating.png /:8 /zhem /excrutiating +-afraid.png /shake /fad /shake +-amorous.png /love /aiq /love +-search.png /find /zhao /search +-hug-left.png /hug /yb /hug +-lamp.png /! /dp /lightbulb +-thunder.png /li /shd /lightning +-musical-note.png /music /yy /music +-coffee.png /coffee /kf /coffee +-hungry.png /eat /fan /eat +-rose.png /rose /mg /rose +-kiss.png /kiss /wen /kiss +-in_love.png /heart /xin /heart +-meeting.png /meeting /hy /meeting +-phone.png /phone /dh /phone +-tv.png /TV /ds /TV +-angry.png /<O> /oh /angry +-girl.png /<00> /nv /woman +-boy.png /<11> /nan /man +- +- +-# Following ICQ 6.0 +-[ICQ] +-happy.png :-) :) +-neutral.png :-$ +-sad.png :-( :( +-shocked.png =-O +-wink.png ;-) ;) +-tongue.png :-P :P :-p :p +-music.png [:-} +-sleeping.png *TIRED* +-crying.png :'( :'-( +-sick.png :-! +-kiss.png :-{} :-* +-embarrassed.png :-[ +-devil.png ]:-> +-angel.png O:-) +-rose.png @}->-- +-shut-mouth.png :-X :X :-x :x +-thinking.png :-\\ :-/ +-beer.png *DRINK* +-excited.png :-D :D +-glasses-cool.png 8-) +-amorous.png *IN\ LOVE* +- +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-drool.png =P~ =p~ +-lying.png :^O :^o +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-thinking.png :-? +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-hug-left.png >:D< >:d< +-hot.png #:-S #:-s +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +- +-# Hidden Yahoo emotes +-coffee.png ~o) ~O) +-rose.png @};- +-dont-know.png :-L :-l +-lamp.png *-:) +-shame.png [-X [-x +-musical-note.png :-" +-star.png (*) +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo JAPAN] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-wink.png ;) ;-) +-thinking.png :-? +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-hug-left.png >:D< >:d< +-party.png <:-P <:-p +- +-# Hidden Yahoo emotes +-coffee.png ~o) ~O) +-rose.png @};- +-dont-know.png :-L :-l +-lamp.png *-:) +-shame.png [-X [-x +-musical-note.png :-" +-star.png (*) +- +- +-# Following MySpaceIM Beta 1.0.697.0 +-[MySpaceIM] +-excited.png :D :-D +-devil.png }:) +-confused.png :Z +-happy.png :) :-) +-amorous.png :X +-pirate.png P) +-shocked.png :O +-neutral.png :| +-tongue.png :P :p +-pissed-off.png B| +-wink.png ;-) ;) +-sad.png :[ +-kiss.png :x +- +-# MXit standard emoticons +-[MXit] +-happy.png :-) :) +-sad.png :-( :( +-wink.png ;-) ;) +-excited.png :-D :D :-> :> +-neutral.png :-| :| +-shocked.png :-O :O +-tongue.png :-P :P +-embarrassed.png :-$ :$ +-glasses-cool.png 8-) +-in_love.png (H) +-rose.png (F) +-### Added in v3.0 +-boy.png (m) +-girl.png (f) +-star.png (*) +-chilli.png (c) +-kiss.png (x) +-lamp.png (i) +-pissed-off.png :e :-e +-shut-mouth.png :-x :x +-thunder.png (z) +-coffee.png (U) +-mrgreen.png (G) +-### Added in v5.0 +-sick.png :o( +-excruciating.png :-{ :{ +-amorous.png :-} :} +-eyeroll.png 8-o 8o +-crying.png :'( +-thinking.png :-? :? +-drool.png :-~ :~ +-sleeping.png :-z :z +-lying.png :L) +-glasses-nerdy.png 8-| 8| +-pirate.png P-) +-### Added in v5.9.7 +-bored.png :-[ :[ +-cold.png :-< :< +-confused.png :-, :, +-hungry.png :-C :C +-stressed.png :-s :s +diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.am pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am +--- pidgin-2.10.7/pidgin/pixmaps/Makefile.am 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am 2013-08-17 00:00:17.335924146 -0300 +@@ -204,37 +204,19 @@ + emotes/small/16/scalable/pidgin-emotes.svg + + PROTOCOLS_16_SCALABLE = \ +- protocols/16/scalable/aim.svg \ + protocols/16/scalable/bonjour.svg \ +- protocols/16/scalable/gadu-gadu.svg \ +- protocols/16/scalable/novell.svg \ +- protocols/16/scalable/icq.svg \ + protocols/16/scalable/irc.svg \ + protocols/16/scalable/jabber.svg \ +- protocols/16/scalable/meanwhile.svg \ +- protocols/16/scalable/msn.svg \ + protocols/16/scalable/silc.svg \ + protocols/16/scalable/simple.svg \ +- protocols/16/scalable/yahoo.svg \ + protocols/16/scalable/zephyr.svg + + PROTOCOLS_16 = \ +- protocols/16/aim.png \ + protocols/16/bonjour.png \ +- protocols/16/facebook.png \ +- protocols/16/gadu-gadu.png \ +- protocols/16/google-talk.png \ +- protocols/16/novell.png \ +- protocols/16/icq.png \ + protocols/16/irc.png \ + protocols/16/jabber.png \ +- protocols/16/meanwhile.png \ +- protocols/16/msn.png \ +- protocols/16/mxit.png \ +- protocols/16/myspace.png \ + protocols/16/silc.png \ + protocols/16/simple.png \ +- protocols/16/yahoo.png \ + protocols/16/zephyr.png + + ICONS_16_SCALABLE = \ +@@ -259,72 +241,35 @@ + ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg + + PROTOCOLS_22_SCALABLE = \ +- protocols/22/scalable/aim.svg \ + protocols/22/scalable/bonjour.svg \ +- protocols/22/scalable/gadu-gadu.svg \ +- protocols/22/scalable/novell.svg \ +- protocols/22/scalable/icq.svg \ + protocols/22/scalable/irc.svg \ + protocols/22/scalable/jabber.svg \ +- protocols/22/scalable/meanwhile.svg \ +- protocols/22/scalable/msn.svg \ + protocols/22/scalable/silc.svg \ + protocols/22/scalable/simple.svg \ +- protocols/22/scalable/yahoo.svg \ + protocols/22/scalable/zephyr.svg + + PROTOCOLS_22 = \ +- protocols/22/aim.png \ + protocols/22/bonjour.png \ +- protocols/22/facebook.png \ +- protocols/22/gadu-gadu.png \ +- protocols/22/google-talk.png \ +- protocols/22/novell.png \ +- protocols/22/icq.png \ + protocols/22/irc.png \ + protocols/22/jabber.png \ +- protocols/22/meanwhile.png \ +- protocols/22/msn.png \ +- protocols/22/mxit.png \ +- protocols/22/myspace.png \ + protocols/22/silc.png \ + protocols/22/simple.png \ +- protocols/22/yahoo.png \ + protocols/22/zephyr.png + + PROTOCOLS_48 = \ +- protocols/48/aim.png \ + protocols/48/bonjour.png \ +- protocols/48/facebook.png \ +- protocols/48/gadu-gadu.png \ +- protocols/48/novell.png \ +- protocols/48/icq.png \ + protocols/48/irc.png \ + protocols/48/jabber.png \ +- protocols/48/meanwhile.png \ +- protocols/48/msn.png \ +- protocols/48/mxit.png \ +- protocols/48/myspace.png \ + protocols/48/silc.png \ + protocols/48/simple.png \ +- protocols/48/yahoo.png \ + protocols/48/zephyr.png + + PROTOCOLS_SCALABLE = \ +- protocols/scalable/aim.svg \ + protocols/scalable/bonjour.svg \ +- protocols/scalable/gadu-gadu.svg \ +- protocols/scalable/google-talk.svg \ +- protocols/scalable/novell.svg \ +- protocols/scalable/icq.svg \ + protocols/scalable/irc.svg \ + protocols/scalable/jabber.svg \ +- protocols/scalable/meanwhile.svg \ +- protocols/scalable/msn.svg \ +- protocols/scalable/mxit.svg \ + protocols/scalable/silc.svg \ + protocols/scalable/simple.svg \ +- protocols/scalable/yahoo.svg \ + protocols/scalable/zephyr.svg + + STATUS_11 = \ +diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.in pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in +--- pidgin-2.10.7/pidgin/pixmaps/Makefile.in 2013-02-11 07:17:23.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in 2013-08-16 23:59:52.918508551 -0300 +@@ -240,40 +240,19 @@ + emblems/scalable/male.svg emblems/scalable/not-authorized.svg \ + emblems/scalable/secure.svg emblems/scalable/unavailable.svg \ + emblems/scalable/video.svg emblems/scalable/voice.svg \ +- protocols/16/aim.png protocols/16/bonjour.png \ +- protocols/16/facebook.png protocols/16/gadu-gadu.png \ +- protocols/16/google-talk.png protocols/16/novell.png \ +- protocols/16/icq.png protocols/16/irc.png \ +- protocols/16/jabber.png protocols/16/meanwhile.png \ +- protocols/16/msn.png protocols/16/mxit.png \ +- protocols/16/myspace.png protocols/16/silc.png \ +- protocols/16/simple.png protocols/16/yahoo.png \ +- protocols/16/zephyr.png protocols/22/aim.png \ +- protocols/22/bonjour.png protocols/22/facebook.png \ +- protocols/22/gadu-gadu.png protocols/22/google-talk.png \ +- protocols/22/novell.png protocols/22/icq.png \ +- protocols/22/irc.png protocols/22/jabber.png \ +- protocols/22/meanwhile.png protocols/22/msn.png \ +- protocols/22/mxit.png protocols/22/myspace.png \ +- protocols/22/silc.png protocols/22/simple.png \ +- protocols/22/yahoo.png protocols/22/zephyr.png \ +- protocols/48/aim.png protocols/48/bonjour.png \ +- protocols/48/facebook.png protocols/48/gadu-gadu.png \ +- protocols/48/novell.png protocols/48/icq.png \ +- protocols/48/irc.png protocols/48/jabber.png \ +- protocols/48/meanwhile.png protocols/48/msn.png \ +- protocols/48/mxit.png protocols/48/myspace.png \ +- protocols/48/silc.png protocols/48/simple.png \ +- protocols/48/yahoo.png protocols/48/zephyr.png \ +- protocols/scalable/aim.svg protocols/scalable/bonjour.svg \ +- protocols/scalable/gadu-gadu.svg \ +- protocols/scalable/google-talk.svg \ +- protocols/scalable/novell.svg protocols/scalable/icq.svg \ +- protocols/scalable/irc.svg protocols/scalable/jabber.svg \ +- protocols/scalable/meanwhile.svg protocols/scalable/msn.svg \ +- protocols/scalable/mxit.svg protocols/scalable/silc.svg \ +- protocols/scalable/simple.svg protocols/scalable/yahoo.svg \ +- protocols/scalable/zephyr.svg status/11/available.png \ ++ protocols/16/bonjour.png protocols/16/irc.png \ ++ protocols/16/jabber.png protocols/16/silc.png \ ++ protocols/16/simple.png protocols/16/zephyr.png \ ++ protocols/22/bonjour.png protocols/22/irc.png \ ++ protocols/22/jabber.png protocols/22/silc.png \ ++ protocols/22/simple.png protocols/22/zephyr.png \ ++ protocols/48/bonjour.png protocols/48/irc.png \ ++ protocols/48/jabber.png protocols/48/silc.png \ ++ protocols/48/simple.png protocols/48/zephyr.png \ ++ protocols/scalable/bonjour.svg protocols/scalable/irc.svg \ ++ protocols/scalable/jabber.svg protocols/scalable/silc.svg \ ++ protocols/scalable/simple.svg protocols/scalable/zephyr.svg \ ++ status/11/available.png \ + status/11/away.png status/11/busy.png status/11/chat.png \ + status/11/extended-away.png status/11/invisible.png \ + status/11/log-in.png status/11/log-out.png \ +@@ -443,8 +422,6 @@ + FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@ + FARSTREAM_LIBS = @FARSTREAM_LIBS@ + FGREP = @FGREP@ +-GADU_CFLAGS = @GADU_CFLAGS@ +-GADU_LIBS = @GADU_LIBS@ + GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +@@ -506,8 +483,6 @@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@ +-MEANWHILE_LIBS = @MEANWHILE_LIBS@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MONO_CFLAGS = @MONO_CFLAGS@ +@@ -850,37 +825,19 @@ + @INSTALL_PIXMAPS_TRUE@ emotes/small/16/scalable/pidgin-emotes.svg + + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16_SCALABLE = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/aim.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/bonjour.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/gadu-gadu.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/novell.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/icq.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/irc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/jabber.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/meanwhile.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/msn.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/silc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/simple.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/yahoo.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/zephyr.svg + + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16 = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/aim.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/bonjour.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/facebook.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/gadu-gadu.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/google-talk.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/novell.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/icq.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/irc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/jabber.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/meanwhile.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/msn.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/mxit.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/myspace.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/silc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/simple.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/yahoo.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/zephyr.png + + @INSTALL_PIXMAPS_TRUE@ICONS_16_SCALABLE = \ +@@ -899,72 +856,35 @@ + @INSTALL_PIXMAPS_TRUE@ICONS_48 = icons/hicolor/48x48/apps/pidgin.png + @INSTALL_PIXMAPS_TRUE@ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22_SCALABLE = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/aim.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/bonjour.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/gadu-gadu.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/novell.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/icq.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/irc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/jabber.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/meanwhile.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/msn.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/silc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/simple.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/yahoo.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/zephyr.svg + + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22 = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/aim.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/bonjour.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/facebook.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/gadu-gadu.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/google-talk.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/novell.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/icq.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/irc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/jabber.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/meanwhile.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/msn.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/mxit.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/myspace.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/silc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/simple.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/yahoo.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/zephyr.png + + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_48 = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/aim.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/bonjour.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/facebook.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/gadu-gadu.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/novell.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/icq.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/irc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/jabber.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/meanwhile.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/msn.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/mxit.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/myspace.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/silc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/simple.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/yahoo.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/zephyr.png + + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_SCALABLE = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/aim.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/bonjour.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/gadu-gadu.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/google-talk.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/novell.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/icq.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/irc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/jabber.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/meanwhile.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/msn.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/mxit.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/silc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/simple.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/yahoo.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/zephyr.svg + + @INSTALL_PIXMAPS_TRUE@STATUS_11 = \ +diff -Nur pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c +--- pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c 2013-08-16 23:39:46.921427463 -0300 +@@ -250,9 +250,6 @@ + const char *from; + const char *to; + } disco_type_mappings[] = { +- { "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */ +- { "sametime", "meanwhile" }, +- { "myspaceim", "myspace" }, + { "xmpp", "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */ + { NULL, NULL } + }; +diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c +--- pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c 2013-08-16 21:26:56.293625899 -0300 +@@ -288,21 +288,13 @@ + { + EContact *contact = E_CONTACT(c->data); + const char *name; +- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs; ++ GList *jabbers; + + name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); + +- aims = e_contact_get(contact, E_CONTACT_IM_AIM); + jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER); +- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); +- msns = e_contact_get(contact, E_CONTACT_IM_MSN); +- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); +- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); +- ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU); +- +- if (aims == NULL && jabbers == NULL && yahoos == NULL && +- msns == NULL && icqs == NULL && novells == NULL && +- ggs == NULL) ++ ++ if (jabbers == NULL) + { + GtkTreeIter iter; + +@@ -315,13 +307,7 @@ + } + else + { +- add_ims(dialog, contact, name, aims, "prpl-aim"); + add_ims(dialog, contact, name, jabbers, "prpl-jabber"); +- add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); +- add_ims(dialog, contact, name, msns, "prpl-msn"); +- add_ims(dialog, contact, name, icqs, "prpl-icq"); +- add_ims(dialog, contact, name, novells, "prpl-novell"); +- add_ims(dialog, contact, name, ggs, "prpl-gg"); + } + } + +@@ -367,7 +353,7 @@ + { + EContact *contact = E_CONTACT(l->data); + const char *name; +- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs; ++ GList *jabbers; + + name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); + +@@ -377,17 +363,9 @@ + continue; + } + +- aims = e_contact_get(contact, E_CONTACT_IM_AIM); + jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER); +- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); +- msns = e_contact_get(contact, E_CONTACT_IM_MSN); +- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); +- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); +- ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU); +- +- if (aims == NULL && jabbers == NULL && yahoos == NULL && +- msns == NULL && icqs == NULL && novells == NULL && +- ggs == NULL) ++ ++ if (jabbers == NULL) + { + GtkTreeIter iter; + +@@ -400,13 +378,7 @@ + } + else + { +- add_ims(dialog, contact, name, aims, "prpl-aim"); + add_ims(dialog, contact, name, jabbers, "prpl-jabber"); +- add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); +- add_ims(dialog, contact, name, msns, "prpl-msn"); +- add_ims(dialog, contact, name, icqs, "prpl-icq"); +- add_ims(dialog, contact, name, novells, "prpl-novell"); +- add_ims(dialog, contact, name, ggs, "prpl-gg"); + } + } + } +diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c +--- pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c 2013-08-16 21:14:05.483056049 -0300 +@@ -119,13 +119,7 @@ + + name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); + +- update_ims_from_contact(contact, name, "prpl-aim", E_CONTACT_IM_AIM); + update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER); +- update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO); +- update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN); +- update_ims_from_contact(contact, name, "prpl-icq", E_CONTACT_IM_ICQ); +- update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE); +- update_ims_from_contact(contact, name, "prpl-gg", E_CONTACT_IM_GADUGADU); + } + + static void +diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c +--- pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c 2013-08-16 23:20:45.692374640 -0300 +@@ -99,20 +99,8 @@ + + protocol_id = purple_account_get_protocol_id(account); + +- if (!strcmp(protocol_id, "prpl-aim")) +- protocol_field = E_CONTACT_IM_AIM; +- else if (!strcmp(protocol_id, "prpl-icq")) +- protocol_field = E_CONTACT_IM_ICQ; +- else if (!strcmp(protocol_id, "prpl-msn")) +- protocol_field = E_CONTACT_IM_MSN; +- else if (!strcmp(protocol_id, "prpl-yahoo")) +- protocol_field = E_CONTACT_IM_YAHOO; +- else if (!strcmp(protocol_id, "prpl-jabber")) ++ if (!strcmp(protocol_id, "prpl-jabber")) + protocol_field = E_CONTACT_IM_JABBER; +- else if (!strcmp(protocol_id, "prpl-novell")) +- protocol_field = E_CONTACT_IM_GROUPWISE; +- else if (!strcmp(protocol_id, "prpl-gg")) +- protocol_field = E_CONTACT_IM_GADUGADU; + + return protocol_field; + } +@@ -169,18 +157,6 @@ + { + PurpleAccount *account = purple_buddy_get_account(buddy); + const char *prpl_id = purple_account_get_protocol_id(account); +- +- if (!strcmp(prpl_id, "prpl-msn")) +- { +- mail = g_strdup(purple_normalize(account, +- purple_buddy_get_name(buddy))); +- } +- else if (!strcmp(prpl_id, "prpl-yahoo")) +- { +- mail = g_strdup_printf("%s@yahoo.com", +- purple_normalize(account, +- purple_buddy_get_name(buddy))); +- } + } + + return mail; +diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c +--- pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c 2013-08-16 21:23:26.207116339 -0300 +@@ -141,20 +141,8 @@ + if (*email) + e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email); + +- if (!strcmp(im_service, "prpl-aim")) +- field = E_CONTACT_IM_AIM; +- else if (!strcmp(im_service, "prpl-icq")) +- field = E_CONTACT_IM_ICQ; +- else if (!strcmp(im_service, "prpl-yahoo")) +- field = E_CONTACT_IM_YAHOO; +- else if (!strcmp(im_service, "prpl-jabber")) ++ if (!strcmp(im_service, "prpl-jabber")) + field = E_CONTACT_IM_JABBER; +- else if (!strcmp(im_service, "prpl-msn")) +- field = E_CONTACT_IM_MSN; +- else if (!strcmp(im_service, "prpl-novell")) +- field = E_CONTACT_IM_GROUPWISE; +- else if (!strcmp(im_service, "prpl-gg")) +- field = E_CONTACT_IM_GADUGADU; + + if (field > 0) + { +diff -Nur pidgin-2.10.7/pidgin.apspec.in pidgin-2.10.7-nonprism/pidgin.apspec.in +--- pidgin-2.10.7/pidgin.apspec.in 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin.apspec.in 2013-08-16 20:53:14.523862926 -0300 +@@ -14,17 +14,13 @@ + + [Description] + Pidgin allows you to talk to anyone using a variety of messaging protocols, +-including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP, +-Gadu-Gadu, and Zephyr. These protocols are implemented using a ++including IRC, XMPP and Zephyr. These protocols are implemented using a + modular, easy to use design. To use a protocol, just add an account using the + account editor. + + Pidgin supports many common features of other clients, as well as many unique + features, such as perl scripting, TCL scripting and C plugins. + +-Pidgin is NOT affiliated with or endorsed by America Online, Inc., Microsoft +-Corporation, Yahoo! Inc., or ICQ Inc. +- + [BuildPrepare] + APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-gtktest --disable-glibtest --disable-vv --disable-fortify + #APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-vv +diff -Nur pidgin-2.10.7/pidgin.desktop.in pidgin-2.10.7-nonprism/pidgin.desktop.in +--- pidgin-2.10.7/pidgin.desktop.in 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin.desktop.in 2013-08-16 23:07:34.874212867 -0300 +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Pidgin Internet Messenger + _GenericName=Internet Messenger +-_Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more ++_Comment=Chat over IM. Supports IRC, Jabber/XMPP and more + Exec=pidgin + Icon=pidgin + StartupNotify=true +diff -Nur pidgin-2.10.7/pidgin.spec pidgin-2.10.7-nonprism/pidgin.spec +--- pidgin-2.10.7/pidgin.spec 2013-02-11 07:17:59.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin.spec 2013-08-17 00:03:18.474815955 -0300 +@@ -34,7 +34,6 @@ + %{!?_without_startupnotification:BuildRequires: startup-notification-devel} + %{?_with_avahi:BuildRequires: avahi-glib-devel} + %{!?_without_gtkspell:BuildRequires: gtkspell-devel} +-%{?_with_meanwhile:BuildRequires: meanwhile-devel} + %{?_with_mono:BuildRequires: mono-devel} + %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2} + %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h} +@@ -105,7 +104,6 @@ + Group: Applications/Internet + Obsoletes: gaim-silc + Obsoletes: gaim-tcl +-Obsoletes: gaim-gadugadu + Obsoletes: pidgin-tcl < 2.0.0 + Obsoletes: pidgin-silc < 2.0.0 + Obsoletes: libpurple-perl < %{version} +@@ -131,13 +129,6 @@ + Requires: libpurple >= %{apiver} + %endif + +-%if 0%{?_with_meanwhile:1} +-%package -n libpurple-meanwhile +-Summary: Lotus Sametime plugin for Pidgin using the Meanwhile library +-Group: Applications/Internet +-Requires: libpurple >= %{apiver} +-%endif +- + %if 0%{?_with_mono:1} + %package -n libpurple-mono + Summary: Mono .NET plugin support for Pidgin +@@ -161,18 +152,14 @@ + + %description + Pidgin allows you to talk to anyone using a variety of messaging +-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu, +-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and +-Zephyr. These protocols are implemented using a modular, easy to ++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr. ++These protocols are implemented using a modular, easy to + use design. To use a protocol, just add an account using the + account editor. + + Pidgin supports many common features of other clients, as well as many + unique features, such as perl scripting, TCL scripting and C plugins. + +-Pidgin is not affiliated with or endorsed by America Online, Inc., +-Microsoft Corporation, Yahoo! Inc., or ICQ Inc. +- + %description devel + The pidgin-devel package contains the header files, developer + documentation, and libraries required for development of Pidgin scripts +@@ -182,9 +169,8 @@ + libpurple contains the core IM support for IM clients such as Pidgin + and Finch. + +-libpurple supports a variety of messaging protocols including AIM, MSN, +-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, +-Lotus Sametime, SILC, Simple and Zephyr. ++libpurple supports a variety of messaging protocols including XMPP, ++Bonjour, IRC, SILC, Simple and Zephyr. + + %description -n libpurple-devel + The libpurple-devel package contains the header files, developer +@@ -196,11 +182,6 @@ + Bonjour plugin for Pidgin. + %endif + +-%if 0%{?_with_meanwhile:1} +-%description -n libpurple-meanwhile +-Lotus Sametime plugin for Pidgin using the Meanwhile library. +-%endif +- + %if 0%{?_with_mono:1} + %description -n libpurple-mono + Mono plugin loader for Pidgin. This package will allow you to write or +@@ -236,7 +217,6 @@ + %{!?_with_vv:--disable-vv} \ + %{!?_with_dbus:--disable-dbus} \ + %{!?_with_avahi:--disable-avahi} \ +- %{!?_with_meanwhile:--disable-meanwhile} \ + %{?_without_gstreamer:--disable-gstreamer} \ + %{?_without_gtkspell:--disable-gtkspell} \ + %{?_without_nm:--disable-nm} \ +@@ -258,9 +238,7 @@ + rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la + rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod + find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';' +@@ -271,10 +249,6 @@ + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so + %endif + +-%if 0%{!?_with_meanwhile:1} +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so +-%endif +- + %if 0%{!?_with_mono:1} + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll +@@ -299,7 +273,6 @@ + find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v /libbonjour.so | \ +- grep -v /libsametime.so | \ + grep -v /mono.so | \ + grep -v ".dll$" > %{name}-%{version}-purpleplugins + +@@ -435,13 +408,6 @@ + %{_libdir}/purple-2/libbonjour.* + %endif + +-%if 0%{?_with_meanwhile:1} +-%files -n libpurple-meanwhile +-%defattr(-, root, root) +- +-%{_libdir}/purple-2/libsametime.* +-%endif +- + %if 0%{?_with_mono:1} + %files -n libpurple-mono + %defattr(-, root, root) +@@ -492,9 +458,6 @@ + * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com> + - Update to reflect changes in perl module installation directories + +-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com> +-- Fix building without meanwhile support +- + * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com> + - Add "--without nm" support to build without NetworkManager + +@@ -586,8 +549,6 @@ + - Update to reflect renaming to pidgin/libpurple + + * Sun Oct 1 2006 Stu Tomlinson <stu@nosnilmot.com> +-- We can build with internal gadu gadu again, so bring it back into the +- main package + - Deal with gconf schame uninstallation on package upgrade and removal + + * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com> +@@ -606,19 +567,14 @@ + - Source RPM uses tar.bz2 now to save space + - Update BuildRequires for new intltool dependencies + - Add a --with perlmakehack option to allow builds to succeed on RH9 +-- Add a --with gadugadu to build (separate) gaim-gadugadu package + + * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com> + - Add support for beta versions so the subsequent releases are seen as newer + by RPM +-- Split of sametime support to gaim-meanwhile + - Use make DESTDIR=... instead of overloading prefix etc. when installing + - Default build to include cyrus-sasl support in Jabber + - Add --with dbus to build with DBUS support + +-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net> +-- Added obsoletes gaim-meanwhile +- + * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com> + - Add separate gaim-bonjour package if built with --with-howl + - Add separate gaim-mono package if built with --with-mono +diff -Nur pidgin-2.10.7/pidgin.spec.in pidgin-2.10.7-nonprism/pidgin.spec.in +--- pidgin-2.10.7/pidgin.spec.in 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin.spec.in 2013-08-17 00:07:12.251996234 -0300 +@@ -34,7 +34,6 @@ + %{!?_without_startupnotification:BuildRequires: startup-notification-devel} + %{?_with_avahi:BuildRequires: avahi-glib-devel} + %{!?_without_gtkspell:BuildRequires: gtkspell-devel} +-%{?_with_meanwhile:BuildRequires: meanwhile-devel} + %{?_with_mono:BuildRequires: mono-devel} + %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2} + %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h} +@@ -105,7 +104,6 @@ + Group: Applications/Internet + Obsoletes: gaim-silc + Obsoletes: gaim-tcl +-Obsoletes: gaim-gadugadu + Obsoletes: pidgin-tcl < 2.0.0 + Obsoletes: pidgin-silc < 2.0.0 + Obsoletes: libpurple-perl < %{version} +@@ -131,13 +129,6 @@ + Requires: libpurple >= %{apiver} + %endif + +-%if 0%{?_with_meanwhile:1} +-%package -n libpurple-meanwhile +-Summary: Lotus Sametime plugin for Pidgin using the Meanwhile library +-Group: Applications/Internet +-Requires: libpurple >= %{apiver} +-%endif +- + %if 0%{?_with_mono:1} + %package -n libpurple-mono + Summary: Mono .NET plugin support for Pidgin +@@ -161,18 +152,14 @@ + + %description + Pidgin allows you to talk to anyone using a variety of messaging +-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu, +-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and +-Zephyr. These protocols are implemented using a modular, easy to ++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr. ++These protocols are implemented using a modular, easy to + use design. To use a protocol, just add an account using the + account editor. + + Pidgin supports many common features of other clients, as well as many + unique features, such as perl scripting, TCL scripting and C plugins. + +-Pidgin is not affiliated with or endorsed by America Online, Inc., +-Microsoft Corporation, Yahoo! Inc., or ICQ Inc. +- + %description devel + The pidgin-devel package contains the header files, developer + documentation, and libraries required for development of Pidgin scripts +@@ -182,9 +169,8 @@ + libpurple contains the core IM support for IM clients such as Pidgin + and Finch. + +-libpurple supports a variety of messaging protocols including AIM, MSN, +-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, +-Lotus Sametime, SILC, Simple and Zephyr. ++libpurple supports a variety of messaging protocols including XMPP, ++Bonjour, IRC, SILC, Simple and Zephyr. + + %description -n libpurple-devel + The libpurple-devel package contains the header files, developer +@@ -196,11 +182,6 @@ + Bonjour plugin for Pidgin. + %endif + +-%if 0%{?_with_meanwhile:1} +-%description -n libpurple-meanwhile +-Lotus Sametime plugin for Pidgin using the Meanwhile library. +-%endif +- + %if 0%{?_with_mono:1} + %description -n libpurple-mono + Mono plugin loader for Pidgin. This package will allow you to write or +@@ -236,7 +217,6 @@ + %{!?_with_vv:--disable-vv} \ + %{!?_with_dbus:--disable-dbus} \ + %{!?_with_avahi:--disable-avahi} \ +- %{!?_with_meanwhile:--disable-meanwhile} \ + %{?_without_gstreamer:--disable-gstreamer} \ + %{?_without_gtkspell:--disable-gtkspell} \ + %{?_without_nm:--disable-nm} \ +@@ -258,9 +238,7 @@ + rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la + rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod + find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';' +@@ -271,10 +249,6 @@ + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so + %endif + +-%if 0%{!?_with_meanwhile:1} +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so +-%endif +- + %if 0%{!?_with_mono:1} + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll +@@ -299,7 +273,6 @@ + find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v /libbonjour.so | \ +- grep -v /libsametime.so | \ + grep -v /mono.so | \ + grep -v ".dll$" > %{name}-%{version}-purpleplugins + +@@ -435,13 +408,6 @@ + %{_libdir}/purple-2/libbonjour.* + %endif + +-%if 0%{?_with_meanwhile:1} +-%files -n libpurple-meanwhile +-%defattr(-, root, root) +- +-%{_libdir}/purple-2/libsametime.* +-%endif +- + %if 0%{?_with_mono:1} + %files -n libpurple-mono + %defattr(-, root, root) +@@ -492,9 +458,6 @@ + * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com> + - Update to reflect changes in perl module installation directories + +-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com> +-- Fix building without meanwhile support +- + * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com> + - Add "--without nm" support to build without NetworkManager + +@@ -586,8 +549,6 @@ + - Update to reflect renaming to pidgin/libpurple + + * Sun Oct 1 2006 Stu Tomlinson <stu@nosnilmot.com> +-- We can build with internal gadu gadu again, so bring it back into the +- main package + - Deal with gconf schame uninstallation on package upgrade and removal + + * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com> +@@ -606,19 +567,14 @@ + - Source RPM uses tar.bz2 now to save space + - Update BuildRequires for new intltool dependencies + - Add a --with perlmakehack option to allow builds to succeed on RH9 +-- Add a --with gadugadu to build (separate) gaim-gadugadu package + + * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com> + - Add support for beta versions so the subsequent releases are seen as newer + by RPM +-- Split of sametime support to gaim-meanwhile + - Use make DESTDIR=... instead of overloading prefix etc. when installing + - Default build to include cyrus-sasl support in Jabber + - Add --with dbus to build with DBUS support + +-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net> +-- Added obsoletes gaim-meanwhile +- + * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com> + - Add separate gaim-bonjour package if built with --with-howl + - Add separate gaim-mono package if built with --with-mono diff --git a/nonprism/pidgin-nonprism/nonprism.patch b/nonprism/pidgin-nonprism/nonprism.patch new file mode 100644 index 000000000..485bef3c8 --- /dev/null +++ b/nonprism/pidgin-nonprism/nonprism.patch @@ -0,0 +1,4930 @@ +diff -Nur pidgin-2.10.7/config.h.in pidgin-2.10.7-nonprism/config.h.in +--- pidgin-2.10.7/config.h.in 2013-02-11 07:17:16.000000000 -0200 ++++ pidgin-2.10.7-nonprism/config.h.in 2013-08-16 22:16:16.833531712 -0300 +@@ -151,9 +151,6 @@ + /* Define to 1 if you have the `db' library (-ldb). */ + #undef HAVE_LIBDB + +-/* Define to 1 if you have libgadu. */ +-#undef HAVE_LIBGADU +- + /* Define to 1 if you have the `nsl' library (-lnsl). */ + #undef HAVE_LIBNSL + +diff -Nur pidgin-2.10.7/configure pidgin-2.10.7-nonprism/configure +--- pidgin-2.10.7/configure 2013-02-11 07:17:26.000000000 -0200 ++++ pidgin-2.10.7-nonprism/configure 2013-08-27 16:47:16.890662082 -0300 +@@ -716,45 +716,23 @@ + STATIC_LINK_LIBS + STATIC_ZEPHYR_FALSE + STATIC_ZEPHYR_TRUE +-STATIC_YAHOO_FALSE +-STATIC_YAHOO_TRUE + STATIC_SIMPLE_FALSE + STATIC_SIMPLE_TRUE + STATIC_SILC_FALSE + STATIC_SILC_TRUE +-STATIC_SAMETIME_FALSE +-STATIC_SAMETIME_TRUE +-STATIC_OSCAR_FALSE +-STATIC_OSCAR_TRUE +-STATIC_NOVELL_FALSE +-STATIC_NOVELL_TRUE +-STATIC_MXIT_FALSE +-STATIC_MXIT_TRUE +-STATIC_MYSPACE_FALSE +-STATIC_MYSPACE_TRUE +-STATIC_MSN_FALSE +-STATIC_MSN_TRUE + STATIC_JABBER_FALSE + STATIC_JABBER_TRUE + STATIC_IRC_FALSE + STATIC_IRC_TRUE +-STATIC_GG_FALSE +-STATIC_GG_TRUE + STATIC_BONJOUR_FALSE + STATIC_BONJOUR_TRUE + STATIC_PRPLS + DISTRIB_FALSE + DISTRIB_TRUE +-USE_INTERNAL_LIBGADU_FALSE +-USE_INTERNAL_LIBGADU_TRUE +-GADU_LIBS +-GADU_CFLAGS + SILC_LIBS + SILC_CFLAGS + AVAHI_LIBS + AVAHI_CFLAGS +-MEANWHILE_LIBS +-MEANWHILE_CFLAGS + IDN_LIBS + IDN_CFLAGS + USE_VV_FALSE +@@ -1021,14 +999,11 @@ + enable_farstream + enable_vv + enable_idn +-enable_meanwhile + enable_avahi + with_avahi_client_includes + with_avahi_client_libs + with_silc_includes + with_silc_libs +-with_gadu_includes +-with_gadu_libs + enable_distrib + with_static_prpls + with_dynamic_prpls +@@ -1100,14 +1075,10 @@ + FARSTREAM_LIBS + IDN_CFLAGS + IDN_LIBS +-MEANWHILE_CFLAGS +-MEANWHILE_LIBS + AVAHI_CFLAGS + AVAHI_LIBS + SILC_CFLAGS + SILC_LIBS +-GADU_CFLAGS +-GADU_LIBS + DBUS_CFLAGS + DBUS_LIBS + NETWORKMANAGER_CFLAGS +@@ -1773,8 +1744,6 @@ + --disable-farstream compile without farstream support + --disable-vv compile without voice and video support + --disable-idn compile without IDN support +- --disable-meanwhile compile without meanwhile (required for Sametime +- support) + --disable-avahi compile without avahi (required for Bonjour support) + + --disable-plugins compile without plugin support +@@ -1826,9 +1795,6 @@ + --with-silc-includes=DIR + compile the SILC plugin against includes in DIR + --with-silc-libs=DIR compile the SILC plugin against the SILC libs in DIR +- --with-gadu-includes=DIR +- compile the Gadu-Gadu plugin against includes in DIR +- --with-gadu-libs=DIR compile the Gadu-Gadu plugin against the libs in DIR + --with-static-prpls Link to certain protocols statically + --with-dynamic-prpls specify which protocols to build dynamically + --with-krb4=PREFIX compile Zephyr plugin with Kerberos 4 support +@@ -1905,17 +1871,11 @@ + linker flags for FARSTREAM, overriding pkg-config + IDN_CFLAGS C compiler flags for IDN, overriding pkg-config + IDN_LIBS linker flags for IDN, overriding pkg-config +- MEANWHILE_CFLAGS +- C compiler flags for MEANWHILE, overriding pkg-config +- MEANWHILE_LIBS +- linker flags for MEANWHILE, overriding pkg-config + AVAHI_CFLAGS + C compiler flags for AVAHI, overriding pkg-config + AVAHI_LIBS linker flags for AVAHI, overriding pkg-config + SILC_CFLAGS C compiler flags for SILC, overriding pkg-config + SILC_LIBS linker flags for SILC, overriding pkg-config +- GADU_CFLAGS C compiler flags for GADU, overriding pkg-config +- GADU_LIBS linker flags for GADU, overriding pkg-config + DBUS_CFLAGS C compiler flags for DBUS, overriding pkg-config + DBUS_LIBS linker flags for DBUS, overriding pkg-config + NETWORKMANAGER_CFLAGS +@@ -18487,105 +18447,6 @@ + fi + fi + +-# Check whether --enable-meanwhile was given. +-if test "${enable_meanwhile+set}" = set; then : +- enableval=$enable_meanwhile; enable_meanwhile="$enableval" +-else +- enable_meanwhile="yes" +-fi +- +-if test "x$enable_meanwhile" = "xyes"; then +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MEANWHILE" >&5 +-$as_echo_n "checking for MEANWHILE... " >&6; } +- +-if test -n "$MEANWHILE_CFLAGS"; then +- pkg_cv_MEANWHILE_CFLAGS="$MEANWHILE_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_MEANWHILE_CFLAGS=`$PKG_CONFIG --cflags "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$MEANWHILE_LIBS"; then +- pkg_cv_MEANWHILE_LIBS="$MEANWHILE_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"meanwhile >= 1.0.0 meanwhile < 2.0.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "meanwhile >= 1.0.0 meanwhile < 2.0.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_MEANWHILE_LIBS=`$PKG_CONFIG --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1` +- else +- MEANWHILE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "meanwhile >= 1.0.0 meanwhile < 2.0.0" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$MEANWHILE_PKG_ERRORS" >&5 +- +- +- have_meanwhile="no" +- if test "x$force_deps" = "xyes" ; then +- as_fn_error $? " +-Meanwhile development headers not found. +-Use --disable-meanwhile if you do not need meanwhile (Sametime) support. +-" "$LINENO" 5 +- fi +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +- have_meanwhile="no" +- if test "x$force_deps" = "xyes" ; then +- as_fn_error $? " +-Meanwhile development headers not found. +-Use --disable-meanwhile if you do not need meanwhile (Sametime) support. +-" "$LINENO" 5 +- fi +-else +- MEANWHILE_CFLAGS=$pkg_cv_MEANWHILE_CFLAGS +- MEANWHILE_LIBS=$pkg_cv_MEANWHILE_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +- have_meanwhile="yes" +- +-fi +-fi +- +- +- + # Check whether --enable-avahi was given. + if test "${enable_avahi+set}" = set; then : + enableval=$enable_avahi; enable_avahi="$enableval" +@@ -19207,267 +19068,6 @@ + fi + + +-# Check whether --with-gadu-includes was given. +-if test "${with_gadu_includes+set}" = set; then : +- withval=$with_gadu_includes; ac_gadu_includes="$withval" +-else +- ac_gadu_includes="no" +-fi +- +- +-# Check whether --with-gadu-libs was given. +-if test "${with_gadu_libs+set}" = set; then : +- withval=$with_gadu_libs; ac_gadu_libs="$withval" +-else +- ac_gadu_libs="no" +-fi +- +-GADU_CFLAGS="" +-GADU_LIBS="" +-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then +- gadu_manual_check="yes" +-else +- gadu_manual_check="no" +-fi +-if test "x$gadu_manual_check" = "xno"; then +- +-pkg_failed=no +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GADU" >&5 +-$as_echo_n "checking for GADU... " >&6; } +- +-if test -n "$GADU_CFLAGS"; then +- pkg_cv_GADU_CFLAGS="$GADU_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GADU_CFLAGS=`$PKG_CONFIG --cflags "libgadu >= 1.11.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +-if test -n "$GADU_LIBS"; then +- pkg_cv_GADU_LIBS="$GADU_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libgadu >= 1.11.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libgadu >= 1.11.0") 2>&5 +- ac_status=$? +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then +- pkg_cv_GADU_LIBS=`$PKG_CONFIG --libs "libgadu >= 1.11.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes +-else +- pkg_failed=yes +-fi +- else +- pkg_failed=untried +-fi +- +- +- +-if test $pkg_failed = yes; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then +- _pkg_short_errors_supported=yes +-else +- _pkg_short_errors_supported=no +-fi +- if test $_pkg_short_errors_supported = yes; then +- GADU_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1` +- else +- GADU_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libgadu >= 1.11.0" 2>&1` +- fi +- # Put the nasty error message in config.log where it belongs +- echo "$GADU_PKG_ERRORS" >&5 +- +- +- gadu_includes="no" +- +-elif test $pkg_failed = untried; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- +- gadu_includes="no" +- +-else +- GADU_CFLAGS=$pkg_cv_GADU_CFLAGS +- GADU_LIBS=$pkg_cv_GADU_LIBS +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +- gadu_includes="yes" +- gadu_libs="yes" +- +-fi +-else +- if test "$ac_gadu_includes" != "no"; then +- GADU_CFLAGS="-I$ac_gadu_includes" +- fi +- CPPFLAGS_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" +- ac_fn_c_check_header_mongrel "$LINENO" "libgadu.h" "ac_cv_header_libgadu_h" "$ac_includes_default" +-if test "x$ac_cv_header_libgadu_h" = xyes; then : +- gadu_includes=yes +-fi +- +- +- CPPFLAGS="$CPPFLAGS_save" +- +- if test "$ac_gadu_libs" != "no"; then +- GADU_LIBS="-L$ac_gadu_libs" +- fi +- GADU_LIBS="$GADU_LIBS -lgadu" +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gg_libgadu_version in -lgadu" >&5 +-$as_echo_n "checking for gg_libgadu_version in -lgadu... " >&6; } +-if ${ac_cv_lib_gadu_gg_libgadu_version+:} false; then : +- $as_echo_n "(cached) " >&6 +-else +- ac_check_lib_save_LIBS=$LIBS +-LIBS="-lgadu $GADU_LIBS $LIBS" +-cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +- +-/* Override any GCC internal prototype to avoid an error. +- Use char because int might match the return type of a GCC +- builtin and then its argument prototype would still apply. */ +-#ifdef __cplusplus +-extern "C" +-#endif +-char gg_libgadu_version (); +-int +-main () +-{ +-return gg_libgadu_version (); +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_link "$LINENO"; then : +- ac_cv_lib_gadu_gg_libgadu_version=yes +-else +- ac_cv_lib_gadu_gg_libgadu_version=no +-fi +-rm -f core conftest.err conftest.$ac_objext \ +- conftest$ac_exeext conftest.$ac_ext +-LIBS=$ac_check_lib_save_LIBS +-fi +-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gadu_gg_libgadu_version" >&5 +-$as_echo "$ac_cv_lib_gadu_gg_libgadu_version" >&6; } +-if test "x$ac_cv_lib_gadu_gg_libgadu_version" = xyes; then : +- gadu_libs=yes +-fi +- +-fi +-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'` +- +-if test "x$gadu_libs" = "xyes"; then +- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libgadu GPL compatibility" >&5 +-$as_echo_n "checking for libgadu GPL compatibility... " >&6; } +- CPPFLAGS_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <libgadu.h> +-int +-main () +-{ +- +-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL) +-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support." +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +- cat confdefs.h - <<_ACEOF >conftest.$ac_ext +-/* end confdefs.h. */ +-#include <libgadu.h> +-int +-main () +-{ +- +-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e +-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher." +-#endif +- +- ; +- return 0; +-} +-_ACEOF +-if ac_fn_c_try_compile "$LINENO"; then : +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +-$as_echo "yes" >&6; } +- +-$as_echo "#define HAVE_LIBGADU 1" >>confdefs.h +- +- +-else +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- echo +- echo +- echo "Your supplied copy of libgadu is too old." +- echo "Install version 1.11.0 or newer." +- echo "Then rerun this ./configure" +- echo +- echo "Falling back to using our own copy of libgadu" +- echo +- GADU_LIBS="" +- GADU_CFLAGS="" +- gadu_libs=no +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- +-else +- +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +-$as_echo "no" >&6; } +- echo +- echo +- echo "libgadu is not compatible with the GPL when compiled with OpenSSL support." +- echo "To compile against system libgadu, please recompile libgadu using:" +- echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared" +- echo "Then rerun this ./configure" +- echo +- echo "Falling back to using our own copy of libgadu" +- echo +- GADU_LIBS="" +- GADU_CFLAGS="" +- gadu_libs=no +- +-fi +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +- CPPFLAGS="$CPPFLAGS_save" +-fi +- +- if test "x$gadu_libs" != "xyes"; then +- USE_INTERNAL_LIBGADU_TRUE= +- USE_INTERNAL_LIBGADU_FALSE='#' +-else +- USE_INTERNAL_LIBGADU_TRUE='#' +- USE_INTERNAL_LIBGADU_FALSE= +-fi +- +- +-if test "x$gadu_libs" = "x"; then +- gadu_libs=no +-fi +- + + + +@@ -19500,10 +19100,7 @@ + fi + + if test "x$STATIC_PRPLS" = "xall" ; then +- STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" +-fi +-if test "x$have_meanwhile" != "xyes" ; then +- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` ++ STATIC_PRPLS="bonjour irc jabber silc simple zephyr" + fi + if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then + STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` +@@ -19519,46 +19116,22 @@ + extern_init= + load_proto= + for i in $STATIC_PRPLS ; do +- if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la" +- extern_init="$extern_init extern gboolean purple_init_aim_plugin();" +- extern_init="$extern_init extern gboolean purple_init_icq_plugin();" +- load_proto="$load_proto purple_init_aim_plugin();" +- load_proto="$load_proto purple_init_icq_plugin();" +- elif test "x$i" = "xyahoo"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la" +- extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();" +- extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();" +- load_proto="$load_proto purple_init_yahoo_plugin();" +- load_proto="$load_proto purple_init_yahoojp_plugin();" ++ if test "x$i" = "xsilc"; then ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" ++ elif test "x$i" = "xsilc10"; then ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la" + else +- if test "x$i" = "xsilc"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" +- elif test "x$i" = "xsilc10"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la" +- else +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" +- fi +- extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" +- load_proto="$load_proto purple_init_${i}_plugin();" ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" + fi ++ extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" ++ load_proto="$load_proto purple_init_${i}_plugin();" + case $i in + bonjour) static_bonjour=yes ;; +- gg) static_gg=yes ;; + irc) static_irc=yes ;; + jabber) static_jabber=yes ;; +- msn) static_msn=yes ;; +- myspace) static_myspace=yes ;; +- mxit) static_mxit=yes ;; +- novell) static_novell=yes ;; +- oscar) static_oscar=yes ;; +- aim) static_oscar=yes ;; +- icq) static_oscar=yes ;; +- sametime) static_sametime=yes ;; + silc) static_silc=yes ;; + silc10) static_silc=yes ;; + simple) static_simple=yes ;; +- yahoo) static_yahoo=yes ;; + zephyr) static_zephyr=yes ;; + *) echo "Invalid static protocol $i!!" ; exit 1 ;; + esac +@@ -19571,14 +19144,6 @@ + STATIC_BONJOUR_FALSE= + fi + +- if test "x$static_gg" = "xyes"; then +- STATIC_GG_TRUE= +- STATIC_GG_FALSE='#' +-else +- STATIC_GG_TRUE='#' +- STATIC_GG_FALSE= +-fi +- + if test "x$static_irc" = "xyes"; then + STATIC_IRC_TRUE= + STATIC_IRC_FALSE='#' +@@ -19595,54 +19160,6 @@ + STATIC_JABBER_FALSE= + fi + +- if test "x$static_msn" = "xyes"; then +- STATIC_MSN_TRUE= +- STATIC_MSN_FALSE='#' +-else +- STATIC_MSN_TRUE='#' +- STATIC_MSN_FALSE= +-fi +- +- if test "x$static_myspace" = "xyes"; then +- STATIC_MYSPACE_TRUE= +- STATIC_MYSPACE_FALSE='#' +-else +- STATIC_MYSPACE_TRUE='#' +- STATIC_MYSPACE_FALSE= +-fi +- +- if test "x$static_mxit" = "xyes"; then +- STATIC_MXIT_TRUE= +- STATIC_MXIT_FALSE='#' +-else +- STATIC_MXIT_TRUE='#' +- STATIC_MXIT_FALSE= +-fi +- +- if test "x$static_novell" = "xyes"; then +- STATIC_NOVELL_TRUE= +- STATIC_NOVELL_FALSE='#' +-else +- STATIC_NOVELL_TRUE='#' +- STATIC_NOVELL_FALSE= +-fi +- +- if test "x$static_oscar" = "xyes"; then +- STATIC_OSCAR_TRUE= +- STATIC_OSCAR_FALSE='#' +-else +- STATIC_OSCAR_TRUE='#' +- STATIC_OSCAR_FALSE= +-fi +- +- if test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes"; then +- STATIC_SAMETIME_TRUE= +- STATIC_SAMETIME_FALSE='#' +-else +- STATIC_SAMETIME_TRUE='#' +- STATIC_SAMETIME_FALSE= +-fi +- + if test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes"; then + STATIC_SILC_TRUE= + STATIC_SILC_FALSE='#' +@@ -19659,14 +19176,6 @@ + STATIC_SIMPLE_FALSE= + fi + +- if test "x$static_yahoo" = "xyes"; then +- STATIC_YAHOO_TRUE= +- STATIC_YAHOO_FALSE='#' +-else +- STATIC_YAHOO_TRUE='#' +- STATIC_YAHOO_FALSE= +-fi +- + if test "x$static_zephyr" = "xyes"; then + STATIC_ZEPHYR_TRUE= + STATIC_ZEPHYR_FALSE='#' +@@ -19689,10 +19198,7 @@ + fi + + if test "x$DYNAMIC_PRPLS" = "xall" ; then +- DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" +-fi +-if test "x$have_meanwhile" != "xyes"; then +- DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` ++ DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr" + fi + if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then + DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` +@@ -19707,22 +19213,12 @@ + for i in $DYNAMIC_PRPLS ; do + case $i in + bonjour) dynamic_bonjour=yes ;; +- gg) dynamic_gg=yes ;; + irc) dynamic_irc=yes ;; + jabber) dynamic_jabber=yes ;; +- msn) dynamic_msn=yes ;; +- myspace) dynamic_myspace=yes ;; +- mxit) dynamic_mxit=yes ;; +- novell) dynamic_novell=yes ;; + null) dynamic_null=yes ;; +- oscar) dynamic_oscar=yes ;; +- aim) dynamic_oscar=yes ;; +- icq) dynamic_oscar=yes ;; +- sametime) dynamic_sametime=yes ;; + silc) dynamic_silc=yes ;; + silc10) dynamic_silc=yes ;; + simple) dynamic_simple=yes ;; +- yahoo) dynamic_yahoo=yes ;; + zephyr) dynamic_zephyr=yes ;; + *) echo "Invalid dynamic protocol $i!!" ; exit 1 ;; + esac +@@ -21001,7 +20497,7 @@ + fi + + +-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!" ++msg_ssl="None." + looked_for_gnutls="no" + if test "x$enable_gnutls" != "xno"; then + enable_gnutls="no" +@@ -21871,19 +21367,17 @@ + as_fn_error $? " + Neither GnuTLS or NSS SSL development headers found. + Use --disable-nss --disable-gnutls if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable! ++ + " "$LINENO" 5 + elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then + as_fn_error $? " + GnuTLS SSL development headers not found. + Use --disable-gnutls if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support. + " "$LINENO" 5 + elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then + as_fn_error $? " + NSS SSL development headers not found. + Use --disable-nss if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support. + " "$LINENO" 5 + fi + +@@ -23176,7 +22670,7 @@ + fi + + +-ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/gg/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/msn/Makefile libpurple/protocols/myspace/Makefile libpurple/protocols/mxit/Makefile libpurple/protocols/novell/Makefile libpurple/protocols/null/Makefile libpurple/protocols/oscar/Makefile libpurple/protocols/sametime/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec" ++ac_config_files="$ac_config_files Makefile Doxyfile doc/Makefile doc/pidgin.1 doc/finch.1 m4macros/Makefile pidgin.apspec pidgin/Makefile pidgin/pidgin.pc pidgin/pidgin-uninstalled.pc pidgin/pidgin-2.pc pidgin/pidgin-2-uninstalled.pc pidgin/pixmaps/Makefile pidgin/pixmaps/emotes/default/24/Makefile pidgin/pixmaps/emotes/none/Makefile pidgin/pixmaps/emotes/small/16/Makefile pidgin/plugins/Makefile pidgin/plugins/cap/Makefile pidgin/plugins/disco/Makefile pidgin/plugins/gestures/Makefile pidgin/plugins/gevolution/Makefile pidgin/plugins/musicmessaging/Makefile pidgin/plugins/perl/Makefile pidgin/plugins/perl/common/Makefile.PL pidgin/plugins/ticker/Makefile libpurple/ciphers/Makefile libpurple/example/Makefile libpurple/gconf/Makefile libpurple/purple.pc libpurple/purple-uninstalled.pc libpurple/purple-2.pc libpurple/purple-2-uninstalled.pc libpurple/plugins/Makefile libpurple/plugins/mono/Makefile libpurple/plugins/mono/api/Makefile libpurple/plugins/mono/loader/Makefile libpurple/plugins/perl/Makefile libpurple/plugins/perl/common/Makefile.PL libpurple/plugins/ssl/Makefile libpurple/plugins/tcl/Makefile libpurple/Makefile libpurple/protocols/Makefile libpurple/protocols/bonjour/Makefile libpurple/protocols/irc/Makefile libpurple/protocols/jabber/Makefile libpurple/protocols/null/Makefile libpurple/protocols/silc/Makefile libpurple/protocols/silc10/Makefile libpurple/protocols/simple/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile libpurple/purple.h libpurple/version.h share/sounds/Makefile share/ca-certs/Makefile finch/finch.pc finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc finch/libgnt/wms/Makefile finch/plugins/Makefile po/Makefile.in pidgin.spec" + + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure +@@ -23344,10 +22838,6 @@ + as_fn_error $? "conditional \"USE_VV\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${USE_INTERNAL_LIBGADU_TRUE}" && test -z "${USE_INTERNAL_LIBGADU_FALSE}"; then +- as_fn_error $? "conditional \"USE_INTERNAL_LIBGADU\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi + if test -z "${DISTRIB_TRUE}" && test -z "${DISTRIB_FALSE}"; then + as_fn_error $? "conditional \"DISTRIB\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -23356,10 +22846,6 @@ + as_fn_error $? "conditional \"STATIC_BONJOUR\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${STATIC_GG_TRUE}" && test -z "${STATIC_GG_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_GG\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi + if test -z "${STATIC_IRC_TRUE}" && test -z "${STATIC_IRC_FALSE}"; then + as_fn_error $? "conditional \"STATIC_IRC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -23368,30 +22854,6 @@ + as_fn_error $? "conditional \"STATIC_JABBER\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${STATIC_MSN_TRUE}" && test -z "${STATIC_MSN_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_MSN\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${STATIC_MYSPACE_TRUE}" && test -z "${STATIC_MYSPACE_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_MYSPACE\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${STATIC_MXIT_TRUE}" && test -z "${STATIC_MXIT_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_MXIT\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${STATIC_NOVELL_TRUE}" && test -z "${STATIC_NOVELL_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_NOVELL\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${STATIC_OSCAR_TRUE}" && test -z "${STATIC_OSCAR_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_OSCAR\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi +-if test -z "${STATIC_SAMETIME_TRUE}" && test -z "${STATIC_SAMETIME_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_SAMETIME\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi + if test -z "${STATIC_SILC_TRUE}" && test -z "${STATIC_SILC_FALSE}"; then + as_fn_error $? "conditional \"STATIC_SILC\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -23400,10 +22862,6 @@ + as_fn_error $? "conditional \"STATIC_SIMPLE\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 + fi +-if test -z "${STATIC_YAHOO_TRUE}" && test -z "${STATIC_YAHOO_FALSE}"; then +- as_fn_error $? "conditional \"STATIC_YAHOO\" was never defined. +-Usually this means the macro was only invoked conditionally." "$LINENO" 5 +-fi + if test -z "${STATIC_ZEPHYR_TRUE}" && test -z "${STATIC_ZEPHYR_FALSE}"; then + as_fn_error $? "conditional \"STATIC_ZEPHYR\" was never defined. + Usually this means the macro was only invoked conditionally." "$LINENO" 5 +@@ -24425,20 +23883,12 @@ + "libpurple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/Makefile" ;; + "libpurple/protocols/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/Makefile" ;; + "libpurple/protocols/bonjour/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/bonjour/Makefile" ;; +- "libpurple/protocols/gg/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/gg/Makefile" ;; + "libpurple/protocols/irc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/irc/Makefile" ;; + "libpurple/protocols/jabber/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/jabber/Makefile" ;; +- "libpurple/protocols/msn/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/msn/Makefile" ;; +- "libpurple/protocols/myspace/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/myspace/Makefile" ;; +- "libpurple/protocols/mxit/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/mxit/Makefile" ;; +- "libpurple/protocols/novell/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/novell/Makefile" ;; + "libpurple/protocols/null/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/null/Makefile" ;; +- "libpurple/protocols/oscar/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/oscar/Makefile" ;; +- "libpurple/protocols/sametime/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/sametime/Makefile" ;; + "libpurple/protocols/silc/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc/Makefile" ;; + "libpurple/protocols/silc10/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/silc10/Makefile" ;; + "libpurple/protocols/simple/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/simple/Makefile" ;; +- "libpurple/protocols/yahoo/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/yahoo/Makefile" ;; + "libpurple/protocols/zephyr/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/protocols/zephyr/Makefile" ;; + "libpurple/tests/Makefile") CONFIG_FILES="$CONFIG_FILES libpurple/tests/Makefile" ;; + "libpurple/purple.h") CONFIG_FILES="$CONFIG_FILES libpurple/purple.h" ;; +@@ -25863,7 +25313,6 @@ + echo Build with Cyrus SASL support. : $enable_cyrus_sasl + echo Use kerberos 4 with zephyr.... : $kerberos + echo Use external libzephyr........ : $zephyr +-echo Use external libgadu.......... : $gadu_libs + echo Install pixmaps............... : $enable_pixmaps + echo Old tray icon compatibility... : $enable_traycompat + echo Install translations.......... : $enable_i18n +diff -Nur pidgin-2.10.7/configure.ac pidgin-2.10.7-nonprism/configure.ac +--- pidgin-2.10.7/configure.ac 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/configure.ac 2013-08-16 23:44:41.800496326 -0300 +@@ -854,28 +854,6 @@ + fi + + dnl ####################################################################### +-dnl # Check for Meanwhile headers (for Sametime) +-dnl ####################################################################### +-AC_ARG_ENABLE(meanwhile, +- [AC_HELP_STRING([--disable-meanwhile], +- [compile without meanwhile (required for Sametime support)])], +- enable_meanwhile="$enableval", enable_meanwhile="yes") +-if test "x$enable_meanwhile" = "xyes"; then +- PKG_CHECK_MODULES(MEANWHILE, [meanwhile >= 1.0.0 meanwhile < 2.0.0], [ +- have_meanwhile="yes" +- ], [ +- have_meanwhile="no" +- if test "x$force_deps" = "xyes" ; then +- AC_MSG_ERROR([ +-Meanwhile development headers not found. +-Use --disable-meanwhile if you do not need meanwhile (Sametime) support. +-]) +- fi]) +-fi +-AC_SUBST(MEANWHILE_CFLAGS) +-AC_SUBST(MEANWHILE_LIBS) +- +-dnl ####################################################################### + dnl # Check for Native Avahi headers (for Bonjour) + dnl ####################################################################### + AC_ARG_ENABLE(avahi, +@@ -1020,100 +998,6 @@ + CPPFLAGS="$CPPFLAGS_save" + fi + +-dnl ####################################################################### +-dnl # Check for Gadu-Gadu client includes and libraries +-dnl ####################################################################### +-AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"]) +-AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"]) +-GADU_CFLAGS="" +-GADU_LIBS="" +-if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then +- gadu_manual_check="yes" +-else +- gadu_manual_check="no" +-fi +-if test "x$gadu_manual_check" = "xno"; then +- PKG_CHECK_MODULES(GADU, [libgadu >= 1.11.0], [ +- gadu_includes="yes" +- gadu_libs="yes" +- ], [ +- gadu_includes="no" +- ]) +-else +- if test "$ac_gadu_includes" != "no"; then +- GADU_CFLAGS="-I$ac_gadu_includes" +- fi +- CPPFLAGS_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" +- AC_CHECK_HEADER(libgadu.h, [gadu_includes=yes]) +- CPPFLAGS="$CPPFLAGS_save" +- +- if test "$ac_gadu_libs" != "no"; then +- GADU_LIBS="-L$ac_gadu_libs" +- fi +- GADU_LIBS="$GADU_LIBS -lgadu" +- AC_CHECK_LIB(gadu, gg_libgadu_version, [gadu_libs=yes], , $GADU_LIBS) +-fi +-GADU_CFLAGS=`echo $GADU_CFLAGS |$sedpath 's/-Wall//'` +- +-if test "x$gadu_libs" = "xyes"; then +- AC_MSG_CHECKING(for libgadu GPL compatibility) +- CPPFLAGS_save="$CPPFLAGS" +- CPPFLAGS="$CPPFLAGS $GADU_CFLAGS" +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[ +-#if defined(__GG_LIBGADU_HAVE_OPENSSL) || defined(GG_CONFIG_HAVE_OPENSSL) +-#error "libgadu is not compatible with the GPL when compiled with OpenSSL support." +-#endif +- ]])], [ +- AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <libgadu.h>]], [[ +-#if GG_DEFAULT_PROTOCOL_VERSION < 0x2e +-#error "Your libgadu version is too old. libpurple requires 1.11.0 or higher." +-#endif +- ]])], [ +- AC_MSG_RESULT(yes) +- AC_DEFINE([HAVE_LIBGADU], [1], +- [Define to 1 if you have libgadu.]) +- ], [ +- AC_MSG_RESULT(no) +- echo +- echo +- echo "Your supplied copy of libgadu is too old." +- echo "Install version 1.11.0 or newer." +- echo "Then rerun this ./configure" +- echo +- echo "Falling back to using our own copy of libgadu" +- echo +- GADU_LIBS="" +- GADU_CFLAGS="" +- gadu_libs=no +- ]) +- ], [ +- AC_MSG_RESULT(no) +- echo +- echo +- echo "libgadu is not compatible with the GPL when compiled with OpenSSL support." +- echo "To compile against system libgadu, please recompile libgadu using:" +- echo "./autogen.sh --disable-libgadu-openssl --disable-static --enable-shared" +- echo "Then rerun this ./configure" +- echo +- echo "Falling back to using our own copy of libgadu" +- echo +- GADU_LIBS="" +- GADU_CFLAGS="" +- gadu_libs=no +- ]) +- CPPFLAGS="$CPPFLAGS_save" +-fi +- +-AM_CONDITIONAL(USE_INTERNAL_LIBGADU, test "x$gadu_libs" != "xyes") +- +-if test "x$gadu_libs" = "x"; then +- gadu_libs=no +-fi +- +-AC_SUBST(GADU_LIBS) +-AC_SUBST(GADU_CFLAGS) +- + AC_ARG_ENABLE(distrib,,,enable_distrib=no) + AM_CONDITIONAL(DISTRIB, test "x$enable_distrib" = "xyes") + DYNAMIC_PRPLS=all +@@ -1123,10 +1007,7 @@ + fi + + if test "x$STATIC_PRPLS" = "xall" ; then +- STATIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" +-fi +-if test "x$have_meanwhile" != "xyes" ; then +- STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/sametime//'` ++ STATIC_PRPLS="bonjour irc jabber silc simple zephyr" + fi + if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then + STATIC_PRPLS=`echo $STATIC_PRPLS | $sedpath 's/bonjour//'` +@@ -1143,64 +1024,31 @@ + load_proto= + for i in $STATIC_PRPLS ; do + dnl Ugly special case for "libsilcpurple.la": +- dnl ... and Ugly special case for multi-protocol oscar and yahoo +- if test \( "x$i" = "xoscar" -o "x$i" = "xaim" -o "x$i" = "xicq" \) -a "x$static_oscar" != "xyes"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/oscar/liboscar.la" +- extern_init="$extern_init extern gboolean purple_init_aim_plugin();" +- extern_init="$extern_init extern gboolean purple_init_icq_plugin();" +- load_proto="$load_proto purple_init_aim_plugin();" +- load_proto="$load_proto purple_init_icq_plugin();" +- elif test "x$i" = "xyahoo"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/yahoo/libymsg.la" +- extern_init="$extern_init extern gboolean purple_init_yahoo_plugin();" +- extern_init="$extern_init extern gboolean purple_init_yahoojp_plugin();" +- load_proto="$load_proto purple_init_yahoo_plugin();" +- load_proto="$load_proto purple_init_yahoojp_plugin();" ++ if test "x$i" = "xsilc"; then ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" ++ elif test "x$i" = "xsilc10"; then ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la" + else +- if test "x$i" = "xsilc"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib${i}purple.la" +- elif test "x$i" = "xsilc10"; then +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/libsilcpurple.la" +- else +- STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" +- fi +- extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" +- load_proto="$load_proto purple_init_${i}_plugin();" ++ STATIC_LINK_LIBS="$STATIC_LINK_LIBS \$(top_builddir)/libpurple/protocols/$i/lib$i.la" + fi ++ extern_init="$extern_init extern gboolean purple_init_${i}_plugin();" ++ load_proto="$load_proto purple_init_${i}_plugin();" + case $i in + bonjour) static_bonjour=yes ;; +- gg) static_gg=yes ;; + irc) static_irc=yes ;; + jabber) static_jabber=yes ;; +- msn) static_msn=yes ;; +- myspace) static_myspace=yes ;; +- mxit) static_mxit=yes ;; +- novell) static_novell=yes ;; +- oscar) static_oscar=yes ;; +- aim) static_oscar=yes ;; +- icq) static_oscar=yes ;; +- sametime) static_sametime=yes ;; + silc) static_silc=yes ;; + silc10) static_silc=yes ;; + simple) static_simple=yes ;; +- yahoo) static_yahoo=yes ;; + zephyr) static_zephyr=yes ;; + *) echo "Invalid static protocol $i!!" ; exit 1 ;; + esac + done + AM_CONDITIONAL(STATIC_BONJOUR, test "x$static_bonjour" = "xyes") +-AM_CONDITIONAL(STATIC_GG, test "x$static_gg" = "xyes") + AM_CONDITIONAL(STATIC_IRC, test "x$static_irc" = "xyes") + AM_CONDITIONAL(STATIC_JABBER, test "x$static_jabber" = "xyes") +-AM_CONDITIONAL(STATIC_MSN, test "x$static_msn" = "xyes") +-AM_CONDITIONAL(STATIC_MYSPACE, test "x$static_myspace" = "xyes") +-AM_CONDITIONAL(STATIC_MXIT, test "x$static_mxit" = "xyes") +-AM_CONDITIONAL(STATIC_NOVELL, test "x$static_novell" = "xyes") +-AM_CONDITIONAL(STATIC_OSCAR, test "x$static_oscar" = "xyes") +-AM_CONDITIONAL(STATIC_SAMETIME, test "x$static_sametime" = "xyes" -a "x$have_meanwhile" = "xyes") + AM_CONDITIONAL(STATIC_SILC, test "x$static_silc" = "xyes" -a "x$have_silc" = "xyes") + AM_CONDITIONAL(STATIC_SIMPLE, test "x$static_simple" = "xyes") +-AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes") + AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes") + AC_SUBST(STATIC_LINK_LIBS) + AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto }, +@@ -1208,10 +1056,7 @@ + + AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`]) + if test "x$DYNAMIC_PRPLS" = "xall" ; then +- DYNAMIC_PRPLS="bonjour gg irc jabber msn myspace mxit novell oscar sametime silc simple yahoo zephyr" +-fi +-if test "x$have_meanwhile" != "xyes"; then +- DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/sametime//'` ++ DYNAMIC_PRPLS="bonjour irc jabber silc simple zephyr" + fi + if test "x$avahiincludes" != "xyes" -o "x$avahilibs" != "xyes"; then + DYNAMIC_PRPLS=`echo $DYNAMIC_PRPLS | $sedpath 's/bonjour//'` +@@ -1226,22 +1071,12 @@ + for i in $DYNAMIC_PRPLS ; do + case $i in + bonjour) dynamic_bonjour=yes ;; +- gg) dynamic_gg=yes ;; + irc) dynamic_irc=yes ;; + jabber) dynamic_jabber=yes ;; +- msn) dynamic_msn=yes ;; +- myspace) dynamic_myspace=yes ;; +- mxit) dynamic_mxit=yes ;; +- novell) dynamic_novell=yes ;; + null) dynamic_null=yes ;; +- oscar) dynamic_oscar=yes ;; +- aim) dynamic_oscar=yes ;; +- icq) dynamic_oscar=yes ;; +- sametime) dynamic_sametime=yes ;; + silc) dynamic_silc=yes ;; + silc10) dynamic_silc=yes ;; + simple) dynamic_simple=yes ;; +- yahoo) dynamic_yahoo=yes ;; + zephyr) dynamic_zephyr=yes ;; + *) echo "Invalid dynamic protocol $i!!" ; exit 1 ;; + esac +@@ -1713,7 +1548,7 @@ + [enable_nss="$enableval"], + [enable_nss="yes"]) + +-msg_ssl="None. MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!" ++msg_ssl="None." + looked_for_gnutls="no" + dnl # + dnl # Check for GnuTLS if it's specified. +@@ -2124,19 +1959,16 @@ + AC_MSG_ERROR([ + Neither GnuTLS or NSS SSL development headers found. + Use --disable-nss --disable-gnutls if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable! + ]) + elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then + AC_MSG_ERROR([ + GnuTLS SSL development headers not found. + Use --disable-gnutls if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support. + ]) + elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then + AC_MSG_ERROR([ + NSS SSL development headers not found. + Use --disable-nss if you do not need SSL support. +-MSN, Yahoo!, Novell Groupwise and Google Talk will not work without SSL support. + ]) + fi + +@@ -2577,20 +2409,12 @@ + libpurple/Makefile + libpurple/protocols/Makefile + libpurple/protocols/bonjour/Makefile +- libpurple/protocols/gg/Makefile + libpurple/protocols/irc/Makefile + libpurple/protocols/jabber/Makefile +- libpurple/protocols/msn/Makefile +- libpurple/protocols/myspace/Makefile +- libpurple/protocols/mxit/Makefile +- libpurple/protocols/novell/Makefile + libpurple/protocols/null/Makefile +- libpurple/protocols/oscar/Makefile +- libpurple/protocols/sametime/Makefile + libpurple/protocols/silc/Makefile + libpurple/protocols/silc10/Makefile + libpurple/protocols/simple/Makefile +- libpurple/protocols/yahoo/Makefile + libpurple/protocols/zephyr/Makefile + libpurple/tests/Makefile + libpurple/purple.h +@@ -2635,7 +2459,6 @@ + echo Build with Cyrus SASL support. : $enable_cyrus_sasl + echo Use kerberos 4 with zephyr.... : $kerberos + echo Use external libzephyr........ : $zephyr +-echo Use external libgadu.......... : $gadu_libs + echo Install pixmaps............... : $enable_pixmaps + echo Old tray icon compatibility... : $enable_traycompat + echo Install translations.......... : $enable_i18n +diff -Nur pidgin-2.10.7/doc/finch.1.in pidgin-2.10.7-nonprism/doc/finch.1.in +--- pidgin-2.10.7/doc/finch.1.in 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/doc/finch.1.in 2013-08-16 21:01:16.682280145 -0300 +@@ -30,11 +30,8 @@ + .SH DESCRIPTION + .PP + \fBfinch\fR is a console-based modular messaging client based on libpurple +-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, +-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has ++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has + many common features found in other clients, as well as many unique features. +-Finch is not endorsed by or affiliated with America Online, ICQ, Microsoft, or +-Yahoo. + + .SH OPTIONS + The following options are provided by \fBfinch\fR using the standard GNU +diff -Nur pidgin-2.10.7/doc/funniest_home_convos.txt pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt +--- pidgin-2.10.7/doc/funniest_home_convos.txt 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/doc/funniest_home_convos.txt 2013-08-16 23:08:16.148841464 -0300 +@@ -301,8 +301,6 @@ + --- + + 18:33:26 <NoName> hello there +-18:34:03 <NoName> I just wanted to share some bevavior that I think its kinda of +- unsafe when using GAIM with yahoo messenges accounts + 18:34:43 <NoName> Whenever you transfer files between users, no receiving + confirmation is requested, the file gets transfered + automatically +diff -Nur pidgin-2.10.7/doc/pidgin.1.in pidgin-2.10.7-nonprism/doc/pidgin.1.in +--- pidgin-2.10.7/doc/pidgin.1.in 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/doc/pidgin.1.in 2013-08-16 21:00:30.964181946 -0300 +@@ -29,11 +29,8 @@ + .SH DESCRIPTION + .PP + \fBpidgin\fR is a graphical modular messaging client based on libpurple +-which is capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, +-Novell GroupWise, Lotus Sametime, Zephyr, Gadu-Gadu, and QQ all at once. It has ++which is capable of connecting to XMPP, IRC, SILC and Zephyr all at once. It has + many common features found in other clients, as well as many unique features. +-Pidgin is not endorsed by or affiliated with America Online, ICQ, Microsoft, or +-Yahoo. + .PP + Pidgin can be extended by plugins written in multiple programming languages and + controlled through DBus or \fBpurple-remote\fR. +diff -Nur pidgin-2.10.7/libpurple/account.c pidgin-2.10.7-nonprism/libpurple/account.c +--- pidgin-2.10.7/libpurple/account.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/account.c 2013-08-16 23:31:48.026518940 -0300 +@@ -482,55 +482,6 @@ + /********************************************************************* + * Reading from disk * + *********************************************************************/ +-static void +-migrate_yahoo_japan(PurpleAccount *account) +-{ +- /* detect a Yahoo! JAPAN account that existed prior to 2.6.0 and convert it +- * to use the new prpl-yahoojp. Also remove the account-specific settings +- * we no longer need */ +- +- if(purple_strequal(purple_account_get_protocol_id(account), "prpl-yahoo")) { +- if(purple_account_get_bool(account, "yahoojp", FALSE)) { +- const char *serverjp = purple_account_get_string(account, "serverjp", NULL); +- const char *xferjp_host = purple_account_get_string(account, "xferjp_host", NULL); +- +- g_return_if_fail(serverjp != NULL); +- g_return_if_fail(xferjp_host != NULL); +- +- purple_account_set_string(account, "server", serverjp); +- purple_account_set_string(account, "xfer_host", xferjp_host); +- +- purple_account_set_protocol_id(account, "prpl-yahoojp"); +- } +- +- /* these should always be nuked */ +- purple_account_remove_setting(account, "yahoojp"); +- purple_account_remove_setting(account, "serverjp"); +- purple_account_remove_setting(account, "xferjp_host"); +- +- } +-} +- +-static void +-migrate_icq_server(PurpleAccount *account) +-{ +- /* Migrate the login server setting for ICQ accounts. See +- * 'mtn log --last 1 --no-graph --from b6d7712e90b68610df3bd2d8cbaf46d94c8b3794' +- * for details on the change. */ +- +- if(purple_strequal(purple_account_get_protocol_id(account), "prpl-icq")) { +- const char *tmp = purple_account_get_string(account, "server", NULL); +- +- /* Non-secure server */ +- if(purple_strequal(tmp, "login.messaging.aol.com") || +- purple_strequal(tmp, "login.oscar.aol.com")) +- purple_account_set_string(account, "server", "login.icq.com"); +- +- /* Secure server */ +- if(purple_strequal(tmp, "slogin.oscar.aol.com")) +- purple_account_set_string(account, "server", "slogin.icq.com"); +- } +-} + + static void + migrate_xmpp_encryption(PurpleAccount *account) +@@ -615,12 +566,6 @@ + g_free(data); + } + +- /* we do this here because we need access to account settings to determine +- * if we can/should migrate an old Yahoo! JAPAN account */ +- migrate_yahoo_japan(account); +- /* we do this here because we need access to account settings to determine +- * if we can/should migrate an ICQ account's server setting */ +- migrate_icq_server(account); + /* we do this here because we need to do it before the user views the + * Edit Account dialog. */ + migrate_xmpp_encryption(account); +@@ -874,7 +819,6 @@ + return NULL; + } + +- ret = purple_account_new(name, _purple_oscar_convert(name, protocol_id)); /* XXX: */ + g_free(name); + g_free(protocol_id); + +diff -Nur pidgin-2.10.7/libpurple/blist.c pidgin-2.10.7-nonprism/libpurple/blist.c +--- pidgin-2.10.7/libpurple/blist.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/blist.c 2013-08-16 22:53:19.640535242 -0300 +@@ -466,9 +466,7 @@ + + acct_name = xmlnode_get_attrib(bnode, "account"); + protocol = xmlnode_get_attrib(bnode, "protocol"); +- protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */ + proto = xmlnode_get_attrib(bnode, "proto"); +- proto = _purple_oscar_convert(acct_name, proto); /* XXX: Remove */ + + if (!acct_name || (!proto && !protocol)) + return; +diff -Nur pidgin-2.10.7/libpurple/buddyicon.c pidgin-2.10.7-nonprism/libpurple/buddyicon.c +--- pidgin-2.10.7/libpurple/buddyicon.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/buddyicon.c 2013-08-16 23:28:49.244233493 -0300 +@@ -1099,18 +1099,6 @@ + { + PurpleAccount *account = purple_buddy_get_account((PurpleBuddy *)node); + const char *prpl_id = purple_account_get_protocol_id(account); +- +- if (g_str_equal(prpl_id, "prpl-yahoo") || g_str_equal(prpl_id, "prpl-yahoojp")) +- { +- int checksum = purple_blist_node_get_int(node, "icon_checksum"); +- if (checksum != 0) +- { +- char *checksum_str = g_strdup_printf("%i", checksum); +- purple_blist_node_remove_setting(node, "icon_checksum"); +- purple_blist_node_set_string(node, "icon_checksum", checksum_str); +- g_free(checksum_str); +- } +- } + } + } + } +diff -Nur pidgin-2.10.7/libpurple/ft.h pidgin-2.10.7-nonprism/libpurple/ft.h +--- pidgin-2.10.7/libpurple/ft.h 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/ft.h 2013-08-16 22:51:20.590085226 -0300 +@@ -470,8 +470,6 @@ + * can be used to jump backward in the file if the protocol detects + * that some bit of data needs to be resent or has been sent twice. + * +- * It's used for pausing and resuming an oscar file transfer. +- * + * @param xfer The file transfer. + * @param bytes_sent The new current position in the file. If we're + * sending a file then this is the byte that we will +diff -Nur pidgin-2.10.7/libpurple/gaim-compat.h pidgin-2.10.7-nonprism/libpurple/gaim-compat.h +--- pidgin-2.10.7/libpurple/gaim-compat.h 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/gaim-compat.h 2013-08-16 23:33:16.372629159 -0300 +@@ -2302,16 +2302,8 @@ + #define gaim_init_ssl_plugin purple_init_ssl_plugin + #define gaim_init_ssl_openssl_plugin purple_init_ssl_openssl_plugin + #define gaim_init_ssl_gnutls_plugin purple_init_ssl_gnutls_plugin +-#define gaim_init_gg_plugin purple_init_gg_plugin + #define gaim_init_jabber_plugin purple_init_jabber_plugin +-#define gaim_init_sametime_plugin purple_init_sametime_plugin +-#define gaim_init_msn_plugin purple_init_msn_plugin +-#define gaim_init_novell_plugin purple_init_novell_plugin +-#define gaim_init_qq_plugin purple_init_qq_plugin + #define gaim_init_simple_plugin purple_init_simple_plugin +-#define gaim_init_yahoo_plugin purple_init_yahoo_plugin + #define gaim_init_zephyr_plugin purple_init_zephyr_plugin +-#define gaim_init_aim_plugin purple_init_aim_plugin +-#define gaim_init_icq_plugin purple_init_icq_plugin + + #endif /* _GAIM_COMPAT_H_ */ +diff -Nur pidgin-2.10.7/libpurple/internal.h pidgin-2.10.7-nonprism/libpurple/internal.h +--- pidgin-2.10.7/libpurple/internal.h 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/internal.h 2013-08-17 00:24:37.244172407 -0300 +@@ -43,7 +43,7 @@ + * + * The Singular/Plural/Number ngettext dummy definition below was + * taken from an email to the texinfo mailing list by Manuel Guerrero. +- * Thank you Manuel, and thank you Alex's good friend Google. ++ * Thank you Manuel. + */ + #ifdef ENABLE_NLS + # include <locale.h> +diff -Nur pidgin-2.10.7/libpurple/media/backend-fs2.c pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c +--- pidgin-2.10.7/libpurple/media/backend-fs2.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/media/backend-fs2.c 2013-08-17 00:23:19.488440821 -0300 +@@ -1661,18 +1661,6 @@ + g_object_set(G_OBJECT(session->session), + "no-rtcp-timeout", 0, NULL); + +- /* +- * Hack to make x264 work with Gmail video. +- */ +- if (is_nice && !strcmp(sess_id, "google-video")) { +- FsElementAddedNotifier *notifier = +- fs_element_added_notifier_new(); +- g_signal_connect(G_OBJECT(notifier), "element-added", +- G_CALLBACK(gst_element_added_cb), NULL); +- fs_element_added_notifier_add(notifier, +- GST_BIN(priv->conference)); +- } +- + session->id = g_strdup(sess_id); + session->backend = self; + session->type = type; +diff -Nur pidgin-2.10.7/libpurple/plugins/psychic.c pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c +--- pidgin-2.10.7/libpurple/plugins/psychic.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/plugins/psychic.c 2013-08-27 21:18:22.251908751 -0300 +@@ -20,8 +20,7 @@ + #define PLUGIN_NAME N_("Psychic Mode") + #define PLUGIN_SUMMARY N_("Psychic mode for incoming conversation") + #define PLUGIN_DESC N_("Causes conversation windows to appear as other" \ +- " users begin to message you. This works for" \ +- " AIM, ICQ, XMPP, Sametime, and Yahoo!") ++ " users begin to message you. This works for XMPP") + #define PLUGIN_AUTHOR "Christopher O'Brien <siege@preoccupied.net>" + + +diff -Nur pidgin-2.10.7/libpurple/pounce.c pidgin-2.10.7-nonprism/libpurple/pounce.c +--- pidgin-2.10.7/libpurple/pounce.c 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/pounce.c 2013-08-16 23:02:20.671021669 -0300 +@@ -409,7 +409,6 @@ + g_free(data->account_name); + data->account_name = g_strdup(buffer); + tmp = data->protocol_id; +- data->protocol_id = g_strdup(_purple_oscar_convert(buffer, tmp)); + g_free(tmp); + } + else if (purple_strequal(element_name, "pouncee")) { +diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.am pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am +--- pidgin-2.10.7/libpurple/protocols/Makefile.am 2013-02-11 07:16:51.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.am 2013-08-16 22:37:55.011207011 -0300 +@@ -1,5 +1,5 @@ + EXTRA_DIST = Makefile.mingw + +-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr ++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr + + SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS) +diff -Nur pidgin-2.10.7/libpurple/protocols/Makefile.in pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in +--- pidgin-2.10.7/libpurple/protocols/Makefile.in 2013-02-11 07:17:19.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/protocols/Makefile.in 2013-08-16 23:50:36.651423353 -0300 +@@ -160,8 +160,6 @@ + FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@ + FARSTREAM_LIBS = @FARSTREAM_LIBS@ + FGREP = @FGREP@ +-GADU_CFLAGS = @GADU_CFLAGS@ +-GADU_LIBS = @GADU_LIBS@ + GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +@@ -223,8 +221,6 @@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@ +-MEANWHILE_LIBS = @MEANWHILE_LIBS@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MONO_CFLAGS = @MONO_CFLAGS@ +@@ -365,7 +361,7 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + EXTRA_DIST = Makefile.mingw +-DIST_SUBDIRS = bonjour gg irc jabber msn myspace mxit novell null oscar sametime silc silc10 simple yahoo zephyr ++DIST_SUBDIRS = bonjour irc jabber null silc silc10 simple zephyr + SUBDIRS = $(DYNAMIC_PRPLS) $(STATIC_PRPLS) + all: all-recursive + +diff -Nur pidgin-2.10.7/libpurple/prpl.h pidgin-2.10.7-nonprism/libpurple/prpl.h +--- pidgin-2.10.7/libpurple/prpl.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/prpl.h 2013-08-16 22:29:46.145754932 -0300 +@@ -161,15 +161,11 @@ + + /** + * Notify on new mail. +- * +- * MSN and Yahoo notify you when you have new mail. + */ + OPT_PROTO_MAIL_CHECK = 0x00000020, + + /** + * Images in IMs. +- * +- * Oscar lets you send images in direct IMs. + */ + OPT_PROTO_IM_IMAGE = 0x00000040, + +@@ -184,16 +180,13 @@ + /** + * Allows font size to be specified in sane point size + * +- * Probably just XMPP and Y!M ++ * Probably just XMPP + */ + OPT_PROTO_USE_POINTSIZE = 0x00000100, + + /** + * Set the Register button active even when the username has not + * been specified. +- * +- * Gadu-Gadu doesn't need a username to register new account (because +- * usernames are assigned by the server). + */ + OPT_PROTO_REGISTER_NOSCREENNAME = 0x00000200, + +@@ -467,9 +460,7 @@ + void (*convo_closed)(PurpleConnection *, const char *who); + + /** +- * Convert the username @a who to its canonical form. (For example, +- * AIM treats "fOo BaR" and "foobar" as the same user; this function +- * should return the same normalized string for both of those.) ++ * Convert the username @a who to its canonical form. + */ + const char *(*normalize)(const PurpleAccount *, const char *who); + +@@ -923,7 +914,7 @@ + * @param who Whose attention to request. + * @param type_code An index into the prpl's attention_types list determining the type + * of the attention request command to send. 0 if prpl only defines one +- * (for example, Yahoo and MSN), but some protocols define more (MySpaceIM). ++ * , but some protocols define more. + * + * Note that you can't send arbitrary PurpleAttentionType's, because there is + * only a fixed set of attention commands. +diff -Nur pidgin-2.10.7/libpurple/purple-url-handler pidgin-2.10.7-nonprism/libpurple/purple-url-handler +--- pidgin-2.10.7/libpurple/purple-url-handler 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/purple-url-handler 2013-08-16 21:16:42.951304560 -0300 +@@ -117,70 +117,6 @@ + def addbuddy(account, screenname, group="", alias=""): + cpurple.PurpleBlistRequestAddBuddy(account, screenname, group, alias) + +- +-def aim(uri): +- protocol = "prpl-aim" +- match = re.match(r"^aim:([^?]*)(\?(.*))", uri) +- if not match: +- print "Invalid aim URI: %s" % uri +- return +- +- command = urllib.unquote_plus(match.group(1)) +- paramstring = match.group(3) +- params = {} +- if paramstring: +- for param in paramstring.split("&"): +- key, value = extendlist(param.split("=", 1), 2, "") +- params[key] = urllib.unquote_plus(value) +- accountname = params.get("account", "") +- screenname = params.get("screenname", "") +- +- account = findaccount(protocol, accountname) +- +- if command.lower() == "goim": +- goim(account, screenname, params.get("message")) +- elif command.lower() == "gochat": +- gochat(account, params) +- elif command.lower() == "addbuddy": +- addbuddy(account, screenname, params.get("group", "")) +- +-def gg(uri): +- protocol = "prpl-gg" +- match = re.match(r"^gg:(.*)", uri) +- if not match: +- print "Invalid gg URI: %s" % uri +- return +- +- screenname = urllib.unquote_plus(match.group(1)) +- account = findaccount(protocol) +- goim(account, screenname) +- +-def icq(uri): +- protocol = "prpl-icq" +- match = re.match(r"^icq:([^?]*)(\?(.*))", uri) +- if not match: +- print "Invalid icq URI: %s" % uri +- return +- +- command = urllib.unquote_plus(match.group(1)) +- paramstring = match.group(3) +- params = {} +- if paramstring: +- for param in paramstring.split("&"): +- key, value = extendlist(param.split("=", 1), 2, "") +- params[key] = urllib.unquote_plus(value) +- accountname = params.get("account", "") +- screenname = params.get("screenname", "") +- +- account = findaccount(protocol, accountname) +- +- if command.lower() == "goim": +- goim(account, screenname, params.get("message")) +- elif command.lower() == "gochat": +- gochat(account, params) +- elif command.lower() == "addbuddy": +- addbuddy(account, screenname, params.get("group", "")) +- + def irc(uri): + protocol = "prpl-irc" + match = re.match(r"^irc:(//([^/]*))?/?([^?]*)(\?(.*))?", uri) +@@ -221,34 +157,6 @@ + channel = "#" + channel + gochat(account, {"server": server, "channel": channel, "password": params.get("key", "")}, params.get("msg")) + +-def msnim(uri): +- protocol = "prpl-msn" +- match = re.match(r"^msnim:([^?]*)(\?(.*))", uri) +- if not match: +- print "Invalid msnim URI: %s" % uri +- return +- +- command = urllib.unquote_plus(match.group(1)) +- paramstring = match.group(3) +- params = {} +- if paramstring: +- for param in paramstring.split("&"): +- key, value = extendlist(param.split("=", 1), 2, "") +- params[key] = urllib.unquote_plus(value) +- screenname = params.get("contact", "") +- +- account = findaccount(protocol) +- +- if command.lower() == "chat": +- goim(account, screenname) +- elif command.lower() == "add": +- addbuddy(account, screenname) +- +-def myim(uri): +- protocol = "prpl-myspace" +- print "TODO: send uri: ", uri +- assert False, "Not implemented" +- + def sip(uri): + protocol = "prpl-simple" + match = re.match(r"^sip:(.*)", uri) +@@ -300,57 +208,6 @@ + else: + goim(account, screenname) + +-def gtalk(uri): +- protocol = "prpl-jabber" +- match = re.match(r"^gtalk:([^?]*)(\?(.*))", uri) +- if not match: +- print "Invalid gtalk URI: %s" % uri +- return +- +- command = urllib.unquote_plus(match.group(1)) +- paramstring = match.group(3) +- params = {} +- if paramstring: +- for param in paramstring.split("&"): +- key, value = extendlist(param.split("=", 1), 2, "") +- params[key] = urllib.unquote_plus(value) +- accountname = params.get("from_jid", "") +- jid = params.get("jid", "") +- +- account = findaccount(protocol, accountname) +- +- if command.lower() == "chat": +- goim(account, jid) +- elif command.lower() == "call": +- # XXX V&V prompt to establish call +- goim(account, jid) +- +-def ymsgr(uri): +- protocol = "prpl-yahoo" +- match = re.match(r"^ymsgr:([^?]*)(\?([^&]*)(&(.*))?)", uri) +- if not match: +- print "Invalid ymsgr URI: %s" % uri +- return +- +- command = urllib.unquote_plus(match.group(1)) +- screenname = urllib.unquote_plus(match.group(3)) +- paramstring = match.group(5) +- params = {} +- if paramstring: +- for param in paramstring.split("&"): +- key, value = extendlist(param.split("=", 1), 2, "") +- params[key] = urllib.unquote_plus(value) +- +- account = findaccount(protocol) +- +- if command.lower() == "sendim": +- goim(account, screenname, params.get("m")) +- elif command.lower() == "chat": +- gochat(account, {"room": screenname}) +- elif command.lower() == "addfriend": +- addbuddy(account, screenname) +- +- + def main(argv=sys.argv): + if len(argv) != 2 or argv[1] == "--help" or argv[1] == "-h": + print "Usage: %s URI" % argv[0] +diff -Nur pidgin-2.10.7/libpurple/savedstatuses.c pidgin-2.10.7-nonprism/libpurple/savedstatuses.c +--- pidgin-2.10.7/libpurple/savedstatuses.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/savedstatuses.c 2013-08-16 22:52:44.582754543 -0300 +@@ -387,7 +387,6 @@ + const char *protocol; + acct_name = xmlnode_get_data(node); + protocol = xmlnode_get_attrib(node, "protocol"); +- protocol = _purple_oscar_convert(acct_name, protocol); /* XXX: Remove */ + if ((acct_name != NULL) && (protocol != NULL)) + ret->account = purple_accounts_find(acct_name, protocol); + g_free(acct_name); +diff -Nur pidgin-2.10.7/libpurple/server.h pidgin-2.10.7-nonprism/libpurple/server.h +--- pidgin-2.10.7/libpurple/server.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/server.h 2013-08-16 23:30:04.149920853 -0300 +@@ -69,7 +69,7 @@ + * @param who Whose attention to request. + * @param type_code An index into the prpl's attention_types list determining the type + * of the attention request command to send. 0 if prpl only defines one +- * (for example, Yahoo and MSN), but some protocols define more (MySpaceIM). ++ * , but some protocols define more. + * + * Note that you can't send arbitrary PurpleAttentionType's, because there is + * only a fixed set of attention commands. +diff -Nur pidgin-2.10.7/libpurple/status.h pidgin-2.10.7-nonprism/libpurple/status.h +--- pidgin-2.10.7/libpurple/status.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/status.h 2013-08-16 22:52:22.542054119 -0300 +@@ -43,8 +43,7 @@ + * one of your AIM buddies has set himself as "away." You have a + * PurpleBuddy node for this person in your buddy list. Purple wants + * to mark this buddy as "away," so it creates a new PurpleStatus. +- * The PurpleStatus has its PurpleStatusType set to the "away" state +- * for the oscar PRPL. The PurpleStatus also contains the buddy's ++ * The PurpleStatus also contains the buddy's + * away message. PurpleStatuses are sometimes saved, depending on + * the context. The current PurpleStatuses associated with each of + * your accounts are saved so that the next time you start Purple, +diff -Nur pidgin-2.10.7/libpurple/tests/check_libpurple.c pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c +--- pidgin-2.10.7/libpurple/tests/check_libpurple.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/check_libpurple.c 2013-08-16 22:55:33.731462302 -0300 +@@ -88,8 +88,6 @@ + srunner_add_suite(sr, jabber_digest_md5_suite()); + srunner_add_suite(sr, jabber_jutil_suite()); + srunner_add_suite(sr, jabber_scram_suite()); +- srunner_add_suite(sr, oscar_util_suite()); +- srunner_add_suite(sr, yahoo_util_suite()); + srunner_add_suite(sr, util_suite()); + srunner_add_suite(sr, xmlnode_suite()); + +diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.am pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am +--- pidgin-2.10.7/libpurple/tests/Makefile.am 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.am 2013-08-16 22:56:03.189064778 -0300 +@@ -14,8 +14,6 @@ + test_jabber_digest_md5.c \ + test_jabber_jutil.c \ + test_jabber_scram.c \ +- test_oscar_util.c \ +- test_yahoo_util.c \ + test_util.c \ + test_xmlnode.c \ + $(top_builddir)/libpurple/util.h +@@ -31,8 +29,6 @@ + + check_libpurple_LDADD=\ + $(top_builddir)/libpurple/protocols/jabber/libjabber.la \ +- $(top_builddir)/libpurple/protocols/oscar/liboscar.la \ +- $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \ + $(top_builddir)/libpurple/libpurple.la \ + @CHECK_LIBS@ \ + $(GLIB_LIBS) +diff -Nur pidgin-2.10.7/libpurple/tests/Makefile.in pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in +--- pidgin-2.10.7/libpurple/tests/Makefile.in 2013-02-11 07:17:23.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/Makefile.in 2013-08-16 23:53:20.713146759 -0300 +@@ -65,8 +65,8 @@ + CONFIG_CLEAN_VPATH_FILES = + am__check_libpurple_SOURCES_DIST = check_libpurple.c tests.h \ + test_cipher.c test_jabber_caps.c test_jabber_digest_md5.c \ +- test_jabber_jutil.c test_jabber_scram.c test_oscar_util.c \ +- test_yahoo_util.c test_util.c test_xmlnode.c \ ++ test_jabber_jutil.c test_jabber_scram.c \ ++ test_util.c test_xmlnode.c \ + $(top_builddir)/libpurple/util.h + @HAVE_CHECK_TRUE@am_check_libpurple_OBJECTS = \ + @HAVE_CHECK_TRUE@ check_libpurple-check_libpurple.$(OBJEXT) \ +@@ -75,15 +75,11 @@ + @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_digest_md5.$(OBJEXT) \ + @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_jutil.$(OBJEXT) \ + @HAVE_CHECK_TRUE@ check_libpurple-test_jabber_scram.$(OBJEXT) \ +-@HAVE_CHECK_TRUE@ check_libpurple-test_oscar_util.$(OBJEXT) \ +-@HAVE_CHECK_TRUE@ check_libpurple-test_yahoo_util.$(OBJEXT) \ + @HAVE_CHECK_TRUE@ check_libpurple-test_util.$(OBJEXT) \ + @HAVE_CHECK_TRUE@ check_libpurple-test_xmlnode.$(OBJEXT) + check_libpurple_OBJECTS = $(am_check_libpurple_OBJECTS) + am__DEPENDENCIES_1 = + @HAVE_CHECK_TRUE@check_libpurple_DEPENDENCIES = $(top_builddir)/libpurple/protocols/jabber/libjabber.la \ +-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/oscar/liboscar.la \ +-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \ + @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/libpurple.la \ + @HAVE_CHECK_TRUE@ $(am__DEPENDENCIES_1) + AM_V_lt = $(am__v_lt_@AM_V@) +@@ -177,8 +173,6 @@ + FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@ + FARSTREAM_LIBS = @FARSTREAM_LIBS@ + FGREP = @FGREP@ +-GADU_CFLAGS = @GADU_CFLAGS@ +-GADU_LIBS = @GADU_LIBS@ + GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +@@ -240,8 +234,6 @@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@ +-MEANWHILE_LIBS = @MEANWHILE_LIBS@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MONO_CFLAGS = @MONO_CFLAGS@ +@@ -389,8 +381,6 @@ + @HAVE_CHECK_TRUE@ test_jabber_digest_md5.c \ + @HAVE_CHECK_TRUE@ test_jabber_jutil.c \ + @HAVE_CHECK_TRUE@ test_jabber_scram.c \ +-@HAVE_CHECK_TRUE@ test_oscar_util.c \ +-@HAVE_CHECK_TRUE@ test_yahoo_util.c \ + @HAVE_CHECK_TRUE@ test_util.c \ + @HAVE_CHECK_TRUE@ test_xmlnode.c \ + @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/util.h +@@ -406,8 +396,6 @@ + + @HAVE_CHECK_TRUE@check_libpurple_LDADD = \ + @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/jabber/libjabber.la \ +-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/oscar/liboscar.la \ +-@HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/protocols/yahoo/libymsg.la \ + @HAVE_CHECK_TRUE@ $(top_builddir)/libpurple/libpurple.la \ + @HAVE_CHECK_TRUE@ @CHECK_LIBS@ \ + @HAVE_CHECK_TRUE@ $(GLIB_LIBS) +@@ -471,10 +459,8 @@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_digest_md5.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_jutil.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_jabber_scram.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_oscar_util.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_util.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_xmlnode.Po@am__quote@ +-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/check_libpurple-test_yahoo_util.Po@am__quote@ + + .c.o: + @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@@ -581,34 +567,6 @@ + @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + @am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_jabber_scram.obj `if test -f 'test_jabber_scram.c'; then $(CYGPATH_W) 'test_jabber_scram.c'; else $(CYGPATH_W) '$(srcdir)/test_jabber_scram.c'; fi` + +-check_libpurple-test_oscar_util.o: test_oscar_util.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.o `test -f 'test_oscar_util.c' || echo '$(srcdir)/'`test_oscar_util.c +- +-check_libpurple-test_oscar_util.obj: test_oscar_util.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_oscar_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_oscar_util.Tpo -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_oscar_util.Tpo $(DEPDIR)/check_libpurple-test_oscar_util.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_oscar_util.c' object='check_libpurple-test_oscar_util.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_oscar_util.obj `if test -f 'test_oscar_util.c'; then $(CYGPATH_W) 'test_oscar_util.c'; else $(CYGPATH_W) '$(srcdir)/test_oscar_util.c'; fi` +- +-check_libpurple-test_yahoo_util.o: test_yahoo_util.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.o' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.o `test -f 'test_yahoo_util.c' || echo '$(srcdir)/'`test_yahoo_util.c +- +-check_libpurple-test_yahoo_util.obj: test_yahoo_util.c +-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_yahoo_util.obj -MD -MP -MF $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi` +-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_yahoo_util.Tpo $(DEPDIR)/check_libpurple-test_yahoo_util.Po +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='test_yahoo_util.c' object='check_libpurple-test_yahoo_util.obj' libtool=no @AMDEPBACKSLASH@ +-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -c -o check_libpurple-test_yahoo_util.obj `if test -f 'test_yahoo_util.c'; then $(CYGPATH_W) 'test_yahoo_util.c'; else $(CYGPATH_W) '$(srcdir)/test_yahoo_util.c'; fi` +- + check_libpurple-test_util.o: test_util.c + @am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(check_libpurple_CFLAGS) $(CFLAGS) -MT check_libpurple-test_util.o -MD -MP -MF $(DEPDIR)/check_libpurple-test_util.Tpo -c -o check_libpurple-test_util.o `test -f 'test_util.c' || echo '$(srcdir)/'`test_util.c + @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/check_libpurple-test_util.Tpo $(DEPDIR)/check_libpurple-test_util.Po +diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_caps.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c +--- pidgin-2.10.7/libpurple/tests/test_jabber_caps.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_caps.c 2013-08-17 00:25:08.235128437 -0300 +@@ -33,7 +33,7 @@ + START_TEST(test_calculate_caps) + { + assert_caps_calculate_match("sha1", "GNjxthSckUNvAIoCCJFttjl6VL8=", +- "<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='google:mail:notify'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>"); ++ "<query xmlns='http://jabber.org/protocol/disco#info' node='http://tkabber.jabber.ru/#GNjxthSckUNvAIoCCJFttjl6VL8='><identity category='client' type='pc' name='Tkabber'/><x xmlns='jabber:x:data' type='result'><field var='FORM_TYPE' type='hidden'><value>urn:xmpp:dataforms:softwareinfo</value></field><field var='software'><value>Tkabber</value></field><field var='software_version'><value> ( 8.5.5 )</value></field><field var='os'><value>ATmega640-16AU</value></field><field var='os_version'><value/></field></x><feature var='games:board'/><feature var='http://jabber.org/protocol/activity'/><feature var='http://jabber.org/protocol/bytestreams'/><feature var='http://jabber.org/protocol/chatstates'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/commands'/><feature var='http://jabber.org/protocol/disco#info'/><feature var='http://jabber.org/protocol/disco#items'/><feature var='http://jabber.org/protocol/feature-neg'/><feature var='http://jabber.org/protocol/geoloc'/><feature var='http://jabber.org/protocol/ibb'/><feature var='http://jabber.org/protocol/iqibb'/><feature var='http://jabber.org/protocol/mood'/><feature var='http://jabber.org/protocol/muc'/><feature var='http://jabber.org/protocol/mute#ancestor'/><feature var='http://jabber.org/protocol/mute#editor'/><feature var='http://jabber.org/protocol/rosterx'/><feature var='http://jabber.org/protocol/si'/><feature var='http://jabber.org/protocol/si/profile/file-transfer'/><feature var='http://jabber.org/protocol/tune'/><feature var='jabber:iq:avatar'/><feature var='jabber:iq:browse'/><feature var='jabber:iq:dtcp'/><feature var='jabber:iq:filexfer'/><feature var='jabber:iq:ibb'/><feature var='jabber:iq:inband'/><feature var='jabber:iq:jidlink'/><feature var='jabber:iq:last'/><feature var='jabber:iq:oob'/><feature var='jabber:iq:privacy'/><feature var='jabber:iq:time'/><feature var='jabber:iq:version'/><feature var='jabber:x:data'/><feature var='jabber:x:event'/><feature var='jabber:x:oob'/><feature var='urn:xmpp:ping'/><feature var='urn:xmpp:receipts'/><feature var='urn:xmpp:time'/></query>"); + } + END_TEST + +diff -Nur pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c +--- pidgin-2.10.7/libpurple/tests/test_jabber_jutil.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/test_jabber_jutil.c 2013-08-27 22:53:21.524229291 -0300 +@@ -99,19 +99,19 @@ + + START_TEST(test_jabber_id_new) + { +- assert_valid_jid("gmail.com"); +- assert_valid_jid("gmail.com/Test"); +- assert_valid_jid("gmail.com/Test@"); +- assert_valid_jid("gmail.com/@"); +- assert_valid_jid("gmail.com/Test@alkjaweflkj"); +- assert_valid_jid("mark.doliner@gmail.com"); +- assert_valid_jid("mark.doliner@gmail.com/Test12345"); +- assert_valid_jid("mark.doliner@gmail.com/Test@12345"); +- assert_valid_jid("mark.doliner@gmail.com/Te/st@12@//345"); ++ assert_valid_jid("mail.com"); ++ assert_valid_jid("mail.com/Test"); ++ assert_valid_jid("mail.com/Test@"); ++ assert_valid_jid("mail.com/@"); ++ assert_valid_jid("mail.com/Test@alkjaweflkj"); ++ assert_valid_jid("mark.doliner@mail.com"); ++ assert_valid_jid("mark.doliner@mail.com/Test12345"); ++ assert_valid_jid("mark.doliner@mail.com/Test@12345"); ++ assert_valid_jid("mark.doliner@mail.com/Te/st@12@//345"); + assert_valid_jid("わいど@conference.jabber.org"); + assert_valid_jid("まりるーむ@conference.jabber.org"); +- assert_valid_jid("mark.doliner@gmail.com/まりるーむ"); +- assert_valid_jid("mark.doliner@gmail/stuff.org"); ++ assert_valid_jid("mark.doliner@mail.com/まりるーむ"); ++ assert_valid_jid("mark.doliner@mail/stuff.org"); + assert_valid_jid("stuart@nödåtXäYZ.se"); + assert_valid_jid("stuart@nödåtXäYZ.se/まりるーむ"); + assert_valid_jid("mark.doliner@わいど.org"); +@@ -123,17 +123,17 @@ + assert_valid_jid("pa=ul@10.0.42.230"); + assert_valid_jid("pa,ul@10.0.42.230"); + +- assert_invalid_jid("@gmail.com"); +- assert_invalid_jid("@@gmail.com"); +- assert_invalid_jid("mark.doliner@@gmail.com/Test12345"); +- assert_invalid_jid("mark@doliner@gmail.com/Test12345"); +- assert_invalid_jid("@gmail.com/Test@12345"); ++ assert_invalid_jid("@mail.com"); ++ assert_invalid_jid("@@mail.com"); ++ assert_invalid_jid("mark.doliner@@mail.com/Test12345"); ++ assert_invalid_jid("mark@doliner@mail.com/Test12345"); ++ assert_invalid_jid("@mail.com/Test@12345"); + assert_invalid_jid("/Test@12345"); + assert_invalid_jid("mark.doliner@"); + assert_invalid_jid("mark.doliner/"); +- assert_invalid_jid("mark.doliner@gmail_stuff.org"); +- assert_invalid_jid("mark.doliner@gmail[stuff.org"); +- assert_invalid_jid("mark.doliner@gmail\\stuff.org"); ++ assert_invalid_jid("mark.doliner@mail_stuff.org"); ++ assert_invalid_jid("mark.doliner@mail[stuff.org"); ++ assert_invalid_jid("mark.doliner@mail\\stuff.org"); + assert_invalid_jid("paul@[::1]124"); + assert_invalid_jid("paul@2[::1]124/as"); + assert_invalid_jid("paul@まつ.おおかみ/\x01"); +diff -Nur pidgin-2.10.7/libpurple/tests/tests.h pidgin-2.10.7-nonprism/libpurple/tests/tests.h +--- pidgin-2.10.7/libpurple/tests/tests.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/tests/tests.h 2013-08-16 22:56:18.999567027 -0300 +@@ -13,8 +13,6 @@ + Suite * jabber_digest_md5_suite(void); + Suite * jabber_jutil_suite(void); + Suite * jabber_scram_suite(void); +-Suite * oscar_util_suite(void); +-Suite * yahoo_util_suite(void); + Suite * util_suite(void); + Suite * xmlnode_suite(void); + +diff -Nur pidgin-2.10.7/libpurple/util.c pidgin-2.10.7-nonprism/libpurple/util.c +--- pidgin-2.10.7/libpurple/util.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/util.c 2013-08-16 23:29:38.062434329 -0300 +@@ -3451,8 +3451,7 @@ + * is set to TRUE if this URL is https, otherwise it is set to + * FALSE. But that change will break the API. + * +- * This is important for Yahoo! web messenger login. They now +- * force https login, and if you access the web messenger login ++ * They now force https login, and if you access the web messenger login + * page via http then it redirects you to the https version, but + * purple_util_fetch_url() ignores the "https" and attempts to + * fetch the URL via http again, which gets redirected again. +@@ -4943,18 +4942,6 @@ + return buf; + } + +-const char *_purple_oscar_convert(const char *act, const char *protocol) +-{ +- if (act && purple_strequal(protocol, "prpl-oscar")) { +- int i; +- for (i = 0; act[i] != '\0'; i++) +- if (!isdigit(act[i])) +- return "prpl-aim"; +- return "prpl-icq"; +- } +- return protocol; +-} +- + void purple_restore_default_signal_handlers(void) + { + #ifndef _WIN32 +diff -Nur pidgin-2.10.7/libpurple/util.h pidgin-2.10.7-nonprism/libpurple/util.h +--- pidgin-2.10.7/libpurple/util.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/libpurple/util.h 2013-08-16 23:31:12.535403448 -0300 +@@ -456,8 +456,7 @@ + /** + * Extracts a field of data from HTML. + * +- * This is a scary function. See protocols/msn/msn.c and +- * protocols/yahoo/yahoo_profile.c for example usage. ++ * This is a scary function. + * + * @param str The string to parse. + * @param len The size of str. +@@ -1450,16 +1449,6 @@ + const char *purple_escape_filename(const char *str); + + /** +- * This is added temporarily to assist the split of oscar into aim and icq. +- * This should not be used by plugins. +- * +- * @deprecated This function should not be used in new code and should be +- * removed in 3.0.0. The aim/icq prpl split happened a long +- * time ago, and we don't need to keep migrating old data. +- */ +-const char *_purple_oscar_convert(const char *act, const char *protocol); +- +-/** + * Restore default signal handlers for signals which might reasonably have + * handlers. This should be called by a fork()'d child process, since child processes + * inherit the handlers of the parent. +diff -Nur pidgin-2.10.7/pidgin/gtkaccount.c pidgin-2.10.7-nonprism/pidgin/gtkaccount.c +--- pidgin-2.10.7/pidgin/gtkaccount.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkaccount.c 2013-08-27 22:45:35.495576079 -0300 +@@ -563,16 +563,11 @@ + if (value == NULL) + value = purple_account_user_split_get_default_value(split); + +- /* Google Talk default domain hackery! */ + menu = gtk_option_menu_get_menu(GTK_OPTION_MENU(dialog->protocol_menu)); + item = gtk_menu_get_active(GTK_MENU(menu)); +- if (value == NULL && g_object_get_data(G_OBJECT(item), "fakegoogle") && ++ if (value == NULL && g_object_get_data(G_OBJECT(item), "") && + !strcmp(purple_account_user_split_get_text(split), _("Domain"))) +- value = "gmail.com"; +- +- if (value == NULL && g_object_get_data(G_OBJECT(item), "fakefacebook") && +- !strcmp(purple_account_user_split_get_text(split), _("Domain"))) +- value = "chat.facebook.com"; ++ value = ""; + + if (value != NULL) + gtk_entry_set_text(GTK_ENTRY(entry), value); +@@ -925,10 +920,6 @@ + model = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER); + opt_entry->widget = combo = gtk_combo_box_new_with_model(GTK_TREE_MODEL(model)); + +- if (g_object_get_data(G_OBJECT(item), "fakefacebook") && +- !strcmp(opt_entry->setting, "connection_security")) +- str_value = "opportunistic_tls"; +- + /* Loop through list of PurpleKeyValuePair items */ + for (node = list; node != NULL; node = node->next) { + if (node->data != NULL) { +diff -Nur pidgin-2.10.7/pidgin/gtkblist.c pidgin-2.10.7-nonprism/pidgin/gtkblist.c +--- pidgin-2.10.7/pidgin/gtkblist.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkblist.c 2013-08-16 23:10:16.549286879 -0300 +@@ -2126,10 +2126,6 @@ + char *temp_vcard; + char *s, *c; + char *alias = NULL; +- GList *aims = NULL; +- GList *icqs = NULL; +- GList *yahoos = NULL; +- GList *msns = NULL; + GList *jabbers = NULL; + + s = temp_vcard = g_strdup(vcard); +@@ -2168,24 +2164,14 @@ + /* We only want to worry about a few fields here. */ + if (!strcmp(field, "FN")) + alias = g_strdup(value); +- else if (!strcmp(field, "X-AIM") || !strcmp(field, "X-ICQ") || +- !strcmp(field, "X-YAHOO") || !strcmp(field, "X-MSN") || +- !strcmp(field, "X-JABBER")) ++ else if (!strcmp(field, "X-JABBER")) + { + char **values = g_strsplit(value, ":", 0); + char **im; + + for (im = values; *im != NULL; im++) + { +- if (!strcmp(field, "X-AIM")) +- aims = g_list_append(aims, g_strdup(*im)); +- else if (!strcmp(field, "X-ICQ")) +- icqs = g_list_append(icqs, g_strdup(*im)); +- else if (!strcmp(field, "X-YAHOO")) +- yahoos = g_list_append(yahoos, g_strdup(*im)); +- else if (!strcmp(field, "X-MSN")) +- msns = g_list_append(msns, g_strdup(*im)); +- else if (!strcmp(field, "X-JABBER")) ++ if (!strcmp(field, "X-JABBER")) + jabbers = g_list_append(jabbers, g_strdup(*im)); + } + +@@ -2195,18 +2181,13 @@ + + g_free(temp_vcard); + +- if (aims == NULL && icqs == NULL && yahoos == NULL && +- msns == NULL && jabbers == NULL) ++ if (jabbers == NULL) + { + g_free(alias); + + return FALSE; + } + +- add_buddies_from_vcard("prpl-aim", group, aims, alias); +- add_buddies_from_vcard("prpl-icq", group, icqs, alias); +- add_buddies_from_vcard("prpl-yahoo", group, yahoos, alias); +- add_buddies_from_vcard("prpl-msn", group, msns, alias); + add_buddies_from_vcard("prpl-jabber", group, jabbers, alias); + + g_free(alias); +diff -Nur pidgin-2.10.7/pidgin/gtkdialogs.c pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c +--- pidgin-2.10.7/pidgin/gtkdialogs.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkdialogs.c 2013-08-16 21:37:21.863154130 -0300 +@@ -615,16 +615,6 @@ + #endif + #endif + +-#if defined(_WIN32) || defined(USE_INTERNAL_LIBGADU) +- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Internal<br/>"); +-#else +-#ifdef HAVE_LIBGADU +- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Enabled<br/>"); +-#else +- g_string_append(str, " <b>Gadu-Gadu library (libgadu):</b> Disabled<br/>"); +-#endif +-#endif +- + #ifdef USE_GTKSPELL + g_string_append(str, " <b>GtkSpell:</b> Enabled<br/>"); + #else +diff -Nur pidgin-2.10.7/pidgin/gtkimhtml.c pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c +--- pidgin-2.10.7/pidgin/gtkimhtml.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkimhtml.c 2013-08-16 22:59:51.862994429 -0300 +@@ -2440,7 +2440,6 @@ + static gboolean smooth_scroll_cb(gpointer data); + + /* +- <KingAnt> marv: The two IM image functions in oscar are purple_odc_send_im and purple_odc_incoming + + + [19:58] <Robot101> marv: images go into the imgstore, a refcounted... well.. hash. :) +diff -Nur pidgin-2.10.7/pidgin/gtknotify.c pidgin-2.10.7-nonprism/pidgin/gtknotify.c +--- pidgin-2.10.7/pidgin/gtknotify.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtknotify.c 2013-08-27 23:37:23.037593200 -0300 +@@ -1263,10 +1263,6 @@ + command = g_strdup_printf("xdg-open %s", escaped); + g_free(tmp); + } +- else if (purple_running_osx() == TRUE) +- { +- command = g_strdup_printf("open %s", escaped); +- } + else if (!strcmp(web_browser, "epiphany") || + !strcmp(web_browser, "galeon")) + { +@@ -1289,30 +1285,31 @@ + { + command = g_strdup_printf("kfmclient openURL %s", escaped); + /* +- * Does Konqueror have options to open in new tab ++ * Does Konqueror-libre have options to open in new tab + * and/or current window? + */ + } +- else if (!strcmp(web_browser, "mozilla") || +- !strcmp(web_browser, "mozilla-firebird") || +- !strcmp(web_browser, "firefox") || +- !strcmp(web_browser, "seamonkey")) ++ else if (!strcmp(web_browser, "iceweasel") || ++ !strcmp(web_browser, "icecat") || ++ !strcmp(web_browser, "iceape")) + { + char *args = ""; + + command = g_strdup_printf("%s %s", web_browser, escaped); + + /* +- * Firefox 0.9 and higher require a "-a firefox" option when ++ * Iceweasel-libre 0.9 and higher require a "-a iceweasel" option when + * using -remote commands. This breaks older versions of + * mozilla. So we include this other handly little string +- * when calling firefox. If the API for remote calls changes +- * any more in firefox then firefox should probably be split ++ * when calling iceweasel. If the API for remote calls changes ++ * any more in iceweasel then iceweasel should probably be split + * apart from mozilla-firebird and mozilla... but this is good + * for now. + */ +- if (!strcmp(web_browser, "firefox")) +- args = "-a firefox"; ++ if (!strcmp(web_browser, "iceweasel")) ++ args = "-a iceweasel"; ++ else if (!strcmp(web_browser, "icecat")) ++ args = "-a icecat"; + + if (place == PIDGIN_BROWSER_NEW_WINDOW) + remote_command = g_strdup_printf("%s %s -remote " +@@ -1327,58 +1324,12 @@ + "openURL(%s)", + web_browser, args, escaped); + } +- else if (!strcmp(web_browser, "netscape")) +- { +- command = g_strdup_printf("netscape %s", escaped); +- +- if (place == PIDGIN_BROWSER_NEW_WINDOW) +- { +- remote_command = g_strdup_printf("netscape -remote " +- "openURL(%s,new-window)", +- escaped); +- } +- else if (place == PIDGIN_BROWSER_CURRENT) +- { +- remote_command = g_strdup_printf("netscape -remote " +- "openURL(%s)", escaped); +- } +- } +- else if (!strcmp(web_browser, "opera")) +- { +- if (place == PIDGIN_BROWSER_NEW_WINDOW) +- command = g_strdup_printf("opera -newwindow %s", escaped); +- else if (place == PIDGIN_BROWSER_NEW_TAB) +- command = g_strdup_printf("opera -newpage %s", escaped); +- else if (place == PIDGIN_BROWSER_CURRENT) +- { +- remote_command = g_strdup_printf("opera -remote " +- "openURL(%s)", escaped); +- command = g_strdup_printf("opera %s", escaped); +- } +- else +- command = g_strdup_printf("opera %s", escaped); +- +- } +- else if (!strcmp(web_browser, "google-chrome")) +- { +- /* Google Chrome doesn't have command-line arguments that control the +- * opening of links from external calls. This is controlled solely from +- * a preference within Google Chrome. */ +- command = g_strdup_printf("google-chrome %s", escaped); +- } +- else if (!strcmp(web_browser, "chrome")) +- { +- /* Chromium doesn't have command-line arguments that control the +- * opening of links from external calls. This is controlled solely from +- * a preference within Chromium. */ +- command = g_strdup_printf("chrome %s", escaped); +- } +- else if (!strcmp(web_browser, "chromium-browser")) ++ else if (!strcmp(web_browser, "chromium")) + { +- /* Chromium doesn't have command-line arguments that control the ++ /* Chromium-libre doesn't have command-line arguments that control the + * opening of links from external calls. This is controlled solely from +- * a preference within Chromium. */ +- command = g_strdup_printf("chromium-browser %s", escaped); ++ * a preference within Chromium-libre. */ ++ command = g_strdup_printf("chromium %s", escaped); + } + else if (!strcmp(web_browser, "custom")) + { +diff -Nur pidgin-2.10.7/pidgin/gtkprefs.c pidgin-2.10.7-nonprism/pidgin/gtkprefs.c +--- pidgin-2.10.7/pidgin/gtkprefs.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkprefs.c 2013-08-27 22:55:58.523782666 -0300 +@@ -1851,24 +1851,15 @@ + + /* Sorted reverse alphabetically */ + static const struct browser possible_browsers[] = { +- {N_("Seamonkey"), "seamonkey"}, +- {N_("Opera"), "opera"}, +- {N_("Netscape"), "netscape"}, +- {N_("Mozilla"), "mozilla"}, +- {N_("Konqueror"), "kfmclient"}, +- {N_("Google Chrome"), "google-chrome"}, +- /* Do not move the line below. Code below expects gnome-open to be in +- * this list immediately after xdg-open! */ ++ {N_("Iceape-libre"), "iceape"}, ++ {N_("Konqueror-libre"), "kfmclient"}, + {N_("Desktop Default"), "xdg-open"}, + {N_("GNOME Default"), "gnome-open"}, +- {N_("Galeon"), "galeon"}, +- {N_("Firefox"), "firefox"}, +- {N_("Firebird"), "mozilla-firebird"}, +- {N_("Epiphany"), "epiphany"}, +- /* Translators: please do not translate "chromium-browser" here! */ +- {N_("Chromium (chromium-browser)"), "chromium-browser"}, +- /* Translators: please do not translate "chrome" here! */ +- {N_("Chromium (chrome)"), "chrome"} ++ {N_("Iceweasel-libre"), "iceweasel"}, ++ {N_("Icecat"), "icecat"}, ++ {N_("Epiphany-libre"), "epiphany"}, ++ /* Translators: please do not translate "chromium" here! */ ++ {N_("Chromium-libre (chromium)"), "chromium"}, + }; + static const int num_possible_browsers = G_N_ELEMENTS(possible_browsers); + +diff -Nur pidgin-2.10.7/pidgin/gtkutils.c pidgin-2.10.7-nonprism/pidgin/gtkutils.c +--- pidgin-2.10.7/pidgin/gtkutils.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkutils.c 2013-08-16 19:59:22.633298587 -0300 +@@ -677,7 +677,6 @@ + GdkPixbuf *pixbuf = NULL; + GtkSizeGroup *sg; + GList *p; +- const char *gtalk_name = NULL, *facebook_name = NULL; + int i; + + aop_menu = g_malloc0(sizeof(AopMenu)); +@@ -686,55 +685,12 @@ + gtk_widget_show(aop_menu->menu); + sg = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); + +- if (purple_find_prpl("prpl-jabber")) { +- gtalk_name = _("Google Talk"); +- facebook_name = _("Facebook (XMPP)"); +- } +- + for (p = purple_plugins_get_protocols(), i = 0; + p != NULL; + p = p->next, i++) { + + plugin = (PurplePlugin *)p->data; + +- if (gtalk_name && strcmp(gtalk_name, plugin->info->name) < 0) { +- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", +- "16", "google-talk.png", NULL); +- GtkWidget *item; +- +- pixbuf = pidgin_pixbuf_new_from_file(filename); +- g_free(filename); +- +- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), +- item = aop_menu_item_new(sg, pixbuf, gtalk_name, "prpl-jabber", "protocol")); +- g_object_set_data(G_OBJECT(item), "fakegoogle", GINT_TO_POINTER(1)); +- +- if (pixbuf) +- g_object_unref(pixbuf); +- +- gtalk_name = NULL; +- i++; +- } +- +- if (facebook_name && strcmp(facebook_name, plugin->info->name) < 0) { +- char *filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "protocols", +- "16", "facebook.png", NULL); +- GtkWidget *item; +- +- pixbuf = pidgin_pixbuf_new_from_file(filename); +- g_free(filename); +- +- gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), +- item = aop_menu_item_new(sg, pixbuf, facebook_name, "prpl-jabber", "protocol")); +- g_object_set_data(G_OBJECT(item), "fakefacebook", GINT_TO_POINTER(1)); +- +- if (pixbuf) +- g_object_unref(pixbuf); +- +- facebook_name = NULL; +- i++; +- } +- + pixbuf = pidgin_create_prpl_icon_from_prpl(plugin, PIDGIN_PRPL_ICON_SMALL, NULL); + + gtk_menu_shell_append(GTK_MENU_SHELL(aop_menu->menu), +diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.c pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c +--- pidgin-2.10.7/pidgin/gtkwhiteboard.c 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.c 2013-08-16 23:25:21.614375960 -0300 +@@ -339,13 +339,10 @@ + */ + /* XXXX because otherwise gettext will see this string, even though it's + * in an #if 0 block. Remove the XXXX if you want to use this code. +- * But, it really shouldn't be a Yahoo-specific string. ;) */ ++ */ + purple_conv_im_write(PURPLE_CONV_IM(conv), "", XXXX_("Sent Doodle request."), + PURPLE_MESSAGE_NICK | PURPLE_MESSAGE_RECV, time(NULL)); + +- yahoo_doodle_command_send_request(gc, to); +- yahoo_doodle_command_send_ready(gc, to); +- + /* Insert this 'session' in the list. At this point, it's only a requested + * session. + */ +@@ -554,15 +551,13 @@ + if(event->button == 1 && pixmap != NULL) + { + /* If the brush was never moved, express two sets of two deltas That's a +- * 'point,' but not for Yahoo! ++ * 'point,' + */ + /* if((event->x == LastX) && (event->y == LastY)) */ + if(MotionCount == 0) + { + int index; + +- /* For Yahoo!, a (0 0) indicates the end of drawing */ +- /* FIXME: Yahoo Doodle specific! */ + for(index = 0; index < 2; index++) + { + draw_list = g_list_append(draw_list, 0); +diff -Nur pidgin-2.10.7/pidgin/gtkwhiteboard.h pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h +--- pidgin-2.10.7/pidgin/gtkwhiteboard.h 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/gtkwhiteboard.h 2013-08-27 23:28:41.018759351 -0300 +@@ -37,8 +37,7 @@ + #define BRUSH_STATE_DOWN 1 + #define BRUSH_STATE_MOTION 2 + +-/* XXX: This seems duplicated with the Yahoo! Doodle prpl code. +- * XXX: How should they work together? */ ++/* XXX: How should they work together? */ + #define PALETTE_NUM_COLORS 7 + + /** +diff -Nur pidgin-2.10.7/pidgin/Makefile.am pidgin-2.10.7-nonprism/pidgin/Makefile.am +--- pidgin-2.10.7/pidgin/Makefile.am 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/Makefile.am 2013-08-16 21:03:34.936610745 -0300 +@@ -160,10 +160,6 @@ + $(GTK_LIBS) \ + $(top_builddir)/libpurple/libpurple.la + +-if USE_INTERNAL_LIBGADU +-INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU +-endif +- + AM_CPPFLAGS = \ + -DDATADIR=\"$(datadir)\" \ + -DLIBDIR=\"$(libdir)/pidgin/\" \ +@@ -179,6 +175,5 @@ + $(GTK_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(GTKSPELL_CFLAGS) \ +- $(LIBXML_CFLAGS) \ +- $(INTGG_CFLAGS) ++ $(LIBXML_CFLAGS) + endif # ENABLE_GTK +diff -Nur pidgin-2.10.7/pidgin/Makefile.in pidgin-2.10.7-nonprism/pidgin/Makefile.in +--- pidgin-2.10.7/pidgin/Makefile.in 2013-02-11 07:17:23.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/Makefile.in 2013-08-16 23:56:44.729405978 -0300 +@@ -286,8 +286,6 @@ + FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@ + FARSTREAM_LIBS = @FARSTREAM_LIBS@ + FGREP = @FGREP@ +-GADU_CFLAGS = @GADU_CFLAGS@ +-GADU_LIBS = @GADU_LIBS@ + GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +@@ -349,8 +347,6 @@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@ +-MEANWHILE_LIBS = @MEANWHILE_LIBS@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MONO_CFLAGS = @MONO_CFLAGS@ +@@ -645,7 +641,6 @@ + @ENABLE_GTK_TRUE@ $(GTK_LIBS) \ + @ENABLE_GTK_TRUE@ $(top_builddir)/libpurple/libpurple.la + +-@ENABLE_GTK_TRUE@@USE_INTERNAL_LIBGADU_TRUE@INTGG_CFLAGS = -DUSE_INTERNAL_LIBGADU + @ENABLE_GTK_TRUE@AM_CPPFLAGS = \ + @ENABLE_GTK_TRUE@ -DDATADIR=\"$(datadir)\" \ + @ENABLE_GTK_TRUE@ -DLIBDIR=\"$(libdir)/pidgin/\" \ +diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in +--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/default.theme.in 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/default.theme.in 2013-08-16 23:13:41.759061988 -0300 +@@ -28,8 +28,7 @@ + + + [XMPP] +-# Following XEP-0038 + GTalk + our default set, in default set order +-# The GTalk strings come from ticket #3307. ++# Following XEP-0038 + our default set, in default set order + happy.png :) :-) =) + excited.png :-D :-d :D :d =D =d + sad.png :-( :( +@@ -47,7 +46,7 @@ + foot-in-mouth.png :-! + shout.png >:o >:O + +-# Following XEP-0038 + GTalk ++# Following XEP-0038 + angry.png >:-( >:( X-( x-( + good.png :yes: + bad.png :no: +@@ -75,515 +74,3 @@ + ! skywalker.png C:-) c:-) C:) c:) + ! monkey.png :-(|) :(|) 8-|) + ! cyclops.png O-) o-) +- +- +-# Following AIM 6.1 +-[AIM] +-happy.png :-) :) +-wink.png ;-) ;) +-sad.png :-( :( +-tongue.png :P :p :-P :-p +-shocked.png =-O +-kiss.png :-* +-shout.png >:o +-excited.png :-D :D +-moneymouth.png :-$ +-foot-in-mouth.png :-! +-embarrassed.png :-[ +-angel.png O:-) +-thinking.png :-\\ :-/ +-crying.png :'( +-shut-mouth.png :-X +-glasses-cool.png 8-) +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following Windows Live Messenger 8.1 +-[MSN] +-happy.png :) :-) +-excited.png :D :d :-D :-d +-wink.png ;) ;-) +-shocked.png :-O :-o :O :o +-tongue.png :-P :P :-p :p +-glasses-cool.png (H) (h) +-angry.png :@ :-@ +-embarrassed.png :$ :-$ +-confused.png :S :s :-S :-s +-sad.png :( :-( +-crying.png :'( +-neutral.png :| :-| +-devil.png (6) +-angel.png (A) (a) +-in_love.png (L) (l) +-love-over.png (U) (u) +-msn.png (M) (m) +-cat.png (@) +-dog.png (&) +-moon.png (S) +-star.png (*) +-film.png (~) +-musical-note.png (8) +-mail.png (E) (e) +-rose.png (F) (f) +-rose-dead.png (W) (w) +-clock.png (O) (o) +-kiss.png (K) (k) +-present.png (G) (g) +-cake.png (^) +-camera.png (P) (p) +-lamp.png (I) (i) +-coffee.png (C) (c) +-phone.png (T) (t) +-hug-left.png ({) +-hug-right.png (}) +-beer.png (B) (b) +-drink.png (D) (d) +-boy.png (Z) (z) +-girl.png (X) (x) +-good.png (Y) (y) +-bad.png (N) (n) +-vampire.png :[ :-[ +-goat.png (nah) +-sun.png (#) +-rainbow.png (R) (r) +-quiet.png :-# +-teeth.png 8o| +-glasses-nerdy.png 8-| +-sarcastic.png ^o) +-secret.png :-* +-sick.png +o( +-snail.png (sn) +-turtle.png (tu) +-plate.png (pl) +-bowl.png (||) +-pizza.png (pi) +-soccerball.png (so) +-car.png (au) +-airplane.png (ap) +-umbrella.png (um) +-island.png (ip) +-computer.png (co) +-mobile.png (mp) +-brb.png (brb) +-rain.png (st) +-highfive.png (h5) +-coins.png (mo) +-sheep.png (bah) +-dont-know.png :^) +-thinking.png *-) +-thunder.png (li) +-party.png <:o) +-eyeroll.png 8-) +-sleepy.png |-) +-bunny.png ('.') +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +-# Hidden MSN emotes +-cigarette.png (ci) (CI) +-handcuffs.png (%) +-console.png (xx) (XX) +-fingers-crossed.png (yn) (YN) +- +- +-# Following QQ 2006 +-[QQ] +-shocked.png /:O /jy /surprised +-curl-lip.png /:~ /pz /curl_lip +-desire.png /:* /se /desire +-dazed.png /:| /dazed +-party.png /8-) /dy /revel +-crying.png /:< /ll /cry +-bashful.png /:$ /hx /bashful +-shut-mouth.png /:X /bz /shut_mouth +-sleeping.png /:Z /shui /sleep +-weep.png /:'( /dk /weep +-embarrassed.png /:-| /gg /embarassed +-pissed-off.png /:@ /fn /pissed_off +-act-up.png /:P /tp /act_up +-excited.png /:D /cy /toothy_smile +-happy.png /:) /wx /small_smile +-sad.png /:( /ng /sad +-glasses-cool.png /:+ /kuk /cool +-doctor.png /:# /feid /SARS +-silly.png /:Q /zk /crazy +-sick.png /:T /tu /vomit +-snicker.png /;p /tx /titter +-cute.png /;-D /ka /cute +-disdain.png /;d /by /disdain +-arrogant.png /;o /am /arrogant +-starving.png /:g /jie /starving +-sleepy.png /|-) /kun /sleepy +-terror.png /:! /jk /terror +-hot.png /:L /sweat +-smirk.png /:> /hanx /smirk +-soldier.png /:; /db /soldier +-struggle.png /;f /fendou /struggle +-curse.png /:-S /zhm /curse +-question.png /? /yiw /question +-quiet.png /;x /xu /shh +-hypnotized.png /;@ /yun /dizzy +-excruciating.png /:8 /zhem /excrutiating +-freaked-out.png /;! /shuai /freaked_out +-skeleton.png /!!! /kl /skeleton +-hammer.png /xx /qiao /hammer +-bye.png /bye /zj /bye +-go-away.png /go /shan /go +-afraid.png /shake /fad /shake +-amorous.png /love /aiq /love +-jump.png /jump /tiao /jump +-search.png /find /zhao /search +-lashes.png /& /mm /beautiful_eyebrows +-pig.png /pig /zt /pig +-cat.png /cat /mm /cat +-dog.png /dog /xg /dog +-hug-left.png /hug /yb /hug +-coins.png /$ /qianc /money +-lamp.png /! /dp /lightbulb +-bowl.png /cup /bei /cup +-cake.png /cake /dg /cake +-thunder.png /li /shd /lightning +-bomb.png /bome /zhd /bomb +-knife.png /kn /dao /knife +-soccerball.png /footb /zq /soccer +-musical-note.png /music /yy /music +-poop.png /shit /bb /shit +-coffee.png /coffee /kf /coffee +-hungry.png /eat /fan /eat +-pill.png /pill /yw /pill +-rose.png /rose /mg /rose +-wilt.png /fade /dx /wilt +-kiss.png /kiss /wen /kiss +-in_love.png /heart /xin /heart +-love-over.png /break /xs /broken_heart +-meeting.png /meeting /hy /meeting +-present.png /gift /lw /gift +-phone.png /phone /dh /phone +-clock.png /time /sj /time +-mail.png /email /yj /email +-tv.png /TV /ds /TV +-sun.png /sun /ty /sun +-moon.png /moon /yl /moon +-good.png /strong /qiang /thumbs_up +-bad.png /weak /ruo /thumbs_down +-handshake.png /share /ws /handshake +-victory.png /v /shl /victory +-beauty.png /<J> /mn /beauty +-qq.png /<QQ> /qz /qq +-blowkiss.png /<L> /fw /blow_kiss +-angry.png /<O> /oh /angry +-liquor.png /<B> /bj /baijiu +-can.png /<U> /qsh /soda +-watermelon.png /<W> /xigua /watermelon +-rain.png /<!!> /xy /rain +-cloudy.png /<~> /duoy /cloudy +-snowman.png /<Z> /xr /snowman +-star.png /<*> /xixing /star +-girl.png /<00> /nv /woman +-boy.png /<11> /nan /man +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following ICQ 6.0 +-[ICQ] +-happy.png :-) :) +-neutral.png :-$ +-sad.png :-( :( +-shocked.png =-O +-wink.png ;-) ;) +-tongue.png :-P :P :-p :p +-music.png [:-} +-laugh.png *JOKINGLY* +-sleeping.png *TIRED* +-crying.png :'( :'-( +-sick.png :-! +-kissed.png *KISSED* +-stop.png *STOP* +-kiss.png :-{} :-* +-kissing.png *KISSING* +-victory.png *YAHOO* +-silly.png %) +-embarrassed.png :-[ +-devil.png ]:-> +-angel.png O:-) +-rose.png @}->-- +-shut-mouth.png :-X :X :-x :x +-bomb.png @= +-thinking.png :-\\ :-/ +-good.png *THUMBS\ UP* +-shout.png >:o >:O :-@ +-beer.png *DRINK* +-excited.png :-D :D +-glasses-cool.png 8-) +-amorous.png *IN\ LOVE* +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-hypnotized.png @-) +-on-the-phone.png :)] +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-glasses-nerdy.png :-B :-b +-quiet.png :-$ +-drool.png =P~ =p~ +-lying.png :^O :^o +-call-me.png :-c +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-laugh.png :)) :-)) +-bye.png =; +-arrogant.png [-( +-thinking.png :-? +-waiting.png :-w :-W +-at-wits-end.png ~x( ~X( +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-clown.png :o) :O) +-doh.png #-o #-O +-weep.png :-< +-go-away.png :-h +-lashes.png ;;) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-silly.png 8-} +-clap.png =D> =d> +-mad-tongue.png >:P >:p +-time-out.png :-t :-T +-hug-left.png >:D< >:d< +-love-over.png =(( +-hot.png #:-S #:-s +-rotfl.png =)) :-j :-J +-loser.png L-) l-) +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +-cowboy.png <):) +-desire.png 8-> +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +-# Hidden Yahoo emotes +-alien.png =:) >-) +-beat-up.png b-( B-( +-chicken.png ~:> +-coffee.png ~o) ~O) +-cow.png 3:-O 3:-o +-dance.png \\:D/ \\:d/ +-rose.png @};- +-dont-know.png :-L :-l +-skeleton.png 8-X 8-x +-lamp.png *-:) +-monkey.png :(|) +-coins.png $-) +-peace.png :)>- +-pig.png :@) +-pray.png [-o< [-O< +-pumpkin.png (~~) +-shame.png [-X [-x +-flag.png **== +-clover.png %%- +-musical-note.png :-" +-giggle.png ;)) +-worship.png ^:)^ +-star.png (*) +-waving.png >:/ +-talktohand.png :-@ +- +-# Only available after activating the Yahoo! Fighter IMVironment +-male-fighter1.png o-> O-> +-male-fighter2.png o=> O=> +-female-fighter.png o-+ O-+ +-yin-yang.png (%) +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo JAPAN] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-hypnotized.png @-) +-on-the-phone.png :)] +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-glasses-nerdy.png :-B :-b +-quiet.png :-$ +-drool.png =P~ =p~ +-lying.png :^O :^o +-call-me.png :-c +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-laugh.png :)) :-)) +-bye.png =; +-arrogant.png [-( +-thinking.png :-? +-waiting.png :-w :-W +-at-wits-end.png ~x( ~X( +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-clown.png :o) :O) +-doh.png #-o #-O +-weep.png :-< +-go-away.png :-h +-lashes.png ;;) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-silly.png 8-} +-clap.png =D> =d> +-mad-tongue.png >:P >:p +-time-out.png :-t :-T +-hug-left.png >:D< >:d< +-love-over.png =(( +-hot.png #:-S #:-s +-rotfl.png =)) :-j :-J +-loser.png L-) l-) +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +-cowboy.png <):) +-desire.png 8-> +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) +- +-# Hidden Yahoo emotes +-alien.png =:) >-) +-beat-up.png b-( B-( +-chicken.png ~:> +-coffee.png ~o) ~O) +-cow.png 3:-O 3:-o +-dance.png \\:D/ \\:d/ +-rose.png @};- +-dont-know.png :-L :-l +-skeleton.png 8-X 8-x +-lamp.png *-:) +-monkey.png :(|) +-coins.png $-) +-peace.png :)>- +-pig.png :@) +-pray.png [-o< [-O< +-pumpkin.png (~~) +-shame.png [-X [-x +-flag.png **== +-clover.png %%- +-musical-note.png :-" +-giggle.png ;)) +-worship.png ^:)^ +-star.png (*) +-waving.png >:/ +-talktohand.png :-@ +- +-# Only available after activating the Yahoo! Fighter IMVironment +-male-fighter1.png o-> O-> +-male-fighter2.png o=> O=> +-female-fighter.png o-+ O-+ +-yin-yang.png (%) +- +- +-# Following MySpaceIM Beta 1.0.697.0 +-[MySpaceIM] +-excited.png :D :-D +-devil.png }:) +-confused.png :Z +-glasses-nerdy.png B) +-bulgy-eyes.png %) +-freaked-out.png :E +-happy.png :) :-) +-amorous.png :X +-laugh.png :)) +-mohawk.png -: +-mad-tongue.png X( +-messed.png X) +-glasses-nerdy.png Q) +-doh.png :G +-pirate.png P) +-shocked.png :O +-sidefrown.png :{ +-sinister.png :B +-smirk.png :, +-neutral.png :| +-tongue.png :P :p +-pissed-off.png B| +-wink.png ;-) ;) +-sad.png :[ +-kiss.png :x +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# MXit standard emoticons +-[MXit] +-happy.png :-) :) +-sad.png :-( :( +-wink.png ;-) ;) +-excited.png :-D :D :-> :> +-neutral.png :-| :| +-shocked.png :-O :O +-tongue.png :-P :P +-embarrassed.png :-$ :$ +-glasses-cool.png 8-) +-in_love.png (H) +-rose.png (F) +-### Added in v3.0 +-boy.png (m) +-girl.png (f) +-star.png (*) +-chilli.png (c) +-kiss.png (x) +-lamp.png (i) +-pissed-off.png :e :-e +-shut-mouth.png :-x :x +-thunder.png (z) +-coffee.png (U) +-mrgreen.png (G) +-### Added in v5.0 +-sick.png :o( +-excruciating.png :-{ :{ +-amorous.png :-} :} +-eyeroll.png 8-o 8o +-crying.png :'( +-thinking.png :-? :? +-drool.png :-~ :~ +-sleeping.png :-z :z +-lying.png :L) +-glasses-nerdy.png 8-| 8| +-pirate.png P-) +-### Added in v5.9.7 +-bored.png :-[ :[ +-cold.png :-< :< +-confused.png :-, :, +-hungry.png :-C :C +-stressed.png :-s :s +diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme +--- pidgin-2.10.7/pidgin/pixmaps/emotes/default/24/theme 2013-02-11 07:17:58.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/default/24/theme 2013-08-16 23:15:55.929941297 -0300 +@@ -28,8 +28,7 @@ + + + [XMPP] +-# Following XEP-0038 + GTalk + our default set, in default set order +-# The GTalk strings come from ticket #3307. ++# Following XEP-0038 + our default set, in default set order + happy.png :) :-) =) + excited.png :-D :-d :D :d =D =d + sad.png :-( :( +@@ -47,7 +46,7 @@ + foot-in-mouth.png :-! + shout.png >:o >:O + +-# Following XEP-0038 + GTalk ++# Following XEP-0038 + angry.png >:-( >:( X-( x-( + good.png :yes: + bad.png :no: +@@ -75,515 +74,3 @@ + ! skywalker.png C:-) c:-) C:) c:) + ! monkey.png :-(|) :(|) 8-|) + ! cyclops.png O-) o-) +- +- +-# Following AIM 6.1 +-[AIM] +-happy.png :-) :) +-wink.png ;-) ;) +-sad.png :-( :( +-tongue.png :P :p :-P :-p +-shocked.png =-O +-kiss.png :-* +-shout.png >:o +-excited.png :-D :D +-moneymouth.png :-$ +-foot-in-mouth.png :-! +-embarrassed.png :-[ +-angel.png O:-) +-thinking.png :-\\ :-/ +-crying.png :'( +-shut-mouth.png :-X +-glasses-cool.png 8-) +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following Windows Live Messenger 8.1 +-[MSN] +-happy.png :) :-) +-excited.png :D :d :-D :-d +-wink.png ;) ;-) +-shocked.png :-O :-o :O :o +-tongue.png :-P :P :-p :p +-glasses-cool.png (H) (h) +-angry.png :@ :-@ +-embarrassed.png :$ :-$ +-confused.png :S :s :-S :-s +-sad.png :( :-( +-crying.png :'( +-neutral.png :| :-| +-devil.png (6) +-angel.png (A) (a) +-in_love.png (L) (l) +-love-over.png (U) (u) +-msn.png (M) (m) +-cat.png (@) +-dog.png (&) +-moon.png (S) +-star.png (*) +-film.png (~) +-musical-note.png (8) +-mail.png (E) (e) +-rose.png (F) (f) +-rose-dead.png (W) (w) +-clock.png (O) (o) +-kiss.png (K) (k) +-present.png (G) (g) +-cake.png (^) +-camera.png (P) (p) +-lamp.png (I) (i) +-coffee.png (C) (c) +-phone.png (T) (t) +-hug-left.png ({) +-hug-right.png (}) +-beer.png (B) (b) +-drink.png (D) (d) +-boy.png (Z) (z) +-girl.png (X) (x) +-good.png (Y) (y) +-bad.png (N) (n) +-vampire.png :[ :-[ +-goat.png (nah) +-sun.png (#) +-rainbow.png (R) (r) +-quiet.png :-# +-teeth.png 8o| +-glasses-nerdy.png 8-| +-sarcastic.png ^o) +-secret.png :-* +-sick.png +o( +-snail.png (sn) +-turtle.png (tu) +-plate.png (pl) +-bowl.png (||) +-pizza.png (pi) +-soccerball.png (so) +-car.png (au) +-airplane.png (ap) +-umbrella.png (um) +-island.png (ip) +-computer.png (co) +-mobile.png (mp) +-brb.png (brb) +-rain.png (st) +-highfive.png (h5) +-coins.png (mo) +-sheep.png (bah) +-dont-know.png :^) +-thinking.png *-) +-thunder.png (li) +-party.png <:o) +-eyeroll.png 8-) +-sleepy.png |-) +-bunny.png ('.') +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +-# Hidden MSN emotes +-cigarette.png (ci) (CI) +-handcuffs.png (%) +-console.png (xx) (XX) +-fingers-crossed.png (yn) (YN) +- +- +-# Following QQ 2006 +-[QQ] +-shocked.png /:O /jy /surprised +-curl-lip.png /:~ /pz /curl_lip +-desire.png /:* /se /desire +-dazed.png /:| /dazed +-party.png /8-) /dy /revel +-crying.png /:< /ll /cry +-bashful.png /:$ /hx /bashful +-shut-mouth.png /:X /bz /shut_mouth +-sleeping.png /:Z /shui /sleep +-weep.png /:'( /dk /weep +-embarrassed.png /:-| /gg /embarassed +-pissed-off.png /:@ /fn /pissed_off +-act-up.png /:P /tp /act_up +-excited.png /:D /cy /toothy_smile +-happy.png /:) /wx /small_smile +-sad.png /:( /ng /sad +-glasses-cool.png /:+ /kuk /cool +-doctor.png /:# /feid /SARS +-silly.png /:Q /zk /crazy +-sick.png /:T /tu /vomit +-snicker.png /;p /tx /titter +-cute.png /;-D /ka /cute +-disdain.png /;d /by /disdain +-arrogant.png /;o /am /arrogant +-starving.png /:g /jie /starving +-sleepy.png /|-) /kun /sleepy +-terror.png /:! /jk /terror +-hot.png /:L /sweat +-smirk.png /:> /hanx /smirk +-soldier.png /:; /db /soldier +-struggle.png /;f /fendou /struggle +-curse.png /:-S /zhm /curse +-question.png /? /yiw /question +-quiet.png /;x /xu /shh +-hypnotized.png /;@ /yun /dizzy +-excruciating.png /:8 /zhem /excrutiating +-freaked-out.png /;! /shuai /freaked_out +-skeleton.png /!!! /kl /skeleton +-hammer.png /xx /qiao /hammer +-bye.png /bye /zj /bye +-go-away.png /go /shan /go +-afraid.png /shake /fad /shake +-amorous.png /love /aiq /love +-jump.png /jump /tiao /jump +-search.png /find /zhao /search +-lashes.png /& /mm /beautiful_eyebrows +-pig.png /pig /zt /pig +-cat.png /cat /mm /cat +-dog.png /dog /xg /dog +-hug-left.png /hug /yb /hug +-coins.png /$ /qianc /money +-lamp.png /! /dp /lightbulb +-bowl.png /cup /bei /cup +-cake.png /cake /dg /cake +-thunder.png /li /shd /lightning +-bomb.png /bome /zhd /bomb +-knife.png /kn /dao /knife +-soccerball.png /footb /zq /soccer +-musical-note.png /music /yy /music +-poop.png /shit /bb /shit +-coffee.png /coffee /kf /coffee +-hungry.png /eat /fan /eat +-pill.png /pill /yw /pill +-rose.png /rose /mg /rose +-wilt.png /fade /dx /wilt +-kiss.png /kiss /wen /kiss +-in_love.png /heart /xin /heart +-love-over.png /break /xs /broken_heart +-meeting.png /meeting /hy /meeting +-present.png /gift /lw /gift +-phone.png /phone /dh /phone +-clock.png /time /sj /time +-mail.png /email /yj /email +-tv.png /TV /ds /TV +-sun.png /sun /ty /sun +-moon.png /moon /yl /moon +-good.png /strong /qiang /thumbs_up +-bad.png /weak /ruo /thumbs_down +-handshake.png /share /ws /handshake +-victory.png /v /shl /victory +-beauty.png /<J> /mn /beauty +-qq.png /<QQ> /qz /qq +-blowkiss.png /<L> /fw /blow_kiss +-angry.png /<O> /oh /angry +-liquor.png /<B> /bj /baijiu +-can.png /<U> /qsh /soda +-watermelon.png /<W> /xigua /watermelon +-rain.png /<!!> /xy /rain +-cloudy.png /<~> /duoy /cloudy +-snowman.png /<Z> /xr /snowman +-star.png /<*> /xixing /star +-girl.png /<00> /nv /woman +-boy.png /<11> /nan /man +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following ICQ 6.0 +-[ICQ] +-happy.png :-) :) +-neutral.png :-$ +-sad.png :-( :( +-shocked.png =-O +-wink.png ;-) ;) +-tongue.png :-P :P :-p :p +-music.png [:-} +-laugh.png *JOKINGLY* +-sleeping.png *TIRED* +-crying.png :'( :'-( +-sick.png :-! +-kissed.png *KISSED* +-stop.png *STOP* +-kiss.png :-{} :-* +-kissing.png *KISSING* +-victory.png *YAHOO* +-silly.png %) +-embarrassed.png :-[ +-devil.png ]:-> +-angel.png O:-) +-rose.png @}->-- +-shut-mouth.png :-X :X :-x :x +-bomb.png @= +-thinking.png :-\\ :-/ +-good.png *THUMBS\ UP* +-shout.png >:o >:O :-@ +-beer.png *DRINK* +-excited.png :-D :D +-glasses-cool.png 8-) +-amorous.png *IN\ LOVE* +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-hypnotized.png @-) +-on-the-phone.png :)] +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-glasses-nerdy.png :-B :-b +-quiet.png :-$ +-drool.png =P~ =p~ +-lying.png :^O :^o +-call-me.png :-c +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-laugh.png :)) :-)) +-bye.png =; +-arrogant.png [-( +-thinking.png :-? +-waiting.png :-w :-W +-at-wits-end.png ~x( ~X( +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-clown.png :o) :O) +-doh.png #-o #-O +-weep.png :-< +-go-away.png :-h +-lashes.png ;;) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-silly.png 8-} +-clap.png =D> =d> +-mad-tongue.png >:P >:p +-time-out.png :-t :-T +-hug-left.png >:D< >:d< +-love-over.png =(( +-hot.png #:-S #:-s +-rotfl.png =)) :-j :-J +-loser.png L-) l-) +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +-cowboy.png <):) +-desire.png 8-> +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +-# Hidden Yahoo emotes +-alien.png =:) >-) +-beat-up.png b-( B-( +-chicken.png ~:> +-coffee.png ~o) ~O) +-cow.png 3:-O 3:-o +-dance.png \\:D/ \\:d/ +-rose.png @};- +-dont-know.png :-L :-l +-skeleton.png 8-X 8-x +-lamp.png *-:) +-monkey.png :(|) +-coins.png $-) +-peace.png :)>- +-pig.png :@) +-pray.png [-o< [-O< +-pumpkin.png (~~) +-shame.png [-X [-x +-flag.png **== +-clover.png %%- +-musical-note.png :-" +-giggle.png ;)) +-worship.png ^:)^ +-star.png (*) +-waving.png >:/ +-talktohand.png :-@ +- +-# Only available after activating the Yahoo! Fighter IMVironment +-male-fighter1.png o-> O-> +-male-fighter2.png o=> O=> +-female-fighter.png o-+ O-+ +-yin-yang.png (%) +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo JAPAN] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-hypnotized.png @-) +-on-the-phone.png :)] +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-glasses-nerdy.png :-B :-b +-quiet.png :-$ +-drool.png =P~ =p~ +-lying.png :^O :^o +-call-me.png :-c +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-laugh.png :)) :-)) +-bye.png =; +-arrogant.png [-( +-thinking.png :-? +-waiting.png :-w :-W +-at-wits-end.png ~x( ~X( +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-clown.png :o) :O) +-doh.png #-o #-O +-weep.png :-< +-go-away.png :-h +-lashes.png ;;) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-silly.png 8-} +-clap.png =D> =d> +-mad-tongue.png >:P >:p +-time-out.png :-t :-T +-hug-left.png >:D< >:d< +-love-over.png =(( +-hot.png #:-S #:-s +-rotfl.png =)) :-j :-J +-loser.png L-) l-) +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +-cowboy.png <):) +-desire.png 8-> +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) +- +-# Hidden Yahoo emotes +-alien.png =:) >-) +-beat-up.png b-( B-( +-chicken.png ~:> +-coffee.png ~o) ~O) +-cow.png 3:-O 3:-o +-dance.png \\:D/ \\:d/ +-rose.png @};- +-dont-know.png :-L :-l +-skeleton.png 8-X 8-x +-lamp.png *-:) +-monkey.png :(|) +-coins.png $-) +-peace.png :)>- +-pig.png :@) +-pray.png [-o< [-O< +-pumpkin.png (~~) +-shame.png [-X [-x +-flag.png **== +-clover.png %%- +-musical-note.png :-" +-giggle.png ;)) +-worship.png ^:)^ +-star.png (*) +-waving.png >:/ +-talktohand.png :-@ +- +-# Only available after activating the Yahoo! Fighter IMVironment +-male-fighter1.png o-> O-> +-male-fighter2.png o=> O=> +-female-fighter.png o-+ O-+ +-yin-yang.png (%) +- +- +-# Following MySpaceIM Beta 1.0.697.0 +-[MySpaceIM] +-excited.png :D :-D +-devil.png }:) +-confused.png :Z +-glasses-nerdy.png B) +-bulgy-eyes.png %) +-freaked-out.png :E +-happy.png :) :-) +-amorous.png :X +-laugh.png :)) +-mohawk.png -: +-mad-tongue.png X( +-messed.png X) +-glasses-nerdy.png Q) +-doh.png :G +-pirate.png P) +-shocked.png :O +-sidefrown.png :{ +-sinister.png :B +-smirk.png :, +-neutral.png :| +-tongue.png :P :p +-pissed-off.png B| +-wink.png ;-) ;) +-sad.png :[ +-kiss.png :x +-! skywalker.png C:-) c:-) C:) c:) +-! monkey.png :-(|) :(|) 8-|) +-! cyclops.png O-) o-) +- +- +-# MXit standard emoticons +-[MXit] +-happy.png :-) :) +-sad.png :-( :( +-wink.png ;-) ;) +-excited.png :-D :D :-> :> +-neutral.png :-| :| +-shocked.png :-O :O +-tongue.png :-P :P +-embarrassed.png :-$ :$ +-glasses-cool.png 8-) +-in_love.png (H) +-rose.png (F) +-### Added in v3.0 +-boy.png (m) +-girl.png (f) +-star.png (*) +-chilli.png (c) +-kiss.png (x) +-lamp.png (i) +-pissed-off.png :e :-e +-shut-mouth.png :-x :x +-thunder.png (z) +-coffee.png (U) +-mrgreen.png (G) +-### Added in v5.0 +-sick.png :o( +-excruciating.png :-{ :{ +-amorous.png :-} :} +-eyeroll.png 8-o 8o +-crying.png :'( +-thinking.png :-? :? +-drool.png :-~ :~ +-sleeping.png :-z :z +-lying.png :L) +-glasses-nerdy.png 8-| 8| +-pirate.png P-) +-### Added in v5.9.7 +-bored.png :-[ :[ +-cold.png :-< :< +-confused.png :-, :, +-hungry.png :-C :C +-stressed.png :-s :s +diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in +--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/small.theme.in 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/small.theme.in 2013-08-16 23:19:01.815778718 -0300 +@@ -22,8 +22,7 @@ + + + [XMPP] +-# Following XEP-0038 + GTalk + our default set, in default set order +-# The GTalk strings come from ticket #3307. ++# Following XEP-0038 + our default set, in default set order + happy.png :) :-) =) + excited.png :-D :-d :D :d =D =d + sad.png :-( :( +@@ -38,7 +37,7 @@ + angel.png O:-) o:-) + shut-mouth.png :-X + +-# Following XEP-0038 + GTalk ++# Following XEP-0038 + angry.png >:-( >:( X-( x-( + rose.png @->-- :rose: + phone.png :telephone: +@@ -53,269 +52,3 @@ + neutral.png :| :-| + + # Hidden icons from the default set. +- +- +-# Following AIM 6.1 +-[AIM] +-happy.png :-) :) +-wink.png ;-) ;) +-sad.png :-( :( +-tongue.png :P :p :-P :-p +-shocked.png =-O +-kiss.png :-* +-excited.png :-D :D +-embarrassed.png :-[ +-angel.png O:-) +-thinking.png :-\\ :-/ +-crying.png :'( +-shut-mouth.png :-X +-glasses-cool.png 8-) +- +- +-# Following Windows Live Messenger 8.1 +-[MSN] +-happy.png :) :-) +-excited.png :D :d :-D :-d +-wink.png ;) ;-) +-shocked.png :-O :-o :O :o +-tongue.png :-P :P :-p :p +-glasses-cool.png (H) (h) +-angry.png :@ :-@ +-embarrassed.png :$ :-$ +-confused.png :S :s :-S :-s +-sad.png :( :-( +-crying.png :'( +-neutral.png :| :-| +-devil.png (6) +-angel.png (A) (a) +-in_love.png (L) (l) +-star.png (*) +-musical-note.png (8) +-rose.png (F) (f) +-kiss.png (K) (k) +-camera.png (P) (p) +-lamp.png (I) (i) +-coffee.png (C) (c) +-phone.png (T) (t) +-hug-left.png ({) +-hug-right.png (}) +-beer.png (B) (b) +-boy.png (Z) (z) +-girl.png (X) (x) +-sarcastic.png ^o) +-sick.png +o( +-plate.png (pl) +-mobile.png (mp) +-dont-know.png :^) +-thinking.png *-) +-thunder.png (li) +-party.png <:o) +-eyeroll.png 8-) +-sleepy.png |-) +- +-# Hidden MSN emotes +-cigarette.png (ci) (CI) +-console.png (xx) (XX) +- +- +-# Following QQ 2006 +-[QQ] +-shocked.png /:O /jy /surprised +-party.png /8-) /dy /revel +-crying.png /:< /ll /cry +-shut-mouth.png /:X /bz /shut_mouth +-sleeping.png /:Z /shui /sleep +-embarrassed.png /:-| /gg /embarassed +-pissed-off.png /:@ /fn /pissed_off +-excited.png /:D /cy /toothy_smile +-happy.png /:) /wx /small_smile +-sad.png /:( /ng /sad +-glasses-cool.png /:+ /kuk /cool +-sick.png /:T /tu /vomit +-sleepy.png /|-) /kun /sleepy +-hot.png /:L /sweat +-question.png /? /yiw /question +-excruciating.png /:8 /zhem /excrutiating +-afraid.png /shake /fad /shake +-amorous.png /love /aiq /love +-search.png /find /zhao /search +-hug-left.png /hug /yb /hug +-lamp.png /! /dp /lightbulb +-thunder.png /li /shd /lightning +-musical-note.png /music /yy /music +-coffee.png /coffee /kf /coffee +-hungry.png /eat /fan /eat +-rose.png /rose /mg /rose +-kiss.png /kiss /wen /kiss +-in_love.png /heart /xin /heart +-meeting.png /meeting /hy /meeting +-phone.png /phone /dh /phone +-tv.png /TV /ds /TV +-angry.png /<O> /oh /angry +-girl.png /<00> /nv /woman +-boy.png /<11> /nan /man +- +- +-# Following ICQ 6.0 +-[ICQ] +-happy.png :-) :) +-neutral.png :-$ +-sad.png :-( :( +-shocked.png =-O +-wink.png ;-) ;) +-tongue.png :-P :P :-p :p +-music.png [:-} +-sleeping.png *TIRED* +-crying.png :'( :'-( +-sick.png :-! +-kiss.png :-{} :-* +-embarrassed.png :-[ +-devil.png ]:-> +-angel.png O:-) +-rose.png @}->-- +-shut-mouth.png :-X :X :-x :x +-thinking.png :-\\ :-/ +-beer.png *DRINK* +-excited.png :-D :D +-glasses-cool.png 8-) +-amorous.png *IN\ LOVE* +- +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-drool.png =P~ =p~ +-lying.png :^O :^o +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-thinking.png :-? +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-hug-left.png >:D< >:d< +-hot.png #:-S #:-s +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +- +-# Hidden Yahoo emotes +-coffee.png ~o) ~O) +-rose.png @};- +-dont-know.png :-L :-l +-lamp.png *-:) +-shame.png [-X [-x +-musical-note.png :-" +-star.png (*) +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo JAPAN] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-wink.png ;) ;-) +-thinking.png :-? +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-hug-left.png >:D< >:d< +-party.png <:-P <:-p +- +-# Hidden Yahoo emotes +-coffee.png ~o) ~O) +-rose.png @};- +-dont-know.png :-L :-l +-lamp.png *-:) +-shame.png [-X [-x +-musical-note.png :-" +-star.png (*) +- +- +-# Following MySpaceIM Beta 1.0.697.0 +-[MySpaceIM] +-excited.png :D :-D +-devil.png }:) +-confused.png :Z +-happy.png :) :-) +-amorous.png :X +-pirate.png P) +-shocked.png :O +-neutral.png :| +-tongue.png :P :p +-pissed-off.png B| +-wink.png ;-) ;) +-sad.png :[ +-kiss.png :x +- +-# MXit standard emoticons +-[MXit] +-happy.png :-) :) +-sad.png :-( :( +-wink.png ;-) ;) +-excited.png :-D :D :-> :> +-neutral.png :-| :| +-shocked.png :-O :O +-tongue.png :-P :P +-embarrassed.png :-$ :$ +-glasses-cool.png 8-) +-in_love.png (H) +-rose.png (F) +-### Added in v3.0 +-boy.png (m) +-girl.png (f) +-star.png (*) +-chilli.png (c) +-kiss.png (x) +-lamp.png (i) +-pissed-off.png :e :-e +-shut-mouth.png :-x :x +-thunder.png (z) +-coffee.png (U) +-mrgreen.png (G) +-### Added in v5.0 +-sick.png :o( +-excruciating.png :-{ :{ +-amorous.png :-} :} +-eyeroll.png 8-o 8o +-crying.png :'( +-thinking.png :-? :? +-drool.png :-~ :~ +-sleeping.png :-z :z +-lying.png :L) +-glasses-nerdy.png 8-| 8| +-pirate.png P-) +-### Added in v5.9.7 +-bored.png :-[ :[ +-cold.png :-< :< +-confused.png :-, :, +-hungry.png :-C :C +-stressed.png :-s :s +diff -Nur pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme +--- pidgin-2.10.7/pidgin/pixmaps/emotes/small/16/theme 2013-02-11 07:17:58.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/emotes/small/16/theme 2013-08-16 23:17:03.828740061 -0300 +@@ -22,8 +22,7 @@ + + + [XMPP] +-# Following XEP-0038 + GTalk + our default set, in default set order +-# The GTalk strings come from ticket #3307. ++# Following XEP-0038 + our default set, in default set order + happy.png :) :-) =) + excited.png :-D :-d :D :d =D =d + sad.png :-( :( +@@ -38,7 +37,7 @@ + angel.png O:-) o:-) + shut-mouth.png :-X + +-# Following XEP-0038 + GTalk ++# Following XEP-0038 + angry.png >:-( >:( X-( x-( + rose.png @->-- :rose: + phone.png :telephone: +@@ -53,269 +52,3 @@ + neutral.png :| :-| + + # Hidden icons from the default set. +- +- +-# Following AIM 6.1 +-[AIM] +-happy.png :-) :) +-wink.png ;-) ;) +-sad.png :-( :( +-tongue.png :P :p :-P :-p +-shocked.png =-O +-kiss.png :-* +-excited.png :-D :D +-embarrassed.png :-[ +-angel.png O:-) +-thinking.png :-\\ :-/ +-crying.png :'( +-shut-mouth.png :-X +-glasses-cool.png 8-) +- +- +-# Following Windows Live Messenger 8.1 +-[MSN] +-happy.png :) :-) +-excited.png :D :d :-D :-d +-wink.png ;) ;-) +-shocked.png :-O :-o :O :o +-tongue.png :-P :P :-p :p +-glasses-cool.png (H) (h) +-angry.png :@ :-@ +-embarrassed.png :$ :-$ +-confused.png :S :s :-S :-s +-sad.png :( :-( +-crying.png :'( +-neutral.png :| :-| +-devil.png (6) +-angel.png (A) (a) +-in_love.png (L) (l) +-star.png (*) +-musical-note.png (8) +-rose.png (F) (f) +-kiss.png (K) (k) +-camera.png (P) (p) +-lamp.png (I) (i) +-coffee.png (C) (c) +-phone.png (T) (t) +-hug-left.png ({) +-hug-right.png (}) +-beer.png (B) (b) +-boy.png (Z) (z) +-girl.png (X) (x) +-sarcastic.png ^o) +-sick.png +o( +-plate.png (pl) +-mobile.png (mp) +-dont-know.png :^) +-thinking.png *-) +-thunder.png (li) +-party.png <:o) +-eyeroll.png 8-) +-sleepy.png |-) +- +-# Hidden MSN emotes +-cigarette.png (ci) (CI) +-console.png (xx) (XX) +- +- +-# Following QQ 2006 +-[QQ] +-shocked.png /:O /jy /surprised +-party.png /8-) /dy /revel +-crying.png /:< /ll /cry +-shut-mouth.png /:X /bz /shut_mouth +-sleeping.png /:Z /shui /sleep +-embarrassed.png /:-| /gg /embarassed +-pissed-off.png /:@ /fn /pissed_off +-excited.png /:D /cy /toothy_smile +-happy.png /:) /wx /small_smile +-sad.png /:( /ng /sad +-glasses-cool.png /:+ /kuk /cool +-sick.png /:T /tu /vomit +-sleepy.png /|-) /kun /sleepy +-hot.png /:L /sweat +-question.png /? /yiw /question +-excruciating.png /:8 /zhem /excrutiating +-afraid.png /shake /fad /shake +-amorous.png /love /aiq /love +-search.png /find /zhao /search +-hug-left.png /hug /yb /hug +-lamp.png /! /dp /lightbulb +-thunder.png /li /shd /lightning +-musical-note.png /music /yy /music +-coffee.png /coffee /kf /coffee +-hungry.png /eat /fan /eat +-rose.png /rose /mg /rose +-kiss.png /kiss /wen /kiss +-in_love.png /heart /xin /heart +-meeting.png /meeting /hy /meeting +-phone.png /phone /dh /phone +-tv.png /TV /ds /TV +-angry.png /<O> /oh /angry +-girl.png /<00> /nv /woman +-boy.png /<11> /nan /man +- +- +-# Following ICQ 6.0 +-[ICQ] +-happy.png :-) :) +-neutral.png :-$ +-sad.png :-( :( +-shocked.png =-O +-wink.png ;-) ;) +-tongue.png :-P :P :-p :p +-music.png [:-} +-sleeping.png *TIRED* +-crying.png :'( :'-( +-sick.png :-! +-kiss.png :-{} :-* +-embarrassed.png :-[ +-devil.png ]:-> +-angel.png O:-) +-rose.png @}->-- +-shut-mouth.png :-X :X :-x :x +-thinking.png :-\\ :-/ +-beer.png *DRINK* +-excited.png :-D :D +-glasses-cool.png 8-) +-amorous.png *IN\ LOVE* +- +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-drool.png =P~ =p~ +-lying.png :^O :^o +-wink.png ;) ;-) +-embarrassed.png :"> +-mean.png :-> :> +-thinking.png :-? +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-hug-left.png >:D< >:d< +-hot.png #:-S #:-s +-party.png <:-P <:-p +-nervous.png :-SS :-Ss :-sS :-ss +- +-# Hidden Yahoo emotes +-coffee.png ~o) ~O) +-rose.png @};- +-dont-know.png :-L :-l +-lamp.png *-:) +-shame.png [-X [-x +-musical-note.png :-" +-star.png (*) +- +-# Following Yahoo! Messenger 8.1 +-[Yahoo JAPAN] +-happy.png :) :-) +-question.png :-/ :-\\ +-shocked.png :-O :O :-o :o +-devil.png >:) +-angel.png O:-) o:-) 0:-) +-sick.png :-& +-sleepy.png (:| +-sad.png :( :-( +-amorous.png :x :-x :X :-X +-angry.png X-( x-( X( x( +-crying.png :(( +-wink.png ;) ;-) +-thinking.png :-? +-excited.png :D :-D :d :-d +-tongue.png :-P :P :-p :p +-glasses-cool.png B-) b-) +-neutral.png :| :-| +-sleeping.png I-) i-) |-) +-kiss.png :-* :* +-confused.png :-S :-s +-sarcastic.png /:) +-eyeroll.png 8-| +-hug-left.png >:D< >:d< +-party.png <:-P <:-p +- +-# Hidden Yahoo emotes +-coffee.png ~o) ~O) +-rose.png @};- +-dont-know.png :-L :-l +-lamp.png *-:) +-shame.png [-X [-x +-musical-note.png :-" +-star.png (*) +- +- +-# Following MySpaceIM Beta 1.0.697.0 +-[MySpaceIM] +-excited.png :D :-D +-devil.png }:) +-confused.png :Z +-happy.png :) :-) +-amorous.png :X +-pirate.png P) +-shocked.png :O +-neutral.png :| +-tongue.png :P :p +-pissed-off.png B| +-wink.png ;-) ;) +-sad.png :[ +-kiss.png :x +- +-# MXit standard emoticons +-[MXit] +-happy.png :-) :) +-sad.png :-( :( +-wink.png ;-) ;) +-excited.png :-D :D :-> :> +-neutral.png :-| :| +-shocked.png :-O :O +-tongue.png :-P :P +-embarrassed.png :-$ :$ +-glasses-cool.png 8-) +-in_love.png (H) +-rose.png (F) +-### Added in v3.0 +-boy.png (m) +-girl.png (f) +-star.png (*) +-chilli.png (c) +-kiss.png (x) +-lamp.png (i) +-pissed-off.png :e :-e +-shut-mouth.png :-x :x +-thunder.png (z) +-coffee.png (U) +-mrgreen.png (G) +-### Added in v5.0 +-sick.png :o( +-excruciating.png :-{ :{ +-amorous.png :-} :} +-eyeroll.png 8-o 8o +-crying.png :'( +-thinking.png :-? :? +-drool.png :-~ :~ +-sleeping.png :-z :z +-lying.png :L) +-glasses-nerdy.png 8-| 8| +-pirate.png P-) +-### Added in v5.9.7 +-bored.png :-[ :[ +-cold.png :-< :< +-confused.png :-, :, +-hungry.png :-C :C +-stressed.png :-s :s +diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.am pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am +--- pidgin-2.10.7/pidgin/pixmaps/Makefile.am 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.am 2013-08-17 00:00:17.335924146 -0300 +@@ -204,37 +204,19 @@ + emotes/small/16/scalable/pidgin-emotes.svg + + PROTOCOLS_16_SCALABLE = \ +- protocols/16/scalable/aim.svg \ + protocols/16/scalable/bonjour.svg \ +- protocols/16/scalable/gadu-gadu.svg \ +- protocols/16/scalable/novell.svg \ +- protocols/16/scalable/icq.svg \ + protocols/16/scalable/irc.svg \ + protocols/16/scalable/jabber.svg \ +- protocols/16/scalable/meanwhile.svg \ +- protocols/16/scalable/msn.svg \ + protocols/16/scalable/silc.svg \ + protocols/16/scalable/simple.svg \ +- protocols/16/scalable/yahoo.svg \ + protocols/16/scalable/zephyr.svg + + PROTOCOLS_16 = \ +- protocols/16/aim.png \ + protocols/16/bonjour.png \ +- protocols/16/facebook.png \ +- protocols/16/gadu-gadu.png \ +- protocols/16/google-talk.png \ +- protocols/16/novell.png \ +- protocols/16/icq.png \ + protocols/16/irc.png \ + protocols/16/jabber.png \ +- protocols/16/meanwhile.png \ +- protocols/16/msn.png \ +- protocols/16/mxit.png \ +- protocols/16/myspace.png \ + protocols/16/silc.png \ + protocols/16/simple.png \ +- protocols/16/yahoo.png \ + protocols/16/zephyr.png + + ICONS_16_SCALABLE = \ +@@ -259,72 +241,35 @@ + ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg + + PROTOCOLS_22_SCALABLE = \ +- protocols/22/scalable/aim.svg \ + protocols/22/scalable/bonjour.svg \ +- protocols/22/scalable/gadu-gadu.svg \ +- protocols/22/scalable/novell.svg \ +- protocols/22/scalable/icq.svg \ + protocols/22/scalable/irc.svg \ + protocols/22/scalable/jabber.svg \ +- protocols/22/scalable/meanwhile.svg \ +- protocols/22/scalable/msn.svg \ + protocols/22/scalable/silc.svg \ + protocols/22/scalable/simple.svg \ +- protocols/22/scalable/yahoo.svg \ + protocols/22/scalable/zephyr.svg + + PROTOCOLS_22 = \ +- protocols/22/aim.png \ + protocols/22/bonjour.png \ +- protocols/22/facebook.png \ +- protocols/22/gadu-gadu.png \ +- protocols/22/google-talk.png \ +- protocols/22/novell.png \ +- protocols/22/icq.png \ + protocols/22/irc.png \ + protocols/22/jabber.png \ +- protocols/22/meanwhile.png \ +- protocols/22/msn.png \ +- protocols/22/mxit.png \ +- protocols/22/myspace.png \ + protocols/22/silc.png \ + protocols/22/simple.png \ +- protocols/22/yahoo.png \ + protocols/22/zephyr.png + + PROTOCOLS_48 = \ +- protocols/48/aim.png \ + protocols/48/bonjour.png \ +- protocols/48/facebook.png \ +- protocols/48/gadu-gadu.png \ +- protocols/48/novell.png \ +- protocols/48/icq.png \ + protocols/48/irc.png \ + protocols/48/jabber.png \ +- protocols/48/meanwhile.png \ +- protocols/48/msn.png \ +- protocols/48/mxit.png \ +- protocols/48/myspace.png \ + protocols/48/silc.png \ + protocols/48/simple.png \ +- protocols/48/yahoo.png \ + protocols/48/zephyr.png + + PROTOCOLS_SCALABLE = \ +- protocols/scalable/aim.svg \ + protocols/scalable/bonjour.svg \ +- protocols/scalable/gadu-gadu.svg \ +- protocols/scalable/google-talk.svg \ +- protocols/scalable/novell.svg \ +- protocols/scalable/icq.svg \ + protocols/scalable/irc.svg \ + protocols/scalable/jabber.svg \ +- protocols/scalable/meanwhile.svg \ +- protocols/scalable/msn.svg \ +- protocols/scalable/mxit.svg \ + protocols/scalable/silc.svg \ + protocols/scalable/simple.svg \ +- protocols/scalable/yahoo.svg \ + protocols/scalable/zephyr.svg + + STATUS_11 = \ +diff -Nur pidgin-2.10.7/pidgin/pixmaps/Makefile.in pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in +--- pidgin-2.10.7/pidgin/pixmaps/Makefile.in 2013-02-11 07:17:23.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/pixmaps/Makefile.in 2013-08-16 23:59:52.918508551 -0300 +@@ -240,40 +240,19 @@ + emblems/scalable/male.svg emblems/scalable/not-authorized.svg \ + emblems/scalable/secure.svg emblems/scalable/unavailable.svg \ + emblems/scalable/video.svg emblems/scalable/voice.svg \ +- protocols/16/aim.png protocols/16/bonjour.png \ +- protocols/16/facebook.png protocols/16/gadu-gadu.png \ +- protocols/16/google-talk.png protocols/16/novell.png \ +- protocols/16/icq.png protocols/16/irc.png \ +- protocols/16/jabber.png protocols/16/meanwhile.png \ +- protocols/16/msn.png protocols/16/mxit.png \ +- protocols/16/myspace.png protocols/16/silc.png \ +- protocols/16/simple.png protocols/16/yahoo.png \ +- protocols/16/zephyr.png protocols/22/aim.png \ +- protocols/22/bonjour.png protocols/22/facebook.png \ +- protocols/22/gadu-gadu.png protocols/22/google-talk.png \ +- protocols/22/novell.png protocols/22/icq.png \ +- protocols/22/irc.png protocols/22/jabber.png \ +- protocols/22/meanwhile.png protocols/22/msn.png \ +- protocols/22/mxit.png protocols/22/myspace.png \ +- protocols/22/silc.png protocols/22/simple.png \ +- protocols/22/yahoo.png protocols/22/zephyr.png \ +- protocols/48/aim.png protocols/48/bonjour.png \ +- protocols/48/facebook.png protocols/48/gadu-gadu.png \ +- protocols/48/novell.png protocols/48/icq.png \ +- protocols/48/irc.png protocols/48/jabber.png \ +- protocols/48/meanwhile.png protocols/48/msn.png \ +- protocols/48/mxit.png protocols/48/myspace.png \ +- protocols/48/silc.png protocols/48/simple.png \ +- protocols/48/yahoo.png protocols/48/zephyr.png \ +- protocols/scalable/aim.svg protocols/scalable/bonjour.svg \ +- protocols/scalable/gadu-gadu.svg \ +- protocols/scalable/google-talk.svg \ +- protocols/scalable/novell.svg protocols/scalable/icq.svg \ +- protocols/scalable/irc.svg protocols/scalable/jabber.svg \ +- protocols/scalable/meanwhile.svg protocols/scalable/msn.svg \ +- protocols/scalable/mxit.svg protocols/scalable/silc.svg \ +- protocols/scalable/simple.svg protocols/scalable/yahoo.svg \ +- protocols/scalable/zephyr.svg status/11/available.png \ ++ protocols/16/bonjour.png protocols/16/irc.png \ ++ protocols/16/jabber.png protocols/16/silc.png \ ++ protocols/16/simple.png protocols/16/zephyr.png \ ++ protocols/22/bonjour.png protocols/22/irc.png \ ++ protocols/22/jabber.png protocols/22/silc.png \ ++ protocols/22/simple.png protocols/22/zephyr.png \ ++ protocols/48/bonjour.png protocols/48/irc.png \ ++ protocols/48/jabber.png protocols/48/silc.png \ ++ protocols/48/simple.png protocols/48/zephyr.png \ ++ protocols/scalable/bonjour.svg protocols/scalable/irc.svg \ ++ protocols/scalable/jabber.svg protocols/scalable/silc.svg \ ++ protocols/scalable/simple.svg protocols/scalable/zephyr.svg \ ++ status/11/available.png \ + status/11/away.png status/11/busy.png status/11/chat.png \ + status/11/extended-away.png status/11/invisible.png \ + status/11/log-in.png status/11/log-out.png \ +@@ -443,8 +422,6 @@ + FARSTREAM_CFLAGS = @FARSTREAM_CFLAGS@ + FARSTREAM_LIBS = @FARSTREAM_LIBS@ + FGREP = @FGREP@ +-GADU_CFLAGS = @GADU_CFLAGS@ +-GADU_LIBS = @GADU_LIBS@ + GCONFTOOL = @GCONFTOOL@ + GCONF_SCHEMA_CONFIG_SOURCE = @GCONF_SCHEMA_CONFIG_SOURCE@ + GCONF_SCHEMA_FILE_DIR = @GCONF_SCHEMA_FILE_DIR@ +@@ -506,8 +483,6 @@ + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + MANIFEST_TOOL = @MANIFEST_TOOL@ +-MEANWHILE_CFLAGS = @MEANWHILE_CFLAGS@ +-MEANWHILE_LIBS = @MEANWHILE_LIBS@ + MKDIR_P = @MKDIR_P@ + MKINSTALLDIRS = @MKINSTALLDIRS@ + MONO_CFLAGS = @MONO_CFLAGS@ +@@ -850,37 +825,19 @@ + @INSTALL_PIXMAPS_TRUE@ emotes/small/16/scalable/pidgin-emotes.svg + + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16_SCALABLE = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/aim.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/bonjour.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/gadu-gadu.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/novell.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/icq.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/irc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/jabber.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/meanwhile.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/msn.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/silc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/simple.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/yahoo.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/scalable/zephyr.svg + + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_16 = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/aim.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/bonjour.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/facebook.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/gadu-gadu.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/google-talk.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/novell.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/icq.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/irc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/jabber.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/meanwhile.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/msn.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/mxit.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/myspace.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/silc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/simple.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/16/yahoo.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/16/zephyr.png + + @INSTALL_PIXMAPS_TRUE@ICONS_16_SCALABLE = \ +@@ -899,72 +856,35 @@ + @INSTALL_PIXMAPS_TRUE@ICONS_48 = icons/hicolor/48x48/apps/pidgin.png + @INSTALL_PIXMAPS_TRUE@ICONS_SCALABLE = icons/hicolor/scalable/apps/pidgin.svg + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22_SCALABLE = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/aim.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/bonjour.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/gadu-gadu.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/novell.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/icq.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/irc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/jabber.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/meanwhile.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/msn.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/silc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/simple.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/yahoo.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/scalable/zephyr.svg + + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_22 = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/aim.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/bonjour.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/facebook.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/gadu-gadu.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/google-talk.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/novell.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/icq.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/irc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/jabber.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/meanwhile.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/msn.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/mxit.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/myspace.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/silc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/simple.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/22/yahoo.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/22/zephyr.png + + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_48 = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/aim.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/bonjour.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/facebook.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/gadu-gadu.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/novell.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/icq.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/irc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/jabber.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/meanwhile.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/msn.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/mxit.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/myspace.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/silc.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/simple.png \ +-@INSTALL_PIXMAPS_TRUE@ protocols/48/yahoo.png \ + @INSTALL_PIXMAPS_TRUE@ protocols/48/zephyr.png + + @INSTALL_PIXMAPS_TRUE@PROTOCOLS_SCALABLE = \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/aim.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/bonjour.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/gadu-gadu.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/google-talk.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/novell.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/icq.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/irc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/jabber.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/meanwhile.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/msn.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/mxit.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/silc.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/simple.svg \ +-@INSTALL_PIXMAPS_TRUE@ protocols/scalable/yahoo.svg \ + @INSTALL_PIXMAPS_TRUE@ protocols/scalable/zephyr.svg + + @INSTALL_PIXMAPS_TRUE@STATUS_11 = \ +diff -Nur pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c +--- pidgin-2.10.7/pidgin/plugins/disco/xmppdisco.c 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/plugins/disco/xmppdisco.c 2013-08-16 23:39:46.921427463 -0300 +@@ -250,9 +250,6 @@ + const char *from; + const char *to; + } disco_type_mappings[] = { +- { "gadu-gadu", "gadu-gadu" }, /* the prpl is prpl-gg, but list_icon returns "gadu-gadu" */ +- { "sametime", "meanwhile" }, +- { "myspaceim", "myspace" }, + { "xmpp", "jabber" }, /* prpl-jabber (mentioned in case the prpl is renamed so this line will match) */ + { NULL, NULL } + }; +diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c +--- pidgin-2.10.7/pidgin/plugins/gevolution/add_buddy_dialog.c 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/add_buddy_dialog.c 2013-08-16 21:26:56.293625899 -0300 +@@ -288,21 +288,13 @@ + { + EContact *contact = E_CONTACT(c->data); + const char *name; +- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs; ++ GList *jabbers; + + name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); + +- aims = e_contact_get(contact, E_CONTACT_IM_AIM); + jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER); +- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); +- msns = e_contact_get(contact, E_CONTACT_IM_MSN); +- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); +- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); +- ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU); +- +- if (aims == NULL && jabbers == NULL && yahoos == NULL && +- msns == NULL && icqs == NULL && novells == NULL && +- ggs == NULL) ++ ++ if (jabbers == NULL) + { + GtkTreeIter iter; + +@@ -315,13 +307,7 @@ + } + else + { +- add_ims(dialog, contact, name, aims, "prpl-aim"); + add_ims(dialog, contact, name, jabbers, "prpl-jabber"); +- add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); +- add_ims(dialog, contact, name, msns, "prpl-msn"); +- add_ims(dialog, contact, name, icqs, "prpl-icq"); +- add_ims(dialog, contact, name, novells, "prpl-novell"); +- add_ims(dialog, contact, name, ggs, "prpl-gg"); + } + } + +@@ -367,7 +353,7 @@ + { + EContact *contact = E_CONTACT(l->data); + const char *name; +- GList *aims, *jabbers, *yahoos, *msns, *icqs, *novells, *ggs; ++ GList *jabbers; + + name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); + +@@ -377,17 +363,9 @@ + continue; + } + +- aims = e_contact_get(contact, E_CONTACT_IM_AIM); + jabbers = e_contact_get(contact, E_CONTACT_IM_JABBER); +- yahoos = e_contact_get(contact, E_CONTACT_IM_YAHOO); +- msns = e_contact_get(contact, E_CONTACT_IM_MSN); +- icqs = e_contact_get(contact, E_CONTACT_IM_ICQ); +- novells = e_contact_get(contact, E_CONTACT_IM_GROUPWISE); +- ggs = e_contact_get(contact, E_CONTACT_IM_GADUGADU); +- +- if (aims == NULL && jabbers == NULL && yahoos == NULL && +- msns == NULL && icqs == NULL && novells == NULL && +- ggs == NULL) ++ ++ if (jabbers == NULL) + { + GtkTreeIter iter; + +@@ -400,13 +378,7 @@ + } + else + { +- add_ims(dialog, contact, name, aims, "prpl-aim"); + add_ims(dialog, contact, name, jabbers, "prpl-jabber"); +- add_ims(dialog, contact, name, yahoos, "prpl-yahoo"); +- add_ims(dialog, contact, name, msns, "prpl-msn"); +- add_ims(dialog, contact, name, icqs, "prpl-icq"); +- add_ims(dialog, contact, name, novells, "prpl-novell"); +- add_ims(dialog, contact, name, ggs, "prpl-gg"); + } + } + } +diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c +--- pidgin-2.10.7/pidgin/plugins/gevolution/gevolution.c 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevolution.c 2013-08-16 21:14:05.483056049 -0300 +@@ -119,13 +119,7 @@ + + name = e_contact_get_const(contact, E_CONTACT_FULL_NAME); + +- update_ims_from_contact(contact, name, "prpl-aim", E_CONTACT_IM_AIM); + update_ims_from_contact(contact, name, "prpl-jabber", E_CONTACT_IM_JABBER); +- update_ims_from_contact(contact, name, "prpl-yahoo", E_CONTACT_IM_YAHOO); +- update_ims_from_contact(contact, name, "prpl-msn", E_CONTACT_IM_MSN); +- update_ims_from_contact(contact, name, "prpl-icq", E_CONTACT_IM_ICQ); +- update_ims_from_contact(contact, name, "prpl-novell", E_CONTACT_IM_GROUPWISE); +- update_ims_from_contact(contact, name, "prpl-gg", E_CONTACT_IM_GADUGADU); + } + + static void +diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c +--- pidgin-2.10.7/pidgin/plugins/gevolution/gevo-util.c 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/gevo-util.c 2013-08-16 23:20:45.692374640 -0300 +@@ -99,20 +99,8 @@ + + protocol_id = purple_account_get_protocol_id(account); + +- if (!strcmp(protocol_id, "prpl-aim")) +- protocol_field = E_CONTACT_IM_AIM; +- else if (!strcmp(protocol_id, "prpl-icq")) +- protocol_field = E_CONTACT_IM_ICQ; +- else if (!strcmp(protocol_id, "prpl-msn")) +- protocol_field = E_CONTACT_IM_MSN; +- else if (!strcmp(protocol_id, "prpl-yahoo")) +- protocol_field = E_CONTACT_IM_YAHOO; +- else if (!strcmp(protocol_id, "prpl-jabber")) ++ if (!strcmp(protocol_id, "prpl-jabber")) + protocol_field = E_CONTACT_IM_JABBER; +- else if (!strcmp(protocol_id, "prpl-novell")) +- protocol_field = E_CONTACT_IM_GROUPWISE; +- else if (!strcmp(protocol_id, "prpl-gg")) +- protocol_field = E_CONTACT_IM_GADUGADU; + + return protocol_field; + } +@@ -169,18 +157,6 @@ + { + PurpleAccount *account = purple_buddy_get_account(buddy); + const char *prpl_id = purple_account_get_protocol_id(account); +- +- if (!strcmp(prpl_id, "prpl-msn")) +- { +- mail = g_strdup(purple_normalize(account, +- purple_buddy_get_name(buddy))); +- } +- else if (!strcmp(prpl_id, "prpl-yahoo")) +- { +- mail = g_strdup_printf("%s@yahoo.com", +- purple_normalize(account, +- purple_buddy_get_name(buddy))); +- } + } + + return mail; +diff -Nur pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c +--- pidgin-2.10.7/pidgin/plugins/gevolution/new_person_dialog.c 2013-02-11 07:16:54.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin/plugins/gevolution/new_person_dialog.c 2013-08-16 21:23:26.207116339 -0300 +@@ -141,20 +141,8 @@ + if (*email) + e_contact_set(contact, E_CONTACT_EMAIL_1, (gpointer)email); + +- if (!strcmp(im_service, "prpl-aim")) +- field = E_CONTACT_IM_AIM; +- else if (!strcmp(im_service, "prpl-icq")) +- field = E_CONTACT_IM_ICQ; +- else if (!strcmp(im_service, "prpl-yahoo")) +- field = E_CONTACT_IM_YAHOO; +- else if (!strcmp(im_service, "prpl-jabber")) ++ if (!strcmp(im_service, "prpl-jabber")) + field = E_CONTACT_IM_JABBER; +- else if (!strcmp(im_service, "prpl-msn")) +- field = E_CONTACT_IM_MSN; +- else if (!strcmp(im_service, "prpl-novell")) +- field = E_CONTACT_IM_GROUPWISE; +- else if (!strcmp(im_service, "prpl-gg")) +- field = E_CONTACT_IM_GADUGADU; + + if (field > 0) + { +diff -Nur pidgin-2.10.7/pidgin.apspec.in pidgin-2.10.7-nonprism/pidgin.apspec.in +--- pidgin-2.10.7/pidgin.apspec.in 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin.apspec.in 2013-08-16 20:53:14.523862926 -0300 +@@ -14,17 +14,13 @@ + + [Description] + Pidgin allows you to talk to anyone using a variety of messaging protocols, +-including AIM (Oscar and TOC), ICQ, IRC, Yahoo!, MSN Messenger, XMPP, +-Gadu-Gadu, and Zephyr. These protocols are implemented using a ++including IRC, XMPP and Zephyr. These protocols are implemented using a + modular, easy to use design. To use a protocol, just add an account using the + account editor. + + Pidgin supports many common features of other clients, as well as many unique + features, such as perl scripting, TCL scripting and C plugins. + +-Pidgin is NOT affiliated with or endorsed by America Online, Inc., Microsoft +-Corporation, Yahoo! Inc., or ICQ Inc. +- + [BuildPrepare] + APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-gtktest --disable-glibtest --disable-vv --disable-fortify + #APBUILD_STATIC="Xss startup-notification-1" prepareBuild --enable-nss --enable-gnutls --enable-binreloc --disable-perl --disable-tcl --disable-vv +diff -Nur pidgin-2.10.7/pidgin.desktop.in pidgin-2.10.7-nonprism/pidgin.desktop.in +--- pidgin-2.10.7/pidgin.desktop.in 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin.desktop.in 2013-08-16 23:07:34.874212867 -0300 +@@ -1,7 +1,7 @@ + [Desktop Entry] + _Name=Pidgin Internet Messenger + _GenericName=Internet Messenger +-_Comment=Chat over IM. Supports AIM, Google Talk, Jabber/XMPP, MSN, Yahoo and more ++_Comment=Chat over IM. Supports IRC, Jabber/XMPP and more + Exec=pidgin + Icon=pidgin + StartupNotify=true +diff -Nur pidgin-2.10.7/pidgin.spec pidgin-2.10.7-nonprism/pidgin.spec +--- pidgin-2.10.7/pidgin.spec 2013-02-11 07:17:59.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin.spec 2013-08-17 00:03:18.474815955 -0300 +@@ -34,7 +34,6 @@ + %{!?_without_startupnotification:BuildRequires: startup-notification-devel} + %{?_with_avahi:BuildRequires: avahi-glib-devel} + %{!?_without_gtkspell:BuildRequires: gtkspell-devel} +-%{?_with_meanwhile:BuildRequires: meanwhile-devel} + %{?_with_mono:BuildRequires: mono-devel} + %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2} + %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h} +@@ -105,7 +104,6 @@ + Group: Applications/Internet + Obsoletes: gaim-silc + Obsoletes: gaim-tcl +-Obsoletes: gaim-gadugadu + Obsoletes: pidgin-tcl < 2.0.0 + Obsoletes: pidgin-silc < 2.0.0 + Obsoletes: libpurple-perl < %{version} +@@ -131,13 +129,6 @@ + Requires: libpurple >= %{apiver} + %endif + +-%if 0%{?_with_meanwhile:1} +-%package -n libpurple-meanwhile +-Summary: Lotus Sametime plugin for Pidgin using the Meanwhile library +-Group: Applications/Internet +-Requires: libpurple >= %{apiver} +-%endif +- + %if 0%{?_with_mono:1} + %package -n libpurple-mono + Summary: Mono .NET plugin support for Pidgin +@@ -161,18 +152,14 @@ + + %description + Pidgin allows you to talk to anyone using a variety of messaging +-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu, +-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and +-Zephyr. These protocols are implemented using a modular, easy to ++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr. ++These protocols are implemented using a modular, easy to + use design. To use a protocol, just add an account using the + account editor. + + Pidgin supports many common features of other clients, as well as many + unique features, such as perl scripting, TCL scripting and C plugins. + +-Pidgin is not affiliated with or endorsed by America Online, Inc., +-Microsoft Corporation, Yahoo! Inc., or ICQ Inc. +- + %description devel + The pidgin-devel package contains the header files, developer + documentation, and libraries required for development of Pidgin scripts +@@ -182,9 +169,8 @@ + libpurple contains the core IM support for IM clients such as Pidgin + and Finch. + +-libpurple supports a variety of messaging protocols including AIM, MSN, +-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, +-Lotus Sametime, SILC, Simple and Zephyr. ++libpurple supports a variety of messaging protocols including XMPP, ++Bonjour, IRC, SILC, Simple and Zephyr. + + %description -n libpurple-devel + The libpurple-devel package contains the header files, developer +@@ -196,11 +182,6 @@ + Bonjour plugin for Pidgin. + %endif + +-%if 0%{?_with_meanwhile:1} +-%description -n libpurple-meanwhile +-Lotus Sametime plugin for Pidgin using the Meanwhile library. +-%endif +- + %if 0%{?_with_mono:1} + %description -n libpurple-mono + Mono plugin loader for Pidgin. This package will allow you to write or +@@ -236,7 +217,6 @@ + %{!?_with_vv:--disable-vv} \ + %{!?_with_dbus:--disable-dbus} \ + %{!?_with_avahi:--disable-avahi} \ +- %{!?_with_meanwhile:--disable-meanwhile} \ + %{?_without_gstreamer:--disable-gstreamer} \ + %{?_without_gtkspell:--disable-gtkspell} \ + %{?_without_nm:--disable-nm} \ +@@ -258,9 +238,7 @@ + rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la + rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod + find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';' +@@ -271,10 +249,6 @@ + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so + %endif + +-%if 0%{!?_with_meanwhile:1} +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so +-%endif +- + %if 0%{!?_with_mono:1} + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll +@@ -299,7 +273,6 @@ + find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v /libbonjour.so | \ +- grep -v /libsametime.so | \ + grep -v /mono.so | \ + grep -v ".dll$" > %{name}-%{version}-purpleplugins + +@@ -435,13 +408,6 @@ + %{_libdir}/purple-2/libbonjour.* + %endif + +-%if 0%{?_with_meanwhile:1} +-%files -n libpurple-meanwhile +-%defattr(-, root, root) +- +-%{_libdir}/purple-2/libsametime.* +-%endif +- + %if 0%{?_with_mono:1} + %files -n libpurple-mono + %defattr(-, root, root) +@@ -492,9 +458,6 @@ + * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com> + - Update to reflect changes in perl module installation directories + +-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com> +-- Fix building without meanwhile support +- + * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com> + - Add "--without nm" support to build without NetworkManager + +@@ -586,8 +549,6 @@ + - Update to reflect renaming to pidgin/libpurple + + * Sun Oct 1 2006 Stu Tomlinson <stu@nosnilmot.com> +-- We can build with internal gadu gadu again, so bring it back into the +- main package + - Deal with gconf schame uninstallation on package upgrade and removal + + * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com> +@@ -606,19 +567,14 @@ + - Source RPM uses tar.bz2 now to save space + - Update BuildRequires for new intltool dependencies + - Add a --with perlmakehack option to allow builds to succeed on RH9 +-- Add a --with gadugadu to build (separate) gaim-gadugadu package + + * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com> + - Add support for beta versions so the subsequent releases are seen as newer + by RPM +-- Split of sametime support to gaim-meanwhile + - Use make DESTDIR=... instead of overloading prefix etc. when installing + - Default build to include cyrus-sasl support in Jabber + - Add --with dbus to build with DBUS support + +-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net> +-- Added obsoletes gaim-meanwhile +- + * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com> + - Add separate gaim-bonjour package if built with --with-howl + - Add separate gaim-mono package if built with --with-mono +diff -Nur pidgin-2.10.7/pidgin.spec.in pidgin-2.10.7-nonprism/pidgin.spec.in +--- pidgin-2.10.7/pidgin.spec.in 2013-02-11 07:16:53.000000000 -0200 ++++ pidgin-2.10.7-nonprism/pidgin.spec.in 2013-08-17 00:07:12.251996234 -0300 +@@ -34,7 +34,6 @@ + %{!?_without_startupnotification:BuildRequires: startup-notification-devel} + %{?_with_avahi:BuildRequires: avahi-glib-devel} + %{!?_without_gtkspell:BuildRequires: gtkspell-devel} +-%{?_with_meanwhile:BuildRequires: meanwhile-devel} + %{?_with_mono:BuildRequires: mono-devel} + %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2} + %{!?_without_silc:BuildRequires: /usr/include/silc/silcclient.h} +@@ -105,7 +104,6 @@ + Group: Applications/Internet + Obsoletes: gaim-silc + Obsoletes: gaim-tcl +-Obsoletes: gaim-gadugadu + Obsoletes: pidgin-tcl < 2.0.0 + Obsoletes: pidgin-silc < 2.0.0 + Obsoletes: libpurple-perl < %{version} +@@ -131,13 +129,6 @@ + Requires: libpurple >= %{apiver} + %endif + +-%if 0%{?_with_meanwhile:1} +-%package -n libpurple-meanwhile +-Summary: Lotus Sametime plugin for Pidgin using the Meanwhile library +-Group: Applications/Internet +-Requires: libpurple >= %{apiver} +-%endif +- + %if 0%{?_with_mono:1} + %package -n libpurple-mono + Summary: Mono .NET plugin support for Pidgin +@@ -161,18 +152,14 @@ + + %description + Pidgin allows you to talk to anyone using a variety of messaging +-protocols including AIM, MSN, Yahoo!, XMPP, Bonjour, Gadu-Gadu, +-ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and +-Zephyr. These protocols are implemented using a modular, easy to ++protocols including XMPP, Bonjour, IRC, SILC, Simple and Zephyr. ++These protocols are implemented using a modular, easy to + use design. To use a protocol, just add an account using the + account editor. + + Pidgin supports many common features of other clients, as well as many + unique features, such as perl scripting, TCL scripting and C plugins. + +-Pidgin is not affiliated with or endorsed by America Online, Inc., +-Microsoft Corporation, Yahoo! Inc., or ICQ Inc. +- + %description devel + The pidgin-devel package contains the header files, developer + documentation, and libraries required for development of Pidgin scripts +@@ -182,9 +169,8 @@ + libpurple contains the core IM support for IM clients such as Pidgin + and Finch. + +-libpurple supports a variety of messaging protocols including AIM, MSN, +-Yahoo!, XMPP, Bonjour, Gadu-Gadu, ICQ, IRC, Novell Groupwise, QQ, +-Lotus Sametime, SILC, Simple and Zephyr. ++libpurple supports a variety of messaging protocols including XMPP, ++Bonjour, IRC, SILC, Simple and Zephyr. + + %description -n libpurple-devel + The libpurple-devel package contains the header files, developer +@@ -196,11 +182,6 @@ + Bonjour plugin for Pidgin. + %endif + +-%if 0%{?_with_meanwhile:1} +-%description -n libpurple-meanwhile +-Lotus Sametime plugin for Pidgin using the Meanwhile library. +-%endif +- + %if 0%{?_with_mono:1} + %description -n libpurple-mono + Mono plugin loader for Pidgin. This package will allow you to write or +@@ -236,7 +217,6 @@ + %{!?_with_vv:--disable-vv} \ + %{!?_with_dbus:--disable-dbus} \ + %{!?_with_avahi:--disable-avahi} \ +- %{!?_with_meanwhile:--disable-meanwhile} \ + %{?_without_gstreamer:--disable-gstreamer} \ + %{?_without_gtkspell:--disable-gtkspell} \ + %{?_without_nm:--disable-nm} \ +@@ -258,9 +238,7 @@ + rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la + rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libjabber.so +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libymsg.so + rm -f $RPM_BUILD_ROOT%{_libdir}/*.la + rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod + find $RPM_BUILD_ROOT -type f -name '*.a' -exec rm -f {} ';' +@@ -271,10 +249,6 @@ + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libbonjour.so + %endif + +-%if 0%{!?_with_meanwhile:1} +-rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/libsametime.so +-%endif +- + %if 0%{!?_with_mono:1} + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/mono.so + rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.dll +@@ -299,7 +273,6 @@ + find $RPM_BUILD_ROOT%{_libdir}/purple-2 -xtype f -print | \ + sed "s@^$RPM_BUILD_ROOT@@g" | \ + grep -v /libbonjour.so | \ +- grep -v /libsametime.so | \ + grep -v /mono.so | \ + grep -v ".dll$" > %{name}-%{version}-purpleplugins + +@@ -435,13 +408,6 @@ + %{_libdir}/purple-2/libbonjour.* + %endif + +-%if 0%{?_with_meanwhile:1} +-%files -n libpurple-meanwhile +-%defattr(-, root, root) +- +-%{_libdir}/purple-2/libsametime.* +-%endif +- + %if 0%{?_with_mono:1} + %files -n libpurple-mono + %defattr(-, root, root) +@@ -492,9 +458,6 @@ + * Sat Jul 11 2009 Stu Tomlinson <stu@nosnilmot.com> + - Update to reflect changes in perl module installation directories + +-* Mon May 19 2008 Stu Tomlinson <stu@nosnilmot.com> +-- Fix building without meanwhile support +- + * Fri May 16 2008 Stu Tomlinson <stu@nosnilmot.com> + - Add "--without nm" support to build without NetworkManager + +@@ -586,8 +549,6 @@ + - Update to reflect renaming to pidgin/libpurple + + * Sun Oct 1 2006 Stu Tomlinson <stu@nosnilmot.com> +-- We can build with internal gadu gadu again, so bring it back into the +- main package + - Deal with gconf schame uninstallation on package upgrade and removal + + * Sun Aug 20 2006 Stu Tomlinson <stu@nosnilmot.com> +@@ -606,19 +567,14 @@ + - Source RPM uses tar.bz2 now to save space + - Update BuildRequires for new intltool dependencies + - Add a --with perlmakehack option to allow builds to succeed on RH9 +-- Add a --with gadugadu to build (separate) gaim-gadugadu package + + * Sat Dec 17 2005 Stu Tomlinson <stu@nosnilmot.com> + - Add support for beta versions so the subsequent releases are seen as newer + by RPM +-- Split of sametime support to gaim-meanwhile + - Use make DESTDIR=... instead of overloading prefix etc. when installing + - Default build to include cyrus-sasl support in Jabber + - Add --with dbus to build with DBUS support + +-* Sun Dec 04 2005 Christopher O'Brien <siege@preoccupied.net> +-- Added obsoletes gaim-meanwhile +- + * Sun Oct 30 2005 Stu Tomlinson <stu@nosnilmot.com> + - Add separate gaim-bonjour package if built with --with-howl + - Add separate gaim-mono package if built with --with-mono diff --git a/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch b/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch new file mode 100644 index 000000000..abffa20b8 --- /dev/null +++ b/nonprism/pidgin-nonprism/pidgin-2.10.7-link-libirc-to-libsasl2.patch @@ -0,0 +1,12 @@ +diff -upr pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am pidgin-2.10.7/libpurple/protocols/irc/Makefile.am +--- pidgin-2.10.7.orig/libpurple/protocols/irc/Makefile.am 2013-02-14 02:44:47.000000000 +0200 ++++ pidgin-2.10.7/libpurple/protocols/irc/Makefile.am 2013-02-14 02:49:58.000000000 +0200 +@@ -27,7 +27,7 @@ else + st = + pkg_LTLIBRARIES = libirc.la + libirc_la_SOURCES = $(IRCSOURCES) +-libirc_la_LIBADD = $(GLIB_LIBS) ++libirc_la_LIBADD = $(GLIB_LIBS) $(SASL_LIBS) + + endif + diff --git a/nonprism/pidgin-nonprism/pidgin.install b/nonprism/pidgin-nonprism/pidgin.install new file mode 100644 index 000000000..1a05f573e --- /dev/null +++ b/nonprism/pidgin-nonprism/pidgin.install @@ -0,0 +1,11 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/pcr/idjc/PKGBUILD b/pcr/idjc/PKGBUILD index 0de01f4e3..6834d64a6 100644 --- a/pcr/idjc/PKGBUILD +++ b/pcr/idjc/PKGBUILD @@ -1,35 +1,41 @@ +# Maintainer: M0Rf30 # Contributor: Tobias Luther <tobias [at] tonstrom [dot] de> # Contributor: GraveDigger # Contributor: Gaetan Bisson <bisson@archlinux.org> pkgname=idjc -pkgver=0.8.8 -pkgrel=1 +pkgver=0.8.9 +pkgrel=2 pkgdesc='Powerful yet easy-to-use source-client for individuals interested in streaming live radio shows over the Internet' url='http://idjc.sourceforge.net/' license=('GPL2') arch=('i686' 'x86_64') -#depends=('python2' 'jack' 'pygtk' 'lame' 'mutagen' 'flac' 'faad2' 'libsamplerate' 'vorbis-tools' 'libsndfile' 'ffmpeg' 'libmad' 'speex' 'dbus-python' 'imagemagick' 'twolame' 'libshout-idjc-git' 'mpg123') -depends=('desktop-file-utils' 'python2' 'dbus-python' 'mutagen' 'jack' 'pygtk' 'vorbis-tools' 'libsndfile' 'libsamplerate' 'glib2' 'lame' 'libmad' 'ffmpeg' 'flac' 'speex' 'libshout-idjc') +depends=('desktop-file-utils' 'python2' 'dbus-python' 'mutagen' 'jack' 'pygtk' 'vorbis-tools' 'libsndfile' 'libsamplerate' 'glib2' 'lame' 'libmad' 'ffmpeg-compat' 'flac' 'speex' 'libshout-idjc') optdepends=('patchage' 'qjackctl') makedepends=('pkgconfig') install=${pkgname}.install source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz") -md5sums=('a14ce4cc8c789fce55c7b98081743a4a') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr PYTHON="/usr/bin/python2" --disable-libav - - make PYTHON="/usr/bin/python2" - + export PYTHON=/usr/bin/python2 + PKG_CONFIG_PATH+="/usr/lib/ffmpeg-compat/pkgconfig" + ./configure \ + --prefix=/usr \ + --libexecdir=/usr/lib \ + --disable-static +# --disable-libav + + make } package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" PYTHON="/usr/bin/python2" install + make DESTDIR="${pkgdir}" install sed -i 's|#! /usr/bin/python22.7|#! /usr/bin/python2|' ${pkgdir}/usr/bin/idjc } + +md5sums=('99abfe98f13170ab6b1ed17a8f1632e1') diff --git a/pcr/imagemagick-srv/PKGBUILD b/pcr/imagemagick-srv/PKGBUILD new file mode 100644 index 000000000..9dc9c4cb2 --- /dev/null +++ b/pcr/imagemagick-srv/PKGBUILD @@ -0,0 +1,80 @@ +# $Id$ +# Maintainer: Eric Bélanger <eric@archlinux.org> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> + +pkgbase=imagemagick +pkgname=imagemagick-srv +pkgver=6.8.6.8 +pkgrel=1 +arch=('i686' 'x86_64' 'mips64el') +url="http://www.imagemagick.org/" +license=('custom') +provides=("$pkgbase=$pkgver") +conflicts=$pkgbase +replaces=$pkgbase +makedepends=('libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'ghostscript-libre' \ + 'openexr-libre' 'libwmf' 'librsvg' 'libxml2' 'jasper' 'liblqr' \ + 'libwebp') # libcl opencl-headers +#source=(http://www.imagemagick.org/download/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ +source=(ftp://ftp.sunet.se/pub/multimedia/graphics/ImageMagick/ImageMagick-${pkgver%.*}-${pkgver##*.}.tar.xz \ + perlmagick.rpath.patch) +sha1sums=('fe298492c6be08eb887d02b75efeb609fa6c4d61' + 'e143cf9d530fabf3b58023899b5cc544ba93daec') + +prepare() { + cd ImageMagick-${pkgver%.*}-${pkgver##*.} + sed '/AC_PATH_XTRA/d' -i configure.ac + autoreconf --force --install + patch -p0 -i "${srcdir}/perlmagick.rpath.patch" +} + +build() { + cd ImageMagick-${pkgver%.*}-${pkgver##*.} + ./configure --prefix=/usr --sysconfdir=/etc --with-modules --disable-static \ + --disable-hdri --with-wmf --with-openexr --with-xml --with-lcms2 --with-jp2 \ + --with-webp --with-gslib --with-gs-font-dir=/usr/share/fonts/Type1 \ + --with-perl --with-perl-options="INSTALLDIRS=vendor" --with-lqr --with-rsvg \ + --disable-opencl --without-gvc --without-djvu --without-autotrace \ + --without-jbig --without-fpx --without-dps --without-fftw + make +} + +check() { + cd ImageMagick-${pkgver%.*}-${pkgver##*.} + make check +} + +package_imagemagick-srv() { + pkgdesc="An image viewing/manipulation program (for web servers)" + depends=('perl' 'libltdl' 'lcms2' 'libxt' 'fontconfig' 'libxext' 'liblqr') # 'libcl') + optdepends=('ghostscript-libre: for Ghostscript support' + 'openexr-libre: for OpenEXR support' + 'libwmf: for WMF support' + 'librsvg: for SVG support' + 'libxml2: for XML support' + 'jasper: for JPEG-2000 support' + 'libpng: for PNG support' + 'libwebp: for WEBP support') + backup=("etc/ImageMagick-${pkgver%%.*}/coder.xml" + "etc/ImageMagick-${pkgver%%.*}/colors.xml" + "etc/ImageMagick-${pkgver%%.*}/delegates.xml" + "etc/ImageMagick-${pkgver%%.*}/log.xml" + "etc/ImageMagick-${pkgver%%.*}/magic.xml" + "etc/ImageMagick-${pkgver%%.*}/mime.xml" + "etc/ImageMagick-${pkgver%%.*}/policy.xml" + "etc/ImageMagick-${pkgver%%.*}/quantization-table.xml" + "etc/ImageMagick-${pkgver%%.*}/thresholds.xml" + "etc/ImageMagick-${pkgver%%.*}/type.xml" + "etc/ImageMagick-${pkgver%%.*}/type-dejavu.xml" + "etc/ImageMagick-${pkgver%%.*}/type-ghostscript.xml" + "etc/ImageMagick-${pkgver%%.*}/type-windows.xml") + options=('!docs' 'libtool' '!emptydirs') + + cd ImageMagick-${pkgver%.*}-${pkgver##*.} + make -j1 DESTDIR="${pkgdir}" install + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/imagemagick/LICENSE" + install -Dm644 NOTICE "${pkgdir}/usr/share/licenses/imagemagick/NOTICE" + +#Cleaning + rm -f "${pkgdir}"/usr/lib/*.la +} diff --git a/pcr/imagemagick-srv/perlmagick.rpath.patch b/pcr/imagemagick-srv/perlmagick.rpath.patch new file mode 100644 index 000000000..a5b1a82e2 --- /dev/null +++ b/pcr/imagemagick-srv/perlmagick.rpath.patch @@ -0,0 +1,11 @@ +--- Makefile.in.orig 2013-02-21 03:26:56.785156600 -0500 ++++ Makefile.in 2013-02-21 03:39:03.102411457 -0500 +@@ -10469,6 +10469,8 @@ + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@$(PERLMAKEFILE): perl-sources $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) $(PERLMAKEMAKER) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @PERL@ Makefile.PL $(PERL_MAKE_OPTIONS) ++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' Makefile ++@WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ cd $(PERLMAGICK) && @SED@ -i 's|LD_RUN_PATH|DIE_LD_RUN_PATH_DIE|g' quantum/Makefile + + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@install-exec-perl: $(PERLMAKEFILE) + @WITH_PERL_DYNAMIC_TRUE@@WITH_PERL_TRUE@ ( cd $(PERLMAGICK) && $(MAKE) CC='@CC@' && \ diff --git a/pcr/quackle/PKGBUILD b/pcr/quackle/PKGBUILD new file mode 100644 index 000000000..02f5ac568 --- /dev/null +++ b/pcr/quackle/PKGBUILD @@ -0,0 +1,38 @@ +# Maintainer: Guillaume ALAUX <Guillaume at ALAUX dot net> +pkgname=quackle +pkgver=0.97 +pkgrel=2 +pkgdesc='Free crossword game (Scrabble-like) artificial intelligence and analysis tool' +arch=('i686' 'x86_64') +url='http://people.csail.mit.edu/jasonkb/quackle' +license=('GPL') +depends=('qt4') +makedepends=('qt4') +source=(http://people.csail.mit.edu/jasonkb/${pkgname}/downloads/${pkgname}-${pkgver}/${pkgname}-${pkgver}-source.tar.gz + quacker.sh) +md5sums=('f744484e916f4cbbcffe6c13d772aee7' + '0c3cf80395db58959c8ae825b917a19f') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + qmake-qt4 + make clean + make + + cd "${srcdir}/${pkgname}-${pkgver}/quackleio" + qmake-qt4 + make clean + make + + cd "${srcdir}/${pkgname}-${pkgver}/quacker" + qmake-qt4 + make clean + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + install -dm755 ${pkgdir}/opt/${pkgname} + cp -r quacker/quacker data ${pkgdir}/opt/${pkgname} + install -Dm755 ${srcdir}/quacker.sh ${pkgdir}/usr/bin/quacker +} diff --git a/pcr/quackle/quacker.sh b/pcr/quackle/quacker.sh new file mode 100755 index 000000000..702c262bf --- /dev/null +++ b/pcr/quackle/quacker.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /opt/quackle +./quacker 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() { diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD index b6b7526e6..dfaba34cc 100644 --- a/pcr/youtube-dl-current/PKGBUILD +++ b/pcr/youtube-dl-current/PKGBUILD @@ -5,7 +5,7 @@ pkgname=youtube-dl-current _pkgname=youtube-dl provides=(youtube-dl) -pkgver=2013.08.23 +pkgver=2013.08.30 pkgrel=1 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites" arch=('any') @@ -14,7 +14,7 @@ license=('custom') depends=('python') makedepends=('python-distribute') source=(http://youtube-dl.org/downloads/${pkgver}/${_pkgname}-${pkgver}.tar.gz{,.sig}) -md5sums=('50c348f8dc28adff28d76420deff7297' +md5sums=('f9e5574fe3b645892a7d814797b8a607' 'SKIP') prepare() { diff --git a/~fauno/afew/LICENSE b/~fauno/afew/LICENSE deleted file mode 100644 index aab8c3624..000000000 --- a/~fauno/afew/LICENSE +++ /dev/null @@ -1,15 +0,0 @@ -# -# Copyright (c) Justus Winter <4winter@informatik.uni-hamburg.de> -# -# Permission to use, copy, modify, and distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# diff --git a/~fauno/afew/PKGBUILD b/~fauno/afew/PKGBUILD deleted file mode 100644 index 1256ad4d3..000000000 --- a/~fauno/afew/PKGBUILD +++ /dev/null @@ -1,29 +0,0 @@ -# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com> -pkgname=afew -pkgver=2012.07.11 -_gitver=20120711 -pkgrel=1 -pkgdesc="afew is an initial tagging script for notmuch mail" -arch=(any) -url="https://github.com/teythoon/afew" -license=('custom:BSD') -depends=('python2' 'notmuch' 'dbacl') -source=("https://repo.parabolagnulinux.org/other/${pkgname}-${_gitver}-${pkgrel}-any.src.tar.gz" - 'LICENSE') - -build() { - cd "$srcdir/$pkgname" - - python2 setup.py build -} - -package() { - cd "$srcdir/$pkgname" - python2 setup.py install --prefix="$pkgdir/usr" - - install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: -md5sums=('99e501fb8f99ec58eccf8c08d572dab2' - '295b245540aa61538f9a3556c4be846c') diff --git a/~fauno/afew/SRCBUILD b/~fauno/afew/SRCBUILD deleted file mode 100644 index 0ac3b5d75..000000000 --- a/~fauno/afew/SRCBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com> -pkgname=afew -pkgver=20120711 -pkgrel=1 -pkgdesc="afew is an initial tagging script for notmuch mail" -arch=(any) -url="https://github.com/teythoon/afew" -license=('custom:BSD') -makedepends=('git') - -_gitroot='https://github.com/teythoon/afew.git' -_gitname='afew' - -build() { - cd "$srcdir" - msg "Connecting to GIT server...." - - if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin - msg "The local files are updated." - else - git clone "$_gitroot" "$_gitname" - fi - - msg "GIT checkout done or server timeout" - -} - -package() { - PKGEXT=${SRCEXT} - PKGDEST=${SRCDEST} - cp -a ${srcdir}/* ${pkgdir}/ -} - -# vim:set ts=2 sw=2 et: - diff --git a/~fauno/bibutils-dynamic/PKGBUILD b/~fauno/bibutils-dynamic/PKGBUILD deleted file mode 100644 index cc8f371a6..000000000 --- a/~fauno/bibutils-dynamic/PKGBUILD +++ /dev/null @@ -1,30 +0,0 @@ -# Contributor: Ivy Foster <joyfulgirl (at) archlinux (dot) us> - -pkgname=bibutils-dynamic -_basename=bibutils -pkgver=4.12 -pkgrel=1 -pkgdesc="Bibliography conversion tools, with dynamic libs" -arch=("i686" "x86_64") -url="http://www.scripps.edu/~cdputnam/software/bibutils" -license=('GPL2') -makedepends=('tcsh') -provides=('bibutils') -source=("${url}/${_basename}_${pkgver}_src.tgz") -md5sums=('395f46393eca8e184652c5e8e1ae83b6') - -build() { - cd "${srcdir}/${_basename}_$pkgver" - ./configure --dynamic \ - --install-dir ${pkgdir}/usr/bin \ - --install-lib ${pkgdir}/usr/lib - make -} - -package() { - install -d ${pkgdir}/usr/{bin,lib} - cd "${srcdir}/${_basename}_$pkgver" - make install -} - -# vim:set ts=2 sw=2 et: diff --git a/~fauno/dbacl/PKGBUILD b/~fauno/dbacl/PKGBUILD deleted file mode 100644 index a92679444..000000000 --- a/~fauno/dbacl/PKGBUILD +++ /dev/null @@ -1,32 +0,0 @@ -# Maintainer: Kazuo Teramoto <kaz.rag at gmail.com? -pkgname=dbacl -pkgver=1.12 -pkgrel=1 -pkgdesc="Digramic Bayesian classifier" -arch=('i686' 'x86_64') -url="http://dbacl.sourceforge.net/" -license=('GPL') -depends=('gawk' 'perl') -source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -md5sums=('048d8cf68e277ba2ab5d159dc395a65d') -sha256sums=('9fcb05a0951527c7b33aeb20735747f84bca88a4e122c93537120d1014f650e9') - -build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make -} - -check() -{ - cd "$srcdir/$pkgname-$pkgver" - make -k check -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install - mv "$pkgdir/usr/man" "$pkgdir/usr/share" -} - -# vim:set ts=2 sw=2 et: diff --git a/~fauno/distccd-zeroconf/PKGBUILD b/~fauno/distccd-zeroconf/PKGBUILD deleted file mode 100644 index 1690daad9..000000000 --- a/~fauno/distccd-zeroconf/PKGBUILD +++ /dev/null @@ -1,50 +0,0 @@ -# $Id: PKGBUILD 59085 2009-11-20 06:29:43Z giovanni $ -# Maintainer: Judd Vinet <jvinet@zeroflux.org> -# Contributor: Giovanni Scafora <giovanni@archlinux.org> - -pkgname=distcc-zeroconf -_pkgname=distcc -pkgver=3.1 -pkgrel=1 -pkgdesc="A distributed C, C++, Obj C compiler with zeroconf support" -arch=('i686' 'x86_64' 'mips64el') -url="http://code.google.com/p/distcc/" -license=('GPL') -depends=('gcc' 'popt' 'avahi') -makedepends=('gtk2' 'pkgconfig') -optdepends=('gtk2: for distccmon-gnome') -provides=('distcc') -conflicts=('distcc') -replaces=('distcc') -backup=(etc/conf.d/distccd) -options=(!distcc) -source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2 - distccd - distccd.conf.d) -md5sums=('a1a9d3853df7133669fffec2a9aab9f3' - '1c918474372c09304772c20c4de484fa' - '89aaf6e9072092e283465a14e83f0f94') - -build() { - cd "${srcdir}/${_pkgname}-${pkgver}" - ./configure --prefix=/usr \ - --with-gtk \ - --sysconfdir=/etc \ - --mandir=/usr/share/man \ - --disable-Werror - make -} - -package() { - cd "${srcdir}/${_pkgname}-${pkgver}" - make DESTDIR="${pkgdir}/" install - install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd - install -D -m755 ${srcdir}/distccd ${pkgdir}/etc/rc.d/distccd - - install -d ${pkgdir}/usr/lib/${_pkgname}/bin - ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cc - ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/gcc - ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/g++ - ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cpp - ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/c++ -} diff --git a/~fauno/distccd-zeroconf/distccd b/~fauno/distccd-zeroconf/distccd deleted file mode 100755 index 4702d6820..000000000 --- a/~fauno/distccd-zeroconf/distccd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -[ -f /etc/conf.d/distccd ] && . /etc/conf.d/distccd - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/bin/distccd` -case "$1" in - start) - stat_busy "Starting distcc Daemon" - [ -z "$PID" ] && /usr/bin/distccd --daemon ${DISTCC_ARGS} - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon distccd - stat_done - fi - ;; - stop) - stat_busy "Stopping distcc Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon distccd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 diff --git a/~fauno/distccd-zeroconf/distccd.conf.d b/~fauno/distccd-zeroconf/distccd.conf.d deleted file mode 100644 index 8f90cb503..000000000 --- a/~fauno/distccd-zeroconf/distccd.conf.d +++ /dev/null @@ -1,8 +0,0 @@ -# -# Parameters to be passed to distccd -# -# You must explicitly add IPs (or subnets) that are allowed to connect, -# using the --allow switch. See the distccd manpage for more info. -# -DISTCC_ARGS="--user nobody --allow 127.0.0.1" - diff --git a/~fauno/emerillon/PKGBUILD b/~fauno/emerillon/PKGBUILD deleted file mode 100644 index 621ed04bb..000000000 --- a/~fauno/emerillon/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Isaac Dupree <id@isaac.cedarswampstudios.org> -# Contributor: yannsen <ynnsen@gmail.com> -pkgname=emerillon -arch=('i686' 'x86_64') -pkgver=0.1.90 -pkgrel=2 -pkgdesc="OpenStreetMap viewer" -url="http://projects.gnome.org/emerillon/" -license=('GPL2') -depends=('libpeas' 'geoclue' 'libsoup-gnome' 'libchamplain>=0.12.0' 'librest' 'ethos') -makedepends=('intltool' 'gnome-common' 'vala' 'gtk-doc') -options=(!libtool) -install=${pkgname}.install -source=(http://download.gnome.org/sources/emerillon/0.1/${pkgname}-${pkgver}.tar.xz) -md5sums=('d740ee4d5fcd7b39fde15e75b4ee7a3a') - -build() { - cd ${srcdir}/${pkgname}-${pkgver} - - ./configure --prefix=/usr - make -} -package() { - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=$pkgdir install -} diff --git a/~fauno/emerillon/emerillon.install b/~fauno/emerillon/emerillon.install deleted file mode 100644 index 77c7018ea..000000000 --- a/~fauno/emerillon/emerillon.install +++ /dev/null @@ -1,12 +0,0 @@ -post_install() { - usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas -} - -post_upgrade() { - post_install $1 -} - -post_remove() { - post_install $1 -} - diff --git a/~fauno/ethos/PKGBUILD b/~fauno/ethos/PKGBUILD deleted file mode 100644 index f05c8fa8b..000000000 --- a/~fauno/ethos/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Contributor: yannsen <ynnsen@gmail.com> -pkgname=ethos -pkgver=0.2.2 -pkgrel=6 -arch=('i686' 'x86_64') -pkgdesc="Plugin framework for GLib" -url="http://git.dronelabs.com/ethos/about/" -license="LGPL" -depends=(python2 gtk2) -makedepends=(intltool pygtk) -source=(http://ftp.dronelabs.com/sources/$pkgname/0.2/$pkgname-$pkgver.tar.gz) -md5sums=('36cf1ef444a224556bba4d441c400300') -options=(!libtool) - -build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr - make -} - -package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install -} diff --git a/~fauno/faenza-icon-theme/PKGBUILD b/~fauno/faenza-icon-theme/PKGBUILD deleted file mode 100644 index 484764c73..000000000 --- a/~fauno/faenza-icon-theme/PKGBUILD +++ /dev/null @@ -1,25 +0,0 @@ -# Maintainer: Elia Notarangelo <elia.notarangelo AT gmail DOT com> -# Contributor: Frikilinux <frikilinux at frikilinux.com.ar> -# Contributor: graysky <graysky AT archlinux DOT us> -# Contributor: Samsagax <samsagax AT gmail DOT com> -# Contributor: simongmzlj <simongmzlj AT gmail DOT com> - -pkgname=faenza-icon-theme -pkgver=1.3 -pkgrel=1 -pkgdesc="Icon theme designed for Equinox GTK theme" -url="http://gnome-look.org/content/show.php/Faenza?content=128143" -license=('GPL3') -arch=('any') -makedepends=() -options=(!strip) -source=("http://ppa.launchpad.net/tiheum/equinox/ubuntu/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.gz") -md5sums=('763e0450b0853bd11f04c970ba3fd49f') - -package() { - cd "${srcdir}" - mkdir -p "${pkgdir}"/usr/share/icons - cp -rf Faenza{,-Dark,-Darkest,-Darker} "${pkgdir}"/usr/share/icons/ - -} - diff --git a/~fauno/geoclue/PKGBUILD b/~fauno/geoclue/PKGBUILD deleted file mode 100644 index e370197c7..000000000 --- a/~fauno/geoclue/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# mAINTAIner: Isaac Dupree <id@isaac.cedarswampstudios.org> -# Contributor: Daniel J Griffiths <ghost1227@archlinux.us> -# Contributor: Kurama <kurama_luka@yahoo.it> - -pkgname=geoclue -pkgver=0.12 -pkgrel=2 -pkgdesc="Modular geoinformation service built on the D-Bus messaging system." -arch=('i686' 'x86_64') -url="http://geoclue.freedesktop.org" -license=('LGPL') -depends=('gconf') -makedepends=('gtk-doc' 'libtool') -source=(http://cgit.freedesktop.org/${pkgname}/snapshot/${pkgname}-${pkgver}.tar.gz) - -build() { - cd ${srcdir}/${pkgname}-${pkgver} -# unset LDFLAGS - ./autogen.sh --prefix=/usr --libexecdir=/usr/lib - find -name 'Makefile' -print0 | xargs -0 sed -i "s/-Werror //" - make -} - -package(){ - cd ${srcdir}/${pkgname}-${pkgver} - make DESTDIR=${pkgdir} install -} -md5sums=('684e24d1ff3683953c968fed210b2982') diff --git a/~fauno/haskell-base64-bytestring/PKGBUILD b/~fauno/haskell-base64-bytestring/PKGBUILD deleted file mode 100644 index 9943e7e15..000000000 --- a/~fauno/haskell-base64-bytestring/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# custom variables -_hkgname=base64-bytestring -_licensefile=LICENSE - -# PKGBUILD options/directives -pkgname=haskell-base64-bytestring -pkgver=0.1.0.3 -pkgrel=1 -pkgdesc="Fast base64 encoding and deconding for ByteStrings" -url="https://github.com/bos/base64-bytestring" -license=("BSD3") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.0.3-2" - "sh" - "haskell-bytestring=0.9.1.10") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="${pkgname}.install" -sha256sums=("a3d76d27f2271c603990d909fed0a4f175628e9c6e19427cc8387dd4c2429234") - -# PKGBUILD functions -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile} -} diff --git a/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install b/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install deleted file mode 100644 index 55a35b6d2..000000000 --- a/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install +++ /dev/null @@ -1,26 +0,0 @@ -# custom variables -pkgname=haskell-base64-bytestring -HS_DIR=usr/share/haskell/${pkgname} - -# functions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/haskell-citeproc-hs/PKGBUILD b/~fauno/haskell-citeproc-hs/PKGBUILD deleted file mode 100644 index 32f06094b..000000000 --- a/~fauno/haskell-citeproc-hs/PKGBUILD +++ /dev/null @@ -1,60 +0,0 @@ -# custom variables -_hkgname=citeproc-hs -_licensefile=LICENSE - -# PKGBUILD options/directives -pkgname=haskell-citeproc-hs -pkgver=0.3.3 -pkgrel=1 -pkgdesc="A Citation Style Language implementation in Haskell" -url="http://gorgias.mine.nu/repos/citeproc-hs/" -license=("BSD3") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.0.3-2" - "sh" - "haskell-http=4000.1.1" - "haskell-bytestring=0.9.1.10" - "haskell-containers=0.4.0.0" - "haskell-directory=1.1.0.0" - "haskell-filepath=1.2.0.0" - "haskell-hs-bibutils=4.12" - "haskell-json=0.4.4" - "haskell-mtl=2.0.1.0" - "haskell-network=2.3.0.2" - "haskell-old-locale=1.0.0.2" - "haskell-pandoc-types=1.8.2" - "haskell-parsec=3.1.1" - "haskell-syb=0.3" - "haskell-time=1.2.0.3" - "haskell-utf8-string=0.3.6" - "haskell-xml=1.3.9") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="${pkgname}.install" -sha256sums=("249bc0ec589fc79b098867502732c3c47ce032ad32f82d3280c1ca9373c71f7a") - -# PKGBUILD functions -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile} -} diff --git a/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install b/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install deleted file mode 100644 index 6bf4872f1..000000000 --- a/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install +++ /dev/null @@ -1,26 +0,0 @@ -# custom variables -pkgname=haskell-citeproc-hs -HS_DIR=usr/share/haskell/${pkgname} - -# functions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/haskell-digest/PKGBUILD b/~fauno/haskell-digest/PKGBUILD deleted file mode 100644 index 724a600af..000000000 --- a/~fauno/haskell-digest/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# custom variables -_hkgname=digest -_licensefile=LICENSE - -# PKGBUILD options/directives -pkgname=haskell-digest -pkgver=0.0.1.0 -pkgrel=1 -pkgdesc="Various cryptographic hashes for bytestrings; CRC32 and Adler32 for now." -url="http://hackage.haskell.org/package/${_hkgname}" -license=("BSD3") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.0.3-2" - "sh" - "haskell-bytestring=0.9.1.10" - "zlib") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="${pkgname}.install" -sha256sums=("40319762afc05823920126f13cba02b06544ba039e08c3f63db2ed084a9a4edc") - -# PKGBUILD functions -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile} -} diff --git a/~fauno/haskell-digest/haskell-digest.install b/~fauno/haskell-digest/haskell-digest.install deleted file mode 100644 index 7aa8e0003..000000000 --- a/~fauno/haskell-digest/haskell-digest.install +++ /dev/null @@ -1,26 +0,0 @@ -# custom variables -pkgname=haskell-digest -HS_DIR=usr/share/haskell/${pkgname} - -# functions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/haskell-dlist/PKGBUILD b/~fauno/haskell-dlist/PKGBUILD deleted file mode 100644 index 6b68c97c3..000000000 --- a/~fauno/haskell-dlist/PKGBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# custom variables -_hkgname=dlist -_licensefile=LICENSE - -# PKGBUILD options/directives -pkgname=haskell-dlist -pkgver=0.5 -pkgrel=18 -pkgdesc="Differences lists" -url="http://code.haskell.org/~dons/code/dlist/" -license=("BSD3") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.0.3-2" "sh") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="${pkgname}.install" -sha256sums=("4780e5409eff55bbfdd7470ef802a087a04048c9cd5efe0482c82878292f19ea") - -# PKGBUILD functions -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile} -} diff --git a/~fauno/haskell-dlist/haskell-dlist.install b/~fauno/haskell-dlist/haskell-dlist.install deleted file mode 100644 index f20fb2952..000000000 --- a/~fauno/haskell-dlist/haskell-dlist.install +++ /dev/null @@ -1,26 +0,0 @@ -# custom variables -pkgname=haskell-dlist -HS_DIR=usr/share/haskell/${pkgname} - -# functions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/haskell-hs-bibutils/PKGBUILD b/~fauno/haskell-hs-bibutils/PKGBUILD deleted file mode 100644 index 46816e9c2..000000000 --- a/~fauno/haskell-hs-bibutils/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# Maintainer: Ivy Foster <joyfulgirl (at) archlinux (dot) # us> -# Contributor: Alexander Dunlap <alexander.dunlap at gmail # dot com> - -_hkgname=hs-bibutils -pkgname=haskell-hs-bibutils -pkgver=4.12 -pkgrel=4 -pkgdesc="Haskell bindings to bibutils, the bibliography conversion utilities." -url="http://hackage.haskell.org/package/${_hkgname}" -license=('GPL') -arch=('i686' 'x86_64') -makedepends=() -depends=('ghc' 'haskell-syb=0.3' 'bibutils-dynamic') -options=('strip') -source=(http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz) -install=${pkgname}.install -md5sums=('4c4647b34246a4d35f1d1cfb10e6720a') - -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - runhaskell Setup configure -O \ - --enable-split-objs \ - --enable-shared \ - --prefix=/usr \ - --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid \ - --enable-library-profiling - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r \ - -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" \ - unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh \ - ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh \ - ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 \ - ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html \ - ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} -} diff --git a/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install b/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install deleted file mode 100644 index 454c6ff37..000000000 --- a/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install +++ /dev/null @@ -1,18 +0,0 @@ -HS_DIR=usr/share/haskell/haskell-hs-bibutils -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_upgrade() { - ${HS_DIR}/unregister.sh -} -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} -pre_remove() { - ${HS_DIR}/unregister.sh -} -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/haskell-json/PKGBUILD b/~fauno/haskell-json/PKGBUILD deleted file mode 100644 index 2a1da8a47..000000000 --- a/~fauno/haskell-json/PKGBUILD +++ /dev/null @@ -1,51 +0,0 @@ -# custom variables -_hkgname=json -_licensefile=LICENSE - -# PKGBUILD options/directives -pkgname=haskell-json -pkgver=0.4.4 -pkgrel=18 -pkgdesc="Support for serialising Haskell to and from JSON" -url="http://hackage.haskell.org/package/${_hkgname}" -license=("BSD3") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.0.3-2" - "sh" - "haskell-array=0.3.0.2" - "haskell-bytestring=0.9.1.10" - "haskell-containers=0.4.0.0" - "haskell-mtl=2.0.1.0" - "haskell-parsec=3.1.1" - "haskell-pretty=1.0.1.2" - "haskell-syb=0.3") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="${pkgname}.install" -sha256sums=("010157c267e156489771a3a9466f9de74393d9bc82053c1463af8a55caaf5880") - -# PKGBUILD functions -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile} -} diff --git a/~fauno/haskell-json/haskell-json.install b/~fauno/haskell-json/haskell-json.install deleted file mode 100644 index 10d6b7279..000000000 --- a/~fauno/haskell-json/haskell-json.install +++ /dev/null @@ -1,26 +0,0 @@ -# custom variables -pkgname=haskell-json -HS_DIR=usr/share/haskell/${pkgname} - -# functions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/haskell-pandoc-types/PKGBUILD b/~fauno/haskell-pandoc-types/PKGBUILD deleted file mode 100644 index 954514ebe..000000000 --- a/~fauno/haskell-pandoc-types/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# custom variables -_hkgname=pandoc-types -_licensefile=COPYING - -# PKGBUILD options/directives -pkgname=haskell-pandoc-types -pkgver=1.8.2 -pkgrel=1 -pkgdesc="Types for representing a structured document" -url="http://johnmacfarlane.net/pandoc" -license=("GPL") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.0.3-2" - "sh" - "haskell-containers=0.4.0.0" - "haskell-syb=0.3") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="${pkgname}.install" -sha256sums=("6a580be1ec25a747db2ee9df1c98b1f3a778493b98e5148bf8ce5ed1289e9013") - -# PKGBUILD functions -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile} -} diff --git a/~fauno/haskell-pandoc-types/haskell-pandoc-types.install b/~fauno/haskell-pandoc-types/haskell-pandoc-types.install deleted file mode 100644 index 34622807c..000000000 --- a/~fauno/haskell-pandoc-types/haskell-pandoc-types.install +++ /dev/null @@ -1,26 +0,0 @@ -# custom variables -pkgname=haskell-pandoc-types -HS_DIR=usr/share/haskell/${pkgname} - -# functions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/haskell-tagsoup/PKGBUILD b/~fauno/haskell-tagsoup/PKGBUILD deleted file mode 100644 index 0de1f165b..000000000 --- a/~fauno/haskell-tagsoup/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# custom variables -_hkgname=tagsoup -_licensefile=LICENSE - -# PKGBUILD options/directives -pkgname=haskell-tagsoup -pkgver=0.12.3 -pkgrel=1 -pkgdesc="Parsing and extracting information from (possibly malformed) HTML/XML documents" -url="http://community.haskell.org/~ndm/tagsoup/" -license=("BSD3") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.0.3-2" - "sh" - "haskell-bytestring=0.9.1.10" - "haskell-containers=0.4.0.0" - "haskell-text=0.11.0.5") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="${pkgname}.install" -sha256sums=("8bed50b3958a794422563ad93d82fb6d4e806d1884623f35f454ff360d9b8138") - -# PKGBUILD functions -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile} -} diff --git a/~fauno/haskell-tagsoup/haskell-tagsoup.install b/~fauno/haskell-tagsoup/haskell-tagsoup.install deleted file mode 100644 index dc61b4049..000000000 --- a/~fauno/haskell-tagsoup/haskell-tagsoup.install +++ /dev/null @@ -1,26 +0,0 @@ -# custom variables -pkgname=haskell-tagsoup -HS_DIR=usr/share/haskell/${pkgname} - -# functions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/haskell-texmath/PKGBUILD b/~fauno/haskell-texmath/PKGBUILD deleted file mode 100644 index 95e88912a..000000000 --- a/~fauno/haskell-texmath/PKGBUILD +++ /dev/null @@ -1,48 +0,0 @@ -# custom variables -_hkgname=texmath -_licensefile=LICENSE - -# PKGBUILD options/directives -pkgname=haskell-texmath -pkgver=0.5.0.1 -pkgrel=19 -pkgdesc="Conversion of LaTeX math formulas to MathML." -url="http://github.com/jgm/texmath" -license=("GPL") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.0.3-2" - "sh" - "haskell-containers=0.4.0.0" - "haskell-parsec=3.1.1" - "haskell-syb=0.3" - "haskell-xml=1.3.9") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="${pkgname}.install" -sha256sums=("bedd883728fbd84bf07c1d1c851440db6d8be6b9e221024533851cd7c21a824f") - -# PKGBUILD functions -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile} -} diff --git a/~fauno/haskell-texmath/haskell-texmath.install b/~fauno/haskell-texmath/haskell-texmath.install deleted file mode 100644 index b95fd0d9f..000000000 --- a/~fauno/haskell-texmath/haskell-texmath.install +++ /dev/null @@ -1,26 +0,0 @@ -# custom variables -pkgname=haskell-texmath -HS_DIR=usr/share/haskell/${pkgname} - -# functions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/haskell-xml/PKGBUILD b/~fauno/haskell-xml/PKGBUILD deleted file mode 100644 index fc42941b3..000000000 --- a/~fauno/haskell-xml/PKGBUILD +++ /dev/null @@ -1,45 +0,0 @@ -# custom variables -_hkgname=xml -_licensefile=LICENSE - -# PKGBUILD options/directives -pkgname=haskell-xml -pkgver=1.3.9 -pkgrel=1 -pkgdesc="A simple XML library." -url="http://code.galois.com" -license=("BSD3") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.0.3-2" - "sh" - "haskell-bytestring=0.9.1.10") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="${pkgname}.install" -sha256sums=("821b368d5b06e695f9a3d35e92b3159c500dbe03f0bc04b0229e5da65b99a6eb") - -# PKGBUILD functions -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile} -} diff --git a/~fauno/haskell-xml/haskell-xml.install b/~fauno/haskell-xml/haskell-xml.install deleted file mode 100644 index 741ef9ee0..000000000 --- a/~fauno/haskell-xml/haskell-xml.install +++ /dev/null @@ -1,26 +0,0 @@ -# custom variables -pkgname=haskell-xml -HS_DIR=usr/share/haskell/${pkgname} - -# functions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/haskell-zip-archive/PKGBUILD b/~fauno/haskell-zip-archive/PKGBUILD deleted file mode 100644 index 0d0d91a11..000000000 --- a/~fauno/haskell-zip-archive/PKGBUILD +++ /dev/null @@ -1,49 +0,0 @@ -# custom variables -_hkgname=zip-archive -_licensefile=LICENSE - -# PKGBUILD options/directives -pkgname=haskell-zip-archive -pkgver=0.1.1.7 -pkgrel=20 -pkgdesc="Library for creating and modifying zip archives." -url="http://github.com/jgm/zip-archive" -license=("GPL") -arch=('i686' 'x86_64') -makedepends=() -depends=("ghc=7.0.3-2" - "haskell-binary=0.5.0.2-8" - "haskell-digest=0.0.1.0-1" - "haskell-mtl=2.0.1.0-3.1" - "haskell-unix=2.4.2.0-2" - "haskell-utf8-string=0.3.6-7.2" - "haskell-zlib=0.5.3.1-2.1") -options=('strip') -source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz") -install="${pkgname}.install" -sha256sums=("88c096d469d8b4d816dbe15571f2c1e61e31c1cd67f931672240063a51d8a2e0") - -# PKGBUILD functions -build() { - cd ${srcdir}/${_hkgname}-${pkgver} - - runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ - --prefix=/usr --docdir=/usr/share/doc/${pkgname} \ - --libsubdir=\$compiler/site-local/\$pkgid - runhaskell Setup build - runhaskell Setup haddock - runhaskell Setup register --gen-script - runhaskell Setup unregister --gen-script - sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh -} - -package() { - cd ${srcdir}/${_hkgname}-${pkgver} - install -D -m744 register.sh ${pkgdir}/usr/share/haskell/${pkgname}/register.sh - install -m744 unregister.sh ${pkgdir}/usr/share/haskell/${pkgname}/unregister.sh - install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries - ln -s /usr/share/doc/${pkgname}/html ${pkgdir}/usr/share/doc/ghc/html/libraries/${_hkgname} - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 ${_licensefile} ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - rm -f ${pkgdir}/usr/share/doc/${pkgname}/${_licensefile} -} diff --git a/~fauno/haskell-zip-archive/haskell-zip-archive.install b/~fauno/haskell-zip-archive/haskell-zip-archive.install deleted file mode 100644 index c19836db7..000000000 --- a/~fauno/haskell-zip-archive/haskell-zip-archive.install +++ /dev/null @@ -1,26 +0,0 @@ -# custom variables -pkgname=haskell-zip-archive -HS_DIR=usr/share/haskell/${pkgname} - -# functions -post_install() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_upgrade() { - ${HS_DIR}/unregister.sh -} - -post_upgrade() { - ${HS_DIR}/register.sh - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} - -pre_remove() { - ${HS_DIR}/unregister.sh -} - -post_remove() { - (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) -} diff --git a/~fauno/kyotocabinet/PKGBUILD b/~fauno/kyotocabinet/PKGBUILD deleted file mode 100644 index bd421dc3c..000000000 --- a/~fauno/kyotocabinet/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Alexander Duscheleit <jinks@archlinux.us> -# Contributor: Joaquim Pedro (osmano807) <osmano807@gmail.com> -pkgname=kyotocabinet -pkgver=1.2.76 -pkgrel=1 -pkgdesc="a modern implementation of DBM in C++" -arch=('i686' 'x86_64' 'mips64el') -url="http://fallabs.com/kyotocabinet" -license=('LGPL3') -makedepends=('gcc>=3.1' 'make' 'pkgconfig' 'zlib') -depends=('zlib' 'gcc-libs') -source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz") - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make install DESTDIR="$pkgdir/" -} -sha512sums=('278db7b327eb4c21bf0137d9aa14fb67d74d5ce7ed1cb29fc9120d157a60de165ec0cf842903eb7952e8f998045ae585b958977fa973ba0e0773381de71d9f6a') diff --git a/~fauno/kyototycoon/PKGBUILD b/~fauno/kyototycoon/PKGBUILD deleted file mode 100644 index 97f42097c..000000000 --- a/~fauno/kyototycoon/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Maintainer: Alexander Duscheleit <jinks@archlinux.us> -pkgname=kyototycoon -pkgver=0.9.56 -pkgrel=1 -pkgdesc="A lightweight conncurent remote frontend for Kyoto Cabinet." -arch=('i686' 'x86_64' 'mips64el') -url="http://fallabs.com/kyototycoon" -license=('GPL3') -depends=('zlib' 'kyotocabinet') -source=("http://fallabs.com/${pkgname}/pkg/${pkgname}-${pkgver}.tar.gz") -sha256sums=('553e4ea83237d9153cc5e17881092cefe0b224687f7ebcc406b061b2f31c75c6') - -build() { - cd "$srcdir/$pkgname-$pkgver" - - ./configure --prefix=/usr - make -} - -package() { - cd "$srcdir/$pkgname-$pkgver" - - make install DESTDIR="$pkgdir/" -} - -# vim:set ts=2 sw=2 et: diff --git a/~fauno/ldapscripts/PKGBUILD b/~fauno/ldapscripts/PKGBUILD deleted file mode 100644 index 59080b1cf..000000000 --- a/~fauno/ldapscripts/PKGBUILD +++ /dev/null @@ -1,20 +0,0 @@ -pkgname=ldapscripts -pkgver=2.0.1 -pkgrel=1 -pkgdesc="Shell scripts that allow to manage POSIX accounts (users, groups, machines) in an LDAP directory" -arch=('any') -url="http://contribs.martymac.org/" -license=('GPL') -depends=('sharutils') -source=(http://contribs.martymac.org/ldapscripts/${pkgname}-${pkgver}.tgz) -md5sums=('212a62b3e808faf8d347429ccd2cef09') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - - make DESTDIR="${pkgdir}" \ - ETCDIR=/etc/ldapscripts \ - MANDIR=/usr/share/man \ - LIBDIR=/usr/share/ldapscripts \ - PREFIX=/usr install -} diff --git a/~fauno/librest/PKGBUILD b/~fauno/librest/PKGBUILD deleted file mode 100644 index a66c4559e..000000000 --- a/~fauno/librest/PKGBUILD +++ /dev/null @@ -1,28 +0,0 @@ -# Contributor: Berseker <berseker86 at gmail dot com> - -pkgname=librest -_realname=rest - -pkgver=0.7.10 -pkgrel=1 -pkgdesc="a library to access 'RESTful' web services" -arch=('i686' 'x86_64') -url="http://moblin.org/projects/librest/" -license=('GPL') -source=(http://ftp.gnome.org/pub/GNOME/sources/rest/0.7/${_realname}-${pkgver}.tar.bz2) -options=('!libtool') -depends=('libsoup-gnome' 'libxml2') -makedepends=('gtk-doc') - -build() { - cd "$srcdir/${_realname}-${pkgver}" - - ./configure --prefix=/usr #--without-gnome - make -} - -package() { - cd "$srcdir/${_realname}-${pkgver}" - make DESTDIR="$pkgdir/" install -} -md5sums=('f47850d26bfb6148d1a3db9e74426e20') diff --git a/~fauno/localepurge/PKGBUILD b/~fauno/localepurge/PKGBUILD deleted file mode 100644 index 263776a01..000000000 --- a/~fauno/localepurge/PKGBUILD +++ /dev/null @@ -1,38 +0,0 @@ -# Maintainer: Francesco Groccia <frgroccia gmail.com> -# Contributor: Dincer Celik <dincer@bornovali.com> - -pkgname=localepurge -pkgver=0.6.3 -pkgrel=2 -pkgdesc="Script to remove disk space wasted for unneeded localizations." -arch=('any') -url="http://packages.debian.org/source/sid/localepurge" -license=('GPL') -backup=('etc/locale.nopurge') -source=("http://ftp.de.debian.org/debian/pool/main/l/localepurge/${pkgname}_${pkgver}.tar.gz" - "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.patch" - "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.8.patch" - "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.config.patch" - "http://fgr.bitbucket.org/im/localepurge-arch/locale.nopurge") -sha256sums=('02f7e4a8b5919221a736abb3a937dffc48ffd275f0968e56612d518e1e69c30b' - '3958818b2d54c9ca32a1974d757c3303b6e8e1b81d4302dfaec8b8a7af54d17d' - '3d45b1da93a0fc30dd3ae28d4ef7b319340c5ebaa302f4e375793934262e61fc' - '1cf4c0e9651589502f953ae25654e5b5347de18995055adfb7a6d183a1c4c912' - 'b9c28be93fa47d4f0315972159e501d9eef28bbab7ffe6e8e7c4a13c359f35e8') - -build() -{ - patch -uN ${srcdir}/${pkgname}/usr/sbin/localepurge < ${srcdir}/localepurge.patch - patch -uN ${srcdir}/${pkgname}/debian/localepurge.8 < ${srcdir}/localepurge.8.patch - patch -uN ${srcdir}/${pkgname}/debian/localepurge.config < ${srcdir}/localepurge.config.patch - install -D -m755 ${srcdir}/${pkgname}/usr/sbin/localepurge ${pkgdir}/usr/sbin/localepurge - install -D -m644 ${srcdir}/${pkgname}/debian/localepurge.8 ${pkgdir}/usr/share/man/man8/localepurge.8 - install -D -m755 ${srcdir}/${pkgname}/debian/localepurge.config ${pkgdir}/usr/sbin/localepurge.config - install -D -m644 locale.nopurge ${pkgdir}/etc/locale.nopurge - if [ ! -e /var/cache/localepurge/localelist ]; then - find /usr/share/locale -maxdepth 1 -type d -name "*" -printf "%f\n" | grep "^[a-z]" | cut -d" " -f1 | sort -u > ${srcdir}/localelist - else - cp /var/cache/localepurge/localelist ${srcdir}/localelist - fi - install -D -m644 ${srcdir}/localelist ${pkgdir}/var/cache/localepurge/localelist -} diff --git a/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD b/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD deleted file mode 100644 index 6fc5b1f16..000000000 --- a/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD +++ /dev/null @@ -1,62 +0,0 @@ -# $Id: PKGBUILD 60835 2011-12-18 22:14:40Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -_cross=mips64el-unknown-linux-gnu -pkgname=${_cross}-binutils -pkgver=2.22 -pkgrel=1 -_date=20111227 -_xprefix=/usr -pkgdesc="A set of programs to assemble and manipulate binary and object files" -arch=(i686 x86_64) -group=('mips64el-devel') -license=(GPL) -options=(!libtool) -url="http://www.gnu.org/software/binutils/" -depends=('glibc' 'zlib') -#makedepends=("${_cross}-libtool") -source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2) -md5sums=('c2377089c15bb1a1bfaeca8d0e59dd4d') - -build() { - cd $srcdir/binutils - - #export PATH=/usr/${_cross}/bin/:$PATH - - [ $NOEXTRACT -eq 1 ] || ./configure --prefix=${_xprefix} \ - --program-prefix=${_cross}- \ - --enable-shared \ - --disable-multilib \ - --with-lib-path=${_xprefix}/lib/binutils/${_cross} \ - --disable-nls \ - --target=${_cross} \ - --host=${CHOST} \ - --build=${CHOST} \ - --with-sysroot=/usr/${CHOST}/${_cross} \ - - make configure-host - make tooldir=$pkgdir/${_xprefix} - -} - -package() { - cd $srcdir/binutils - - make prefix=$pkgdir/${_xprefix} tooldir=$pkgdir/${_xprefix} install - - mkdir -p $pkgdir/${_xprefix}/lib/binutils/${_cross} - cp -v include/libiberty.h $pkgdir/${_xprefix}/lib/binutils/${_cross} - - rm -f $pkgdir/${_xprefix}/man/man1/{dlltool,nlmconv,windres}* - - rm -f $pkgdir/usr/bin/ar - rm -f $pkgdir/usr/bin/as - rm -f $pkgdir/usr/bin/ld - rm -f $pkgdir/usr/bin/nm - rm -f $pkgdir/usr/bin/objdump - rm -f $pkgdir/usr/bin/ranlib - rm -f $pkgdir/usr/bin/strip - rm -f $pkgdir/usr/bin/objcopy - rm -f $pkgdir/usr/lib/libiberty.a - rm -rf $pkgdir/usr/share -} diff --git a/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD b/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD deleted file mode 100644 index becc02cfe..000000000 --- a/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 60837 2011-12-18 22:34:22Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> - -_cross=mips64el-unknown-linux-gnu -pkgname=${_cross}-gcc-base -pkgver=4.6.2 -pkgrel=1 -pkgdesc="The GNU Compiler Collection" -arch=(i686 x86_64) -license=('GPL' 'LGPL') -url="http://gcc.gnu.org" -depends=("${_cross}-binutils" 'libmpc' 'libelf') -options=(!libtool !emptydirs zipman docs !strip) -source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2) -md5sums=('780f614ab18c7a9066dec6387d7490b2') - -build() { - cd $srcdir/gcc-$pkgver - - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - [ $NOEXTRACT -eq 1 ] || rm -rf build - mkdir build - cd build - - [ $NOEXTRACT -eq 1 ] || ../configure --prefix=/usr \ - --target=${_cross} \ - --host=${CHOST} \ - --build=${CHOST} \ - --enable-shared --disable-nls --enable-languages=c --enable-multilib \ - --with-local-prefix=/usr/lib/${_cross} \ - --with-as=/usr/bin/${_cross}-as --with-ld=/usr/bin/${_cross}-ld \ - --with-sysroot=/usr/$CHOST/${_cross} - - make all-gcc all-target-libgcc -} - -package() { - cd $srcdir/gcc-$pkgver/build - - export CFLAGS="-O2 -pipe" - export CXXFLAGS="-O2 -pipe" - - make DESTDIR=$pkgdir install-gcc install-target-libgcc - - rm -f $pkgdir/usr/share/man/man7/fsf-funding.7* - rm -f $pkgdir/usr/share/man/man7/gfdl.7* - rm -f $pkgdir/usr/share/man/man7/gpl.7* - rm -rf $pkgdir/usr/share/info - - cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/ - rm -rf $pkgdir/usr/libexec - - # strip it manually - strip $pkgdir/usr/bin/* 2>/dev/null || true - find $pkgdir/usr/lib -type f -exec ${_cross}-strip {} \; 2>/dev/null || true -} diff --git a/~fauno/spawn-fcgi-php/PKGBUILD b/~fauno/spawn-fcgi-php/PKGBUILD deleted file mode 100644 index a49858417..000000000 --- a/~fauno/spawn-fcgi-php/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Contributor: Piotr Rogoża <rogoza dot piotr at gmail dot com> -pkgname=spawn-fcgi-php -pkgver=1.1.1 -pkgrel=1 -pkgdesc="script to provide simple cgi-php support for nginx http daemon" -arch=('any') -url="http://aur.archlinux.org/packages.php?ID=37439" -license=('GPL') -depends=('php-cgi' 'spawn-fcgi') -backup=('etc/conf.d/spawn-fcgi-php.conf') -source=( - 'spawn-fcgi-php' - 'spawn-fcgi-php.conf' - 'server.conf.example' - 'nginx.conf.example' - 'public_html.conf.example' -) - -build() { - # Install script and configuration file - install -Dm775 spawn-fcgi-php \ - ${pkgdir}/etc/rc.d/spawn-fcgi-php || return 1 - install -Dm664 spawn-fcgi-php.conf \ - ${pkgdir}/etc/conf.d/spawn-fcgi-php.conf || return 1 - - # Install examples of configuration - install -Dm664 public_html.conf.example \ - ${pkgdir}/etc/nginx/conf/public_html.conf.example || return 1 - install -Dm644 server.conf.example \ - ${pkgdir}/etc/nginx/conf/server.conf.example || return 1 - install -Dm664 nginx.conf.example \ - ${pkgdir}/etc/nginx/conf/nginx.conf.example || return 1 -} - -# vim:set ts=2 sw=2 et ft=sh: -md5sums=('9088c130caebf43902f958c985200811' - 'a8bfb0b50120c91449c8a08144706c9b' - 'c02189e88531386cd67d3401924c18ae' - '00bf49fc8a0d8c9f6c96305fae8471d4' - '9202545dc3701d5933804890312667e6') diff --git a/~fauno/spawn-fcgi-php/nginx.conf.example b/~fauno/spawn-fcgi-php/nginx.conf.example deleted file mode 100644 index 35d0868f3..000000000 --- a/~fauno/spawn-fcgi-php/nginx.conf.example +++ /dev/null @@ -1,34 +0,0 @@ -user http; -worker_processes 1; - -error_log logs/error.log; - -#pid logs/nginx.pid; - -events { - worker_connections 1024; -} - - -http { - include mime.types; - default_type application/octet-stream; - - sendfile on; - #tcp_nopush on; - - #keepalive_timeout 0; - keepalive_timeout 65; - - #gzip on; - - # the file with mapping username per port - include /etc/nginx/conf/map_user2port.conf; - #or only - #include map_user2port.conf - - # Servers configurations ... - include server.conf.example; - - } -} diff --git a/~fauno/spawn-fcgi-php/public_html.conf.example b/~fauno/spawn-fcgi-php/public_html.conf.example deleted file mode 100644 index 74f6c2b4b..000000000 --- a/~fauno/spawn-fcgi-php/public_html.conf.example +++ /dev/null @@ -1,16 +0,0 @@ -location ~ ^/~([^/]+)(/?.*)$ { - set $username $1; - alias /home/$1/public_html/$2; - autoindex on; - location ~ \.php { - #fastcgi_pass 127.0.0.1:9000; - # or for multiusers, one port per user - fastcgi_pass 127.0.0.1:$port; - # or for unix domain sockets - #fastcgi_pass unix:/var/run/spawn-fcgi/spawn-fcgi.$username.sock; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/conf/fastcgi_params; - } -} -# vi: ft=nginx diff --git a/~fauno/spawn-fcgi-php/server.conf.example b/~fauno/spawn-fcgi-php/server.conf.example deleted file mode 100644 index 06160cfb2..000000000 --- a/~fauno/spawn-fcgi-php/server.conf.example +++ /dev/null @@ -1,22 +0,0 @@ -server { - listen 80; - server_name domain.tld; - root /srv/http/domain.tld; - - index index.php index.html; - - access_log logs/access.log; - error_log logs/error.log; - - location ~ \.php { - # TCP - fastcgi_pass 127.0.0.1:9000; - # or SOCKET - #fastcgi_pass unix:/var/run/spawn-fcgi/spawn-fcgi.sock; - fastcgi_index index.php; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - include /etc/nginx/conf/fastcgi_params; - } - include public_html.conf.example; -} -# vi: ft=nginx diff --git a/~fauno/spawn-fcgi-php/spawn-fcgi-php b/~fauno/spawn-fcgi-php/spawn-fcgi-php deleted file mode 100755 index 607ebab8c..000000000 --- a/~fauno/spawn-fcgi-php/spawn-fcgi-php +++ /dev/null @@ -1,460 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -NAME=spawn-fcgi-php -CONF="/etc/conf.d/spawn-fcgi-php.conf" -#------------------------------------------------------------------------------- -# Return value for: -# for check_process -PROCNOPIDEXIST=-1 # none process is running and pidfile exist -PROCNOPIDNO=0 # none process is running -PROCRUNPIDEXIST=1 # process is running, pidfile exist and has size >0b -PROCRUNPID0=2 # process is running, pidfile has size 0b -PROCRUNPIDNO=3 # process is running, pidfile doesn't exist -OTHERERROR=255 -# check_daemon -DAEMONEXIST=0 -DAEMONNOEXIST=1 -#------------------------------------------------------------------------------- - -# Reading configuration -if [ -r "$CONF" ]; then - . $CONF -else - stat_fail - stat_busy "File $CONF not found" - stat_die -fi -check_config(){ #{{{ -#=== FUNCTION ================================================================ -# NAME: check_config -# DESCRIPTION: Check configuration file -# PARAMETERS: -# RETURNS: 0 if all right -#=============================================================================== - # testing DAEMON - if [ ! -x "$DAEMON" ]; then - stat_fail - stat_busy "File $DAEMON isn't executable" - stat_die - fi - # testing USER and GROUP - if [ -z "$USER" -o -z "$GROUP" ]; then - stat_fail - stat_busy "The variable USER/GROUP isn't defined. I cann't run process $PHPCGI as root." - stat_die - fi - # testing directory of socket - if [ -n "$SOCKET" ]; then - local sockdir=$(dirname "$SOCKET") - if [ ! -d "$sockdir" ]; then - mkdir -p "$sockdir" - fi - fi - # testing directory for user's socket - if [ -n "$USERSOCKET" ]; then - local socksdir=$(dirname "$USERSOCKET") - if [ ! -d "$socksdir" ]; then - mkdir -p "$socksdir" - fi - fi - # testing directory of pidfile - if [ -n "$PIDFILE" ]; then - if [ ! -d $(dirname $PIDFILE) ]; then - mkdir -p $(dirname $PIDFILE) - fi - fi - # testing the program php-cgi - if [ -z "$PHPCGI" ]; then - stat_fail - stat_busy "The variable PHPCGI isn't defined" - stat_die - else - if [ ! -x "$PHPCGI" ]; then - stat_fail - stat_busy "The program $PHPCGI isn't executable" - stat_die - fi - fi - return 0 -} #}}} -check_process(){ #{{{ -#=== FUNCTION ================================================================ -# NAME: check_process -# DESCRIPTION: Check that process is alive -# PARAMETERS: name of process and/or pidfile -# RETURNS: look at the beginning of the script -#=============================================================================== - local process - local pidfile - if [ $# -eq 2 ]; then - process=$1 - pidfile=$2 - elif [ $# -eq 1 ]; then - process=$1 - else - return $OTHERERROR - fi - - if get_pid $process >/dev/null; then - # process is running - if [ -s "$pidfile" ]; then - return $PROCRUNPIDEXIST - elif [ -r "$pidfile" ]; then - return $PROCRUNPID0 - else - return $PROCRUNPIDNO - fi - else - # process doesn't runnig - if [ -r "$pidfile" ]; then - return $PROCNOPIDEXIST - else - return $PROCNOPIDNO - fi - fi -} #}}} -get_userpid(){ #{{{ -#=== FUNCTION ================================================================ -# NAME: get_userpid -# DESCRIPTION: looking for pid of process belong to user -# PARAMETERS: name of user, name of process -# RETURNS: pid of process or 1 if error -#=============================================================================== - local user=$1 - local process=$2 - if [ -n "$user" -a -n "$process" ]; then - local pid=$(ps aux | \ - awk -vuser=$user -vprocess=$process \ - '$1 == user && $8 ~ "s" && $11 == process {print $2}') - if [[ "$pid" =~ ^[0-9]+$ ]]; then - echo $pid - else - return 1 - fi - else - return 1 - fi -} #}}} -check_daemon(){ #{{{ -#=== FUNCTION ================================================================ -# NAME: check_daemon -# DESCRIPTION: check that daemon exist in directory -# PARAMETERS: name of daemon -# RETURNS: look at the beginning of the script -#=============================================================================== - if ck_daemon $NAME; then - return $DAEMONEXIST - else - return $DAEMONEXIST - fi -} #}}} -start(){ #{{{ -#=== FUNCTION ================================================================ -# NAME: start -# DESCRIPTION: check configuration, if a process is already running and running php-cgi daemon -# PARAMETERS: - -# RETURNS: - -#=============================================================================== - stat_busy "Checking configuration" - check_config && - stat_done || \ - stat_die - - stat_busy "Starting server $NAME" #{{{ - check_process $PHPCGI $PIDFILE - local error=$? - if [ $error -ge $PROCRUNPIDEXIST -a $error -le $PROCRUNPIDNO ]; then - stat_fail - case $error in - $PROCRUNPIDEXIST) - stat_busy "The process $PHP is running" - ;; - $PROCRUNPID0) - stat_busy "The process $PHP is running and pidfile has size 0b" - ;; - $PROCRUNPIDNO) - stat_busy "The process $PHP is running and pidfile doesn't exist" - ;; - esac - stat_die $error - elif [ $error -eq $OTHERERROR ]; then - stat_fail - stat_busy "Something went wrong..." - stat_die $returnvalue - fi - - # run the main daemon - $DAEMON $OPTIONS >/dev/null - if [ $? -eq 0 ]; then - add_daemon $NAME - stat_done - else - stat_die - fi - #}}} - #{{{ start daemons for multiusers - if [ -n "$STARTMULTI" ]; then - stat_busy "Starting server $NAME for multiusers" - gen_all_uid - if [ -z "$USERSOCKET" ]; then - # Generate file map user 2 port - :>$MAPUSER2PORT - cat >> $MAPUSER2PORT <<- EOF - # Map username to port - map \$username \$port { - default $PORT; - - EOF - local userport=$PORT - local uid - for uid in ${ALLUID[@]}; do - local login=$(uid2login $uid) - if [ $? -eq 0 ]; then - userport=$((userport+1)) - echo -e "$login $userport;" >> $MAPUSER2PORT - local gid=$(id -g $login) - local group=$(gid2group $gid) - if [ -n "$USERPIDFILE" ]; then - local userpidfile=${USERPIDFILE}.${login}.pid - fi - USEROPTIONS="-a $IPADDR -p $userport -u $login ${group:+-g $group} -f $PHPCGI -C ${USER_PHP_FCGI_CHILDREN:-1} ${userpidfile:+-P $userpidfile}" - $DAEMON $USEROPTIONS &>/dev/null - if [ $? -ne 0 ]; then - stat_die - fi - fi - done - echo '}' >> $MAPUSER2PORT - stat_done - elif [ -n "$USERSOCKET" ]; then - local uid - for uid in ${ALLUID[@]}; do - local login=$(uid2login $uid) - if [ $? -eq 0 ]; then - local gid=$(id -g $login) - local group=$(gid2group $gid) - if [ -n "$USERPIDFILE" ]; then - local userpidfile=${USERPIDFILE}.${login}.pid - fi - local usersocket=${USERSOCKET}.${login}.sock - USEROPTIONS="-s ${usersocket} -u $login ${group:+-g $group} -f $PHPCGI -C ${USER_PHP_FCGI_CHILDREN:-1} ${userpidfile:+-P $userpidfile}" - $DAEMON $USEROPTIONS &>/dev/null - if [ $? -ne 0 ]; then - stat_die - fi - fi - done - stat_done - fi - fi - #}}} -} #}}} -stop(){ #{{{ -#=== FUNCTION ================================================================ -# NAME: stop -# DESCRIPTION: check whether a process is running, stop the daemon php-cgi -# PARAMETERS: - -# RETURNS: - -#=============================================================================== - stat_busy "Stopping server $NAME" #{{{ - # for main daemon - if ! get_pid $PHPCGI &>/dev/null; then - stat_fail - stat_busy "None process $PHPCGI isn't running" - stat_die - else - #process php-cgi is running - if [ -s "$PIDFILE" ]; then - # pidfile exists - kill $(<$PIDFILE) - if [ $? -eq 0 ]; then - rm -f $PIDFILE - rm_daemon $NAME - stat_done - else - stat_die - fi - else #pidfile doesn't exist - if [ -r "$PIDFILE" ]; then - #pidfile exists and has size 0b - stat_busy "Pidfile $PIDFILE exists and has size 0b.Removing it" - rm -f "$PIDFILE" && \ - stat_done || \ - stat_fail - fi - killall -9 $PHPCGI - if [ $? -eq 0 ]; then - stat_done - rm_daemon $NAME - else - stat_die - fi - fi - fi - #}}} - #{{{ for multiusers - if [ -n "$STARTMULTI" ]; then - # waiting to kill the main daemon - sleep 1 - if get_pid $PHPCGI &>/dev/null; then - stat_busy "Stopping server $NAME for multiusers" - killall $PHPCGI - # cleaning pidfiles - if [ -n "$USERPIDFILE" ]; then - gen_all_uid - for UserID in ${ALLUID[@]}; do - local login=$(uid2login $UserID) - if [ $? -eq 0 ]; then - rm -f ${USERPIDFILE}.${login}.pid - fi - done - fi #$USERPIDFILE - stat_done - fi - fi - #}}} -} #}}} -restart(){ #{{{ -#=== FUNCTION ================================================================ -# NAME: restart -# DESCRIPTION: stop and start service -# PARAMETERS: - -# RETURNS: - -#=============================================================================== - stat_busy "Restarting server $NAME" - stop - sleep 1 - start -} #}}} -status(){ #{{{ -#=== FUNCTION ================================================================ -# NAME: status -# DESCRIPTION: check status of service -# PARAMETERS: - -# RETURNS: - -#=============================================================================== - if ! get_pid $PHPCGI>/dev/null; then - stat_busy "None process $PHPCGI isn't running" - stat_done - else - stat_busy "Process $PHPCGI is running" - stat_done - if [ -s "$PIDFILE" ]; then - stat_busy "It's spawned by process: $(cat $PIDFILE|tr '\n' ' ')"; - stat_done - elif [ -r "$PIDFILE" ]; then - stat_fail - stat_busy "Pidfile $PIDFILE exists but has size 0b" - else - stat_busy "Pidfile $PIDFILE doesn't exist" - stat_done - fi - if [ -n "$STARTMULTI" -a -n "$USERSSTATUS" ]; then - gen_all_uid - local uid - for uid in ${ALLUID[@]}; do - local login=$(uid2login $uid) - if [ $? -eq 0 ]; then - if [ -n "$USERPIDFILE" ]; then - # USERPIDFILE defined - local userpidfile=${USERPIDFILE}.${login}.pid - if [ -s "$userpidfile" ]; then - stat_busy "Process $PHPCGI of user $login is spawned by process: $(cat $userpidfile|tr '\n' ' ')"; - stat_done - fi - else - local pid=$(get_userpid $login $PHPCGI) - if [ $? -eq 0 ]; then - stat_busy "Process $PHPCGI for user $login is running and it's spawned by: $pid"; - stat_done - fi - fi - fi - done - fi - fi -} #}}} -uid2login(){ #{{{ -#=== FUNCTION ================================================================ -# NAME: uid2login -# DESCRIPTION: convert uid to username -# PARAMETERS: uid -# RETURNS: name of user for uid -#=============================================================================== - local uid=$1 - if [ ! $uid -gt 0 ]; then - return 1 - fi - local username=$(getent passwd | awk -vuid=$uid -F: '$3 == uid {print $1}') - if [ -z "$username" ]; then - return 1 - else - echo $username - fi -} #}}} -gid2group(){ #{{{ - #=== FUNCTION ================================================================ - # NAME: uid2group - # DESCRIPTION: convert gid to name of group - # PARAMETERS: gid - # RETURNS: name of group for gid - #=============================================================================== - local gid=$1 - if [ ! $gid -gt 0 ]; then - return 1 - fi - local groupname=$(getent group | awk -vgid=$1 -F: '$3 == gid {print $1}') - if [ -z "$groupname" ]; then - return 1 - else - echo $groupname - fi -} #}}} -gen_all_uid(){ #{{{ -#=== FUNCTION ================================================================ -# NAME: gen_all_uid -# DESCRIPTION: Generate array of all UID -# PARAMETERS: - -# RETURNS: - -#=============================================================================== - ALLUID=() - if [ -n "$RANGEUID" -a ${#RANGEUID[@]} -gt 0 ]; then - for line in ${RANGEUID[@]/,/ }; do - (( line )) || stat_die # not a number - if [[ ${line/-/} != $line ]]; then - for ((i=${line%-*}; i<=${line#*-}; i++)); do - ALLUID+=($i) - done - else - ALLUID+=($line) - fi - done - elif [ $FIRSTUID -gt 1 -a $LASTUID -gt 1 -a $LASTUID -ge $FIRSTUID ]; then - for ((line=FIRSTUID; line<=LASTUID; line++)); do - (( line )) || stat_die #not a number - ALLUID+=($line) - done - else - echo "Error: Wrong range UID. Change RANGEUID or FIRSTUID and LASTUID" - exit 1 - fi -} #}}} -case $1 in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - status) - status - ;; - *) - echo "Usage: $0 start|stop|restart|status" -esac diff --git a/~fauno/spawn-fcgi-php/spawn-fcgi-php.conf b/~fauno/spawn-fcgi-php/spawn-fcgi-php.conf deleted file mode 100644 index d87520c1d..000000000 --- a/~fauno/spawn-fcgi-php/spawn-fcgi-php.conf +++ /dev/null @@ -1,60 +0,0 @@ -# vi: ft=sh -# run PHPCGI as -USER=http -GROUP=http - -# Name of daemon -DAEMON="/usr/bin/spawn-fcgi" -PIDFILE="/var/run/spawn-fcgi-php.pid" -# spawn the process -PHPCGI="/usr/bin/php-cgi" - -#------------------------------------------------------------------------------- -# Options for php-cgi -#------------------------------------------------------------------------------- -# (PHP only) Number of children to spawn -PHP_FCGI_CHILDREN=4 -# or export PHP_FCGI_CHILDREN -# PHP FastCGI proccess exit after requests: -export PHP_FCGI_MAX_REQUESTS=1000 -# Choose ONE of PORT/IPADDR (for TCP) OR SOCKET (for unix domain sockets) -IPADDR=127.0.0.1 -PORT=9000 -#SOCKET=/var/run/spawn-fcgi/spawn-fcgi.sock -# Options only for socket -#MODE=0644 -#SOCKET_USER=other -#SOCKET_GROUP=other - -#------------------------------------------------------------------------------- -# Options for spawn-fcgi -#------------------------------------------------------------------------------- -# Number of children to fork, defaults to 1. -SPAWN_FCGI_CHILDREN=1 - - -#------------------------------------------------------------------------------- -# For many users -#------------------------------------------------------------------------------- -# Run separate processes for users with UIDs from the range RANGEUID -# uncomment STARTMULTI if you want this -STARTMULTI=yes -# Base user's socket, uncomment to use socket instead IPADDR:USERPORT -USERSOCKET='/var/run/spawn-fcgi/spawn-fcgi' -# file with mapping user to port -MAPUSER2PORT='/etc/nginx/conf/map_user2port.conf' -# Base user's pidfile -#USERPIDFILE='/var/run/spawn-fcgi-php' -# range for UIDs, use the dash for range and split groups by spaces e.g. 1000-1003 1005 1010-1020, use parenthis for all -RANGEUID=(1000-1001) -# (PHP only) Number of children to spawn -USER_PHP_FCGI_CHILDREN=1 -# for status, comment if you don't want print status for users -#USERSSTATUS=yes - -OPTIONS="-u $USER -g $GROUP -f $PHPCGI -C ${PHP_FCGI_CHILDREN:-4} ${PIDFILE:+-P $PIDFILE} -F ${SPAWN_FCGI_CHILDREN:-1} " -if [ -n "$SOCKET" ]; then - OPTIONS+="-s $SOCKET ${MODE:+-M $MODE} ${SOCKET_USER:+-U $SOCKET_USER} ${SOCKET_GROUP:+-G $SOCKET_GROUP} " -else - OPTIONS+="-a $IPADDR -p $PORT " -fi diff --git a/~fauno/sphinx/PKGBUILD b/~fauno/sphinx/PKGBUILD deleted file mode 100644 index fa5a7935e..000000000 --- a/~fauno/sphinx/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: dryes <joswiseman@gmail> -# Contributor: Dan Serban -# Contributor: Vishnevsky Roman <aka dot x0x01 at gmail dot com> -# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> -pkgname='sphinx' -pkgver=2.0.5 -pkgrel=2 -pkgdesc='Free open-source SQL full-text search engine.' -arch=('i686' 'x86_64') -url='http://www.sphinxsearch.com/' -license=('GPL') -depends=('unixodbc' 'expat' 'libmysqlclient' 'postgresql-libs') -optdepends=('postgresql') -backup=('etc/conf.d/sphinx') -source=("http://sphinxsearch.com/files/${pkgname}-${pkgver}-release.tar.gz" 'sphinx.conf.d' 'sphinx.rc.d') - -build() { - sed -i '15199,15199 s/x00/x21/' "${srcdir}/${pkgname}-${pkgver}-release/src/searchd.cpp" - - cd "${srcdir}/${pkgname}-${pkgver}-release" - ./configure --prefix=/usr --exec-prefix=/usr --localstatedir=/var/lib/sphinx \ - --sysconfdir=/etc/sphinx --with-pgsql --enable-id64 - - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}-release" - - make DESTDIR="${pkgdir}" install - - for _f in "${pkgdir}/usr/bin/"*; do - ln -s "/usr/bin/${_f##*/}" "${pkgdir}/usr/bin/sphinx-${_f##*/}" - done - - install -Dm755 "${srcdir}/sphinx.rc.d" "${pkgdir}/etc/rc.d/sphinx" - install -Dm644 "${srcdir}/sphinx.conf.d" "${pkgdir}/etc/conf.d/sphinx" -} - -md5sums=('e71fdb5b0c2911247d48fb30550b9584' - '48e3e1857919d26d5104a48caffb531b' - 'd886222593c6bba891fd3ce982c90c00') diff --git a/~fauno/sphinx/sphinx.conf.d b/~fauno/sphinx/sphinx.conf.d deleted file mode 100644 index c809e56fa..000000000 --- a/~fauno/sphinx/sphinx.conf.d +++ /dev/null @@ -1,5 +0,0 @@ -# -# Arguments to be passed to the sphinx daemon -# - -SPHINX_ARGS="" diff --git a/~fauno/sphinx/sphinx.rc.d b/~fauno/sphinx/sphinx.rc.d deleted file mode 100644 index 64c8f01e7..000000000 --- a/~fauno/sphinx/sphinx.rc.d +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/sphinx - -PID=$(pidof -o %PPID /usr/bin/sphinx-searchd) -case $1 in -start) - stat_busy "Starting Sphinx Daemon" - - if [[ -z $PID ]] && /usr/bin/sphinx-searchd $SPHINX_ARGS; then - - PID=$(pidof -o %PPID /usr/bin/sphinx-searchd) - echo "$PID" > /var/run/sphinx-searchd.pid - add_daemon sphinx - stat_done - else - stat_fail - exit 1 - fi - ;; - -stop) - stat_busy "Stopping Sphinx Daemon" - if [[ ! -z $PID ]] && kill "$PID" &>/dev/null; then - rm_daemon sphinx - stat_done - else - stat_fail - exit 1 - fi - ;; - -restart) - $0 stop - $0 start - ;; - -*) - echo "Usage: $0 {start|stop|restart}" >&2 - exit 1 - -esac diff --git a/~fauno/vala-notmuch/PKGBUILD b/~fauno/vala-notmuch/PKGBUILD deleted file mode 100644 index 0e97683a4..000000000 --- a/~fauno/vala-notmuch/PKGBUILD +++ /dev/null @@ -1,31 +0,0 @@ -# Maintainer: Mark Foxwell fastfret79@archlinux.org.uk - -pkgname=vala-notmuch -pkgver=20120112 -pkgrel=1 -pkgdesc="a notmuch address book in vala" -url="https://github.com/spaetz/vala-notmuch" -arch=('i686' 'x86_64' 'mips64el') -license=('GPL2') -makedepends=('vala') -depends=('notmuch') -install=vala-notmuch.install -source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz") - -build() { - cd "${srcdir}/${pkgname}-${pkgver}/src" - - ./make - -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -D -m755 src/addrlookup ${pkgdir}/usr/bin/addrlookup - -} - -# vim:set ts=2 sw=2 et: -md5sums=('99e264c0cb36e0a0f18048fb2ebd07e0') -md5sums=('ca73980225368309119cf17ff5b3f3c4') diff --git a/~fauno/vala-notmuch/SRCBUILD b/~fauno/vala-notmuch/SRCBUILD deleted file mode 100644 index 89b6c67ba..000000000 --- a/~fauno/vala-notmuch/SRCBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Maintainer: Mark Foxwell fastfret79@archlinux.org.uk - -pkgname=vala-notmuch -pkgver=20120112 -pkgrel=1 -pkgdesc="A notmuch address book in vala" -url="https://github.com/spaetz/vala-notmuch" -arch=('any') -license=('GPL2') -makedepends=('git') - -_gitroot="https://github.com/spaetz/vala-notmuch.git" -_gitname="${pkgname}" - -build() { - cd "$srcdir" - msg 'Connecting to GIT server...' - - if [ -d $_gitname ] ; then - cd $_gitname; git pull origin - msg 'The local files are updated.' - else - git clone $_gitroot $_gitname - fi - - msg "GIT checkout done or server timeout" - -} - -package() { - cd ${pkgdir} - export PKGDEST=${SRCDEST} - export PKGEXT=.src.tar.xz - - git clone ${srcdir}/${pkgname} ${pkgname}-${pkgver} - -} - -# vim:set ts=2 sw=2 et: diff --git a/~fauno/vala-notmuch/vala-notmuch.install b/~fauno/vala-notmuch/vala-notmuch.install deleted file mode 100644 index d1ce89da6..000000000 --- a/~fauno/vala-notmuch/vala-notmuch.install +++ /dev/null @@ -1,6 +0,0 @@ -post_install() { -echo "To use within emacs, add the following to your .emacs:" -echo "(require 'notmuch-address)" -echo "(setq notmuch-address-command "/usr/bin/addrlookup")" -echo "(notmuch-address-message-insinuate)" -} |