diff options
Diffstat (limited to 'community')
29 files changed, 167 insertions, 674 deletions
diff --git a/community/aria2/PKGBUILD b/community/aria2/PKGBUILD index cce37eba5..7ab4fafb8 100644 --- a/community/aria2/PKGBUILD +++ b/community/aria2/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 103391 2014-01-05 15:54:47Z bpiotrowski $ -# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> +# $Id: PKGBUILD 108149 2014-03-24 05:54:46Z fyan $ +# Contributor: Bartłomiej Piotrowski <bpiotrowski@archlinux.org> # Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: Angel Velasquez <angvp@archlinux.org> # Contributor: Alexander Fehr <pizzapunk gmail com> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=aria2 -pkgver=1.18.3 +pkgver=1.18.4 pkgrel=1 pkgdesc='Download utility that supports HTTP(S), FTP, BitTorrent, and Metalink' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ license=('GPL') depends=('gnutls' 'libxml2' 'sqlite' 'c-ares' 'ca-certificates') checkdepends=('cppunit') source=(http://downloads.sourceforge.net/aria2/aria2-$pkgver.tar.xz) -sha256sums=('014706c67406be380384484635ca2e811b405c876f0bbcf7a31be79df392d84d') +sha256sums=('bc6b9d1eb215bba1948ebb7725301658f7125c7345d2a25f971cb8e11204c88d') build() { cd $pkgname-$pkgver diff --git a/community/caja/PKGBUILD b/community/caja/PKGBUILD index 92f91368c..6219b7a55 100644 --- a/community/caja/PKGBUILD +++ b/community/caja/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 106644 2014-03-06 11:38:04Z flexiondotorg $ +# $Id: PKGBUILD 108196 2014-03-24 15:12:46Z flexiondotorg $ # Maintainer : Martin Wimpress <code@flexion.org> pkgname=caja pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="The MATE shell and file manager" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -16,12 +16,18 @@ optdepends=('gstreamer0.10-good-plugins: automatic media playback when mouseover replaces=('mate-file-manager') provides=('mate-file-manager') conflicts=('mate-file-manager') -options=('!emptydirs') groups=('mate') -source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz") -sha1sums=('3bfb52dceae4fa7b39eb26099b07326fa4197f3f') +source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz" + "https://github.com/mate-desktop/caja/commit/4f1e756e08e61840eb9a52de4debee30006ea31e.diff") +sha1sums=('3bfb52dceae4fa7b39eb26099b07326fa4197f3f' + 'a8ae80fb181c999deeea5d597d7a8f7a174e62c6') install=${pkgname}.install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/4f1e756e08e61840eb9a52de4debee30006ea31e.diff" +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ diff --git a/community/chrony/PKGBUILD b/community/chrony/PKGBUILD index 926638dc2..4c7caea95 100644 --- a/community/chrony/PKGBUILD +++ b/community/chrony/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 105122 2014-01-31 23:52:20Z thestinger $ +# $Id: PKGBUILD 108210 2014-03-24 21:36:00Z thestinger $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Daniel Micay <danielmicay@gmail.com> # Contributor: Bartłomiej Piotrowski <nospam@bpiotrowski.pl> @@ -9,7 +9,7 @@ pkgname=chrony pkgver=1.29.1 -pkgrel=1 +pkgrel=2 pkgdesc='Lightweight NTP client and server' arch=('i686' 'x86_64') url="http://chrony.tuxfamily.org/" @@ -19,8 +19,9 @@ depends=('readline' 'libcap') backup=('etc/chrony.conf') source=(http://download.tuxfamily.org/chrony/${pkgname}-${pkgver}.tar.gz service) +install=${pkgname}.install sha256sums=('658c9bb4d8c8d8ec7d0908429aa266e5f8413ba86bd4acbfd2f9669f6065af27' - 'bef4305fa7e5828e1a1fd43aa8e631f22f21902f6cdc2d3b5b41a57bd9a175dc') + '3c9d05aaba6c0bef43fd1923a6dd7ac5f9b9539d21efbd1fbe592b54dec8d493') build() { cd $pkgname-$pkgver @@ -45,4 +46,6 @@ package() { install -dm755 "$pkgdir/usr/lib/systemd/ntp-units.d" echo "$pkgname.service" > "$pkgdir/usr/lib/systemd/ntp-units.d/$pkgname.list" + + chown 183:183 "$pkgdir/var/lib/chrony" } diff --git a/community/chrony/chrony.install b/community/chrony/chrony.install new file mode 100644 index 000000000..2badf6471 --- /dev/null +++ b/community/chrony/chrony.install @@ -0,0 +1,18 @@ +post_install() { + getent group chrony &>/dev/null || groupadd -g 183 chrony >/dev/null + getent passwd chrony &>/dev/null || useradd -u 183 -g chrony -d /var/lib/chrony -c 'Network Time Protocol' -s /bin/false chrony >/dev/null + true +} + +post_upgrade() { + if [[ $(vercmp $2 1.29.1-2) -le 0 ]]; then + post_install + chown -R 183:183 /var/lib/chrony + fi +} + +post_remove() { + getent passwd chrony &>/dev/null && userdel chrony >/dev/null + getent group chrony &>/dev/null && groupdel chrony >/dev/null + true +} diff --git a/community/chrony/service b/community/chrony/service index 3a012ffac..8080dd7c2 100644 --- a/community/chrony/service +++ b/community/chrony/service @@ -4,7 +4,7 @@ After=network.target [Service] Type=forking -ExecStart=/usr/bin/chronyd +ExecStart=/usr/bin/chronyd -u chrony PIDFile=/var/run/chronyd.pid [Install] diff --git a/community/dante/PKGBUILD b/community/dante/PKGBUILD index 3a6bc1db9..7ce4c8385 100644 --- a/community/dante/PKGBUILD +++ b/community/dante/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 101630 2013-11-29 15:58:15Z spupykin $ +# $Id: PKGBUILD 108159 2014-03-24 07:55:17Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Guillem Rieu <guillemr@gmx.net> pkgname=dante pkgver=1.4.0 -pkgrel=1 +pkgrel=2 pkgdesc="SOCKS v4 and v5 compatible proxy server and client" url="http://www.inet.no/dante" arch=(i686 x86_64) @@ -13,9 +13,11 @@ depends=('pam' 'krb5') backup=('etc/socks.conf' 'etc/sockd.conf') source=(ftp://ftp.inet.no/pub/socks/${pkgname}-${pkgver}.tar.gz + sockd.tmpfiles.d sockd.service) md5sums=('c117a3ce25afb936f13b76f1d2524879' - '9bb18a0165764092bd01da0ff6303fbf') + '8588bb1cf6e9cde0f542a96edc0a0f17' + '1cdfc0c1cd932cfe0fe3c0319e2be3f0') build() { cd ${srcdir}/${pkgname}-${pkgver} @@ -28,9 +30,9 @@ build() { package() { cd ${srcdir}/${pkgname}-${pkgver} make DESTDIR=${pkgdir} install - mkdir -p ${pkgdir}/etc/conf.d + install -dm0755 ${pkgdir}/etc cp example/{socks,sockd}.conf ${pkgdir}/etc install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE - echo 'SOCKD_OPTS="-D"' >${pkgdir}/etc/conf.d/sockd.conf install -Dm0644 $srcdir/sockd.service $pkgdir/usr/lib/systemd/system/sockd.service + install -Dm0644 $srcdir/sockd.tmpfiles.d $pkgdir/usr/lib/tmpfiles.d/sockd.conf } diff --git a/community/dante/sockd.service b/community/dante/sockd.service index 68201577a..54293e047 100644 --- a/community/dante/sockd.service +++ b/community/dante/sockd.service @@ -5,8 +5,8 @@ After=network.target [Service] Type=forking EnvironmentFile=/etc/conf.d/sockd.conf -PIDFile=/run/sockd.pid -ExecStart=/usr/bin/sockd $SOCKD_OPTS +PIDFile=/run/dante/sockd.pid +ExecStart=/usr/bin/sockd -D -p/run/dante/sockd.pid [Install] WantedBy=multi-user.target diff --git a/community/dante/sockd.tmpfiles.d b/community/dante/sockd.tmpfiles.d new file mode 100644 index 000000000..592ec6389 --- /dev/null +++ b/community/dante/sockd.tmpfiles.d @@ -0,0 +1 @@ +d /run/dante 0755 root root - diff --git a/community/go/PKGBUILD b/community/go/PKGBUILD index 3307eb9c3..10b8c9e32 100644 --- a/community/go/PKGBUILD +++ b/community/go/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 108061 2014-03-22 01:23:54Z arodseth $ +# $Id: PKGBUILD 108208 2014-03-24 20:35:53Z arodseth $ # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Rémy Oudompheng <remy@archlinux.org> @@ -12,7 +12,7 @@ pkgname=go epoch=2 pkgver=1.2.1 -pkgrel=2 +pkgrel=3 pkgdesc='Compiler and tools for the Go programming language from Google' arch=('x86_64' 'i686') url='http://golang.org/' @@ -21,8 +21,10 @@ depends=('perl' 'gawk') makedepends=('inetutils' 'mercurial') options=('!strip' 'staticlibs') optdepends=('liteide: IDE for editing and building projects written in Go' - 'mercurial: VCS written in Python' - 'git: VCS written in C') + 'mercurial: scalable distributed SCM tool' + 'git: fast distributed version control system' + 'bzr: decentralized revision control system' + 'svn: concurrent version control system') install="$pkgname.install" source=("$pkgname-$pkgver::hg+https://code.google.com/p/$pkgname#branch=release-branch.$pkgname${pkgver/.1}") md5sums=('SKIP') diff --git a/community/gst-python/PKGBUILD b/community/gst-python/PKGBUILD index 8fc61d58d..b7be8a93c 100644 --- a/community/gst-python/PKGBUILD +++ b/community/gst-python/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 99790 2013-10-30 23:44:03Z allan $ +# $Id: PKGBUILD 108151 2014-03-24 07:45:38Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=gst-python -pkgver=1.1.90 -pkgrel=2 +pkgver=1.2.0 +pkgrel=1 pkgdesc="Python bindings for GStreamer" arch=('i686' 'x86_64') license=('LGPL') url="http://gstreamer.freedesktop.org/" depends=('python2-gobject' 'gst-plugins-base') -makedepends=('pkgconfig') +makedepends=('pkg-config') source=(http://gstreamer.freedesktop.org/src/gst-python/gst-python-${pkgver}.tar.bz2) -md5sums=('16d85442b98fab61bab66a53eb571d6a') +md5sums=('da9a33cccdb7d094f243e4b469cfbc76') build() { cd "${srcdir}/gst-python-${pkgver}" diff --git a/community/gxmessage/PKGBUILD b/community/gxmessage/PKGBUILD index c11e4e8fd..e6cdd9f09 100644 --- a/community/gxmessage/PKGBUILD +++ b/community/gxmessage/PKGBUILD @@ -1,21 +1,21 @@ -# $Id: PKGBUILD 93662 2013-07-08 11:18:13Z spupykin $ +# $Id: PKGBUILD 108153 2014-03-24 07:45:55Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr> # Contributor: Jaroslav Lichtblau <tu@dragonlord.cz> pkgname=gxmessage -pkgver=2.20.0 +pkgver=3.4.0 pkgrel=1 -pkgdesc="A GTK2 based xmessage clone." +pkgdesc="A GTK3 based xmessage clone." arch=('i686' 'x86_64') url="http://homepages.ihug.co.nz/~trmusson/programs.html#gxmessage" license=('GPL') -depends=('gtk2' 'desktop-file-utils') +depends=('gtk3' 'desktop-file-utils') makedepends=('pkgconfig' 'intltool') install=$pkgname.install source=(http://homepages.ihug.co.nz/~trmusson/stuff/$pkgname-$pkgver.tar.gz $pkgname.desktop) -md5sums=('f4160442548bdd90895b008b85df0f6e' +md5sums=('f1bc61bbaee0c7c0067f65b9b765be08' 'af92506581c1aae70e3845a66a983f22') build() { diff --git a/community/haskell-cairo/PKGBUILD b/community/haskell-cairo/PKGBUILD index 7fb276bb9..99e9e555b 100644 --- a/community/haskell-cairo/PKGBUILD +++ b/community/haskell-cairo/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 102055 2013-12-04 14:19:06Z spupykin $ +# $Id: PKGBUILD 108163 2014-03-24 08:19:59Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-cairo -pkgver=0.12.5.0 +pkgver=0.12.5.3 pkgrel=1 pkgdesc="Binding to the cairo library for Gtk2Hs." url="http://hackage.haskell.org/package/cairo" @@ -17,7 +17,7 @@ provides=('gtk2hs-cairo') replaces=('gtk2hs-cairo') install=gtk2hs-cairo.install source=(http://hackage.haskell.org/packages/archive/cairo/$pkgver/cairo-$pkgver.tar.gz) -md5sums=('234b2a5f1e30844838aeb8adb28f0bf3') +md5sums=('bdc6368237da089034d59fea24ca2c5b') build() { cd ${srcdir}/cairo-$pkgver diff --git a/community/haskell-glib/PKGBUILD b/community/haskell-glib/PKGBUILD index 71fb08a97..4790a8ede 100644 --- a/community/haskell-glib/PKGBUILD +++ b/community/haskell-glib/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 102057 2013-12-04 14:19:25Z spupykin $ +# $Id: PKGBUILD 108165 2014-03-24 08:20:18Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-glib -pkgver=0.12.5.0 +pkgver=0.12.5.3 pkgrel=1 pkgdesc="Binding to the GLIB library for Gtk2Hs." url="http://hackage.haskell.org/package/glib" @@ -17,7 +17,7 @@ provides=('gtk2hs-glib') replaces=('gtk2hs-glib') conflicts=('gtk2hs-glib') source=(http://hackage.haskell.org/packages/archive/glib/$pkgver/glib-$pkgver.tar.gz) -md5sums=('fa94e2f40641dd2fa0d01a0da3fd7b50') +md5sums=('fa062e23f75072dbc52abbb862c4ca8f') build() { cd glib-$pkgver diff --git a/community/haskell-gtk/PKGBUILD b/community/haskell-gtk/PKGBUILD index af497ad9a..746405a1c 100644 --- a/community/haskell-gtk/PKGBUILD +++ b/community/haskell-gtk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 102059 2013-12-04 14:19:51Z spupykin $ +# $Id: PKGBUILD 108175 2014-03-24 09:05:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-gtk -pkgver=0.12.5.0 +pkgver=0.12.5.6 pkgrel=1 pkgdesc="Binding to the gtk library for Gtk2Hs." url="http://hackage.haskell.org/package/gtk" @@ -15,18 +15,14 @@ replaces=('gtk2hs-gtk') conflicts=('gtk2hs-gtk') options=('strip' 'staticlibs') install=gtk2hs-gtk.install -source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz - ghc-7.6.1.patch) -md5sums=('d34d2da37f3e4e15dbc0b6a6aef0cd8f' - '5fb93f37fe3f494b30ee682a36b8f1b6') +source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz) +md5sums=('aa102599967851e6efeeb7338961557f') build() { cd ${srcdir}/gtk-${pkgver} -# patch -p1 <$srcdir/ghc-7.6.1.patch runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ --libsubdir=\$compiler/site-local/\$pkgid - sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/UI/Gtk/Types.chs runhaskell Setup build runhaskell Setup haddock runhaskell Setup register --gen-script diff --git a/community/haskell-gtk/ghc-7.6.1.patch b/community/haskell-gtk/ghc-7.6.1.patch deleted file mode 100644 index 5e259a38f..000000000 --- a/community/haskell-gtk/ghc-7.6.1.patch +++ /dev/null @@ -1,574 +0,0 @@ -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs gtk/Graphics/UI/Gtk/Abstract/Object.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Abstract/Object.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -126,7 +126,8 @@ - - {#pointer GWeakNotify#} - --foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify -+foreign import ccall "wrapper" mkDestructor -+ :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify - - -- | Attach a callback that will be called after the - -- destroy hooks have been called -@@ -134,7 +135,7 @@ - objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify - objectWeakref obj uFun = do - funPtrContainer <- newIORef nullFunPtr -- uFunPtr <- mkDestructor $ do -+ uFunPtr <- mkDestructor $ \_ _ -> do - uFun - funPtr <- readIORef funPtrContainer - freeHaskellFunPtr funPtr -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs gtk/Graphics/UI/Gtk/Entry/Entry.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Entry/Entry.chs 2012-10-02 16:27:26.000000000 +0400 -@@ -78,6 +78,10 @@ - entrySetCompletion, - entryGetCompletion, - #endif -+#if GTK_CHECK_VERSION (2,18,0) -+ entryGetBuffer, -+ entrySetBuffer, -+#endif - #if GTK_CHECK_VERSION(2,20,0) - entryGetIconWindow, - entryGetTextWindow, -@@ -104,6 +108,9 @@ - entryAlignment, - entryCompletion, - #endif -+#if GTK_CHECK_VERSION (2,18,0) -+ entryBuffer, -+#endif - - -- * Signals - entryActivate, -@@ -157,6 +164,9 @@ - import Graphics.UI.Gtk.Gdk.EventM (EventM, EButton, EKey) - import Control.Monad.Reader ( ask ) - import Control.Monad.Trans ( liftIO ) -+#if GTK_CHECK_VERSION (2,18,0) -+import Graphics.UI.Gtk.Entry.EntryBuffer -+#endif - {#import Graphics.UI.Gtk.Types#} - {#import Graphics.UI.Gtk.Signals#} - -@@ -429,6 +439,23 @@ - (toEntry self) - #endif - -+#if GTK_CHECK_VERSION(2,18,0) -+-- | Get the 'EntryBuffer' object which holds the text for this widget. -+entryGetBuffer :: EntryClass self => self -+ -> IO EntryBuffer -+entryGetBuffer self = -+ makeNewGObject mkEntryBuffer $ -+ {# call gtk_entry_get_buffer #} -+ (toEntry self) -+ -+-- | Set the 'EntryBuffer' object which holds the text for this widget. -+entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self -+ -> buffer -> IO () -+entrySetBuffer self = -+ {# call gtk_entry_set_buffer #} -+ (toEntry self) . toEntryBuffer -+#endif -+ - #if GTK_CHECK_VERSION(2,20,0) - -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when - -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to -@@ -623,6 +650,15 @@ - entrySetCompletion - #endif - -+#if GTK_CHECK_VERSION(2,18,0) -+entryBuffer :: (EntryClass self, EntryBufferClass buffer) => -+ ReadWriteAttr self EntryBuffer buffer -+entryBuffer = newAttr -+ entryGetBuffer -+ entrySetBuffer -+#endif -+ -+ - -------------------- - -- Signals - -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc gtk/Graphics/UI/Gtk/Gdk/EventM.hsc ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-10-02 16:27:27.000000000 +0400 -@@ -639,14 +639,16 @@ - - - -- | Execute an event handler and assume it handled the event unless it ---- threw a pattern match exception. -+-- threw a pattern match exception or calls mzero (e.g. via guard). - tryEvent :: EventM any () -> EventM any Bool - tryEvent act = do - ptr <- ask - liftIO $ (runReaderT (act >> return True) ptr) - #if __GLASGOW_HASKELL__ >= 610 - `catches` [ Handler (\ (PatternMatchFail _) -> return False) -- , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e -+ , Handler (\ e -> if isUserError e && -+ ("Pattern" `isPrefixOf` ioeGetErrorString e || -+ "mzero" == ioeGetErrorString e) - then return False - else throw e) ] - #else -@@ -654,6 +656,8 @@ - IOException e - | "user error (Pattern" `isPrefixOf` show e -> - return False -+ | "user error (mzero" `isPrefixOf` show e -> -+ return False - PatternMatchFail _ -> return False - _ -> throw e) - #endif -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-10-02 16:27:28.000000000 +0400 -@@ -69,6 +69,7 @@ - - -- * Constructors - pixbufNew, -+ pixbufNewFromData, - pixbufNewFromFile, - #if GTK_CHECK_VERSION(2,4,0) - pixbufNewFromFileAtSize, -@@ -402,6 +403,19 @@ - (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width) - (fromIntegral height) - -+pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf -+pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride -+ = wrapNewGObject mkPixbuf $ -+ {#call pixbuf_new_from_data #} -+ imData -+ (fromIntegral . fromEnum $ cSpace) -+ (fromBool hasAlpha) -+ (fromIntegral bitsPerSample) -+ (fromIntegral width) -+ (fromIntegral height) -+ (fromIntegral rowStride) -+ nullFunPtr nullPtr -+ - -- | Create a new image from a String. - -- - -- * Creates a new pixbuf from a string description. -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs gtk/Graphics/UI/Gtk/General/Clipboard.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/General/Clipboard.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -260,7 +260,7 @@ - -- data succeeded. - clipboardSetWithData self targets getFunc clearFunc = do - gFunPtr <- mkClipboardGetFunc -- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) -+ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) - cFunPtr <- mkClipboardClearFunc - (\_ _ -> clearFunc) - res <- withTargetEntries targets $ \nTargets targets -> -@@ -282,7 +282,7 @@ - {#pointer ClipboardClearFunc#} - - foreign import ccall "wrapper" mkClipboardGetFunc :: -- (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc -+ (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc - - foreign import ccall "wrapper" mkClipboardClearFunc :: - (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc -@@ -313,7 +313,7 @@ - -- ignored. - clipboardSetWithOwner self targets getFunc clearFunc owner = do - gFunPtr <- mkClipboardGetFunc -- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) -+ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) - cFunPtr <- mkClipboardClearFunc - (\_ _ -> clearFunc) - res <- withTargetEntries targets $ \nTargets targets -> -@@ -404,7 +404,7 @@ - clipboardRequestContents self (Atom target) callback = do - cbRef <- newIORef nullFunPtr - cbPtr <- mkClipboardReceivedFunc -- (\_ sPtr -> do -+ (\_ sPtr _ -> do - freeHaskellFunPtr =<< readIORef cbRef - runReaderT callback sPtr - return ()) -@@ -418,7 +418,7 @@ - {#pointer ClipboardReceivedFunc#} - - foreign import ccall "wrapper" mkClipboardReceivedFunc :: -- (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc -+ (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc - - -- %hash c:7bb1 d:4ef1 - -- | Requests the contents of the clipboard as text. When the text is later -@@ -439,7 +439,7 @@ - clipboardRequestText self callback = do - cbRef <- newIORef nullFunPtr - cbPtr <- mkClipboardTextReceivedFunc -- (\_ sPtr -> do -+ (\_ sPtr _ -> do - freeHaskellFunPtr =<< readIORef cbRef - mStr <- if sPtr==nullPtr then return Nothing else - liftM Just $ peekUTFString sPtr -@@ -453,7 +453,7 @@ - {#pointer ClipboardTextReceivedFunc#} - - foreign import ccall "wrapper" mkClipboardTextReceivedFunc :: -- (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc -+ (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc - - - #if GTK_CHECK_VERSION(2,6,0) -@@ -477,7 +477,7 @@ - clipboardRequestImage self callback = do - cbRef <- newIORef nullFunPtr - cbPtr <- mkClipboardImageReceivedFunc -- (\_ sPtr -> do -+ (\_ sPtr _ -> do - freeHaskellFunPtr =<< readIORef cbRef - mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr) - callback mPixbuf) -@@ -490,7 +490,7 @@ - {#pointer ClipboardImageReceivedFunc#} - - foreign import ccall "wrapper" mkClipboardImageReceivedFunc :: -- (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc -+ (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc - - #endif - -@@ -513,7 +513,7 @@ - clipboardRequestTargets self callback = do - cbRef <- newIORef nullFunPtr - cbPtr <- mkClipboardTargetsReceivedFunc -- (\_ tPtr len -> do -+ (\_ tPtr len _ -> do - -- We must free Haskell pointer *in* the callback to avoid segfault. - freeHaskellFunPtr =<< readIORef cbRef - mTargets <- if tPtr==nullPtr then return Nothing else -@@ -528,7 +528,7 @@ - {#pointer ClipboardTargetsReceivedFunc#} - - foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc :: -- (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc -+ (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc - - #if GTK_CHECK_VERSION(2,10,0) - -- %hash c:5601 d:d6a6 -@@ -552,10 +552,10 @@ - clipboardRequestRichText self buffer callback = do - cbRef <- newIORef nullFunPtr - cbPtr <- mkClipboardRichTextReceivedFunc -- (\_ tPtr sPtr len -> do -+ (\_ tPtr sPtr len _ -> do - freeHaskellFunPtr =<< readIORef cbRef - mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do -- str <- peekUTFStringLen (sPtr,fromIntegral len) -+ str <- peekUTFStringLen (castPtr sPtr,fromIntegral len) - return (Atom tPtr, str) - callback mRes) - writeIORef cbRef cbPtr -@@ -568,7 +568,7 @@ - {#pointer ClipboardRichTextReceivedFunc#} - - foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc :: -- (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) -> -+ (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) -> - IO ClipboardRichTextReceivedFunc - #endif - #endif -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs gtk/Graphics/UI/Gtk/General/General.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/General/General.chs 2012-10-02 16:27:28.000000000 +0400 -@@ -202,7 +202,7 @@ - -- their arguments from the main loop, that is, from the OS thread of Gtk, - -- thereby ensuring that any Gtk and OS function can be called. - -- --{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #} -+{#fun gdk_threads_enter as threadsEnter {} -> `()' #} - - -- | Release the global Gtk lock. - -- -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -493,17 +493,17 @@ - {# call gtk_combo_box_set_row_separator_func #} - (toComboBox self) nullFunPtr nullPtr nullFunPtr - comboBoxSetRowSeparatorSource self (Just (model, extract)) = do -- funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do -+ funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do - iter <- peek iterPtr - value <- customStoreGetRow model iter -- return (extract value) -+ return (fromBool $ extract value) - {# call gtk_combo_box_set_row_separator_func #} - (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr - - {#pointer TreeViewRowSeparatorFunc#} - - foreign import ccall "wrapper" mkRowSeparatorFunc :: -- (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc -+ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc - - -- %hash c:5bf8 - -- | Sets whether the popup menu should have a tearoff menu item. -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-10-02 16:27:30.000000000 +0400 -@@ -76,6 +76,12 @@ - menuItemNewWithMnemonic, - - -- * Methods -+#if GTK_CHECK_VERSION(2,16,0) -+ menuItemSetLabel, -+ menuItemGetLabel, -+ menuItemSetUseUnderline, -+ menuItemGetUseUnderline, -+#endif - menuItemSetSubmenu, - menuItemGetSubmenu, - menuItemRemoveSubmenu, -@@ -89,6 +95,10 @@ - -- * Attributes - menuItemSubmenu, - menuItemRightJustified, -+#if GTK_CHECK_VERSION(2,16,0) -+ menuItemLabel, -+ menuItemUseUnderline, -+#endif - - -- * Signals - menuItemActivateItem, -@@ -163,7 +173,36 @@ - - -------------------- - -- Methods -+#if GTK_CHECK_VERSION(2,16,0) -+-- | Sets text on the MenuItem label -+ -+menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO () -+menuItemSetLabel self label = -+ withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self) -+ -+-- | Gets text on the MenuItem label -+menuItemGetLabel :: (MenuItemClass self) => self -> IO String -+menuItemGetLabel self = -+ {# call gtk_menu_item_get_label #} -+ (toMenuItem self) -+ >>= \strPtr -> if strPtr == nullPtr -+ then return "" -+ else peekUTFString strPtr -+ -+-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key. -+-- -+menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO () -+menuItemSetUseUnderline self = -+ {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool - -+-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key. -+-- -+menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool -+menuItemGetUseUnderline self = -+ liftM toBool $ {# call gtk_menu_item_get_use_underline #} -+ (toMenuItem self) -+ -+#endif - -- | Sets the item's submenu, or changes it. - -- - menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO () -@@ -278,6 +317,22 @@ - menuItemGetRightJustified - menuItemSetRightJustified - -+#if GTK_CHECK_VERSION(2,16,0) -+-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel' -+-- -+menuItemLabel :: MenuItemClass self => Attr self String -+menuItemLabel = newAttr -+ menuItemGetLabel -+ menuItemSetLabel -+ -+-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and -+-- 'menuItemGetUseEUnderline' -+-- -+menuItemUseUnderline :: MenuItemClass self => Attr self Bool -+menuItemUseUnderline = newAttr -+ menuItemGetUseUnderline -+ menuItemSetUseUnderline -+#endif - -------------------- - -- Signals - -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-10-02 16:27:33.000000000 +0400 -@@ -239,7 +239,7 @@ - customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource, - customTreeDragDestIface = fromMaybe dummyDragDest mDragDest } - privPtr <- newStablePtr priv -- liftM con $ makeNewGObject (CustomStore, objectUnref) $ -+ liftM con $ wrapNewGObject (CustomStore, objectUnref) $ - gtk2hs_store_new implPtr privPtr - - foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new" -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -427,7 +427,7 @@ - {#pointer TreeModelForeachFunc#} - - foreign import ccall "wrapper" mkTreeModelForeachFunc :: -- (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) -> -+ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) -> - IO TreeModelForeachFunc - - #if GTK_CHECK_VERSION(2,2,0) -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -160,7 +160,7 @@ - {#pointer TreeModelFilterVisibleFunc #} - - foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc :: -- (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> -+ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> - IO TreeModelFilterVisibleFunc - - -- %hash c:a56d d:b42e -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -151,7 +151,7 @@ - treeSelectionSetSelectFunction :: TreeSelectionClass self => self - -> TreeSelectionCB -> IO () - treeSelectionSetSelectFunction ts fun = do -- fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do -+ fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do - path <- peekTreePath (castPtr tp) - liftM fromBool $ fun path - ) -@@ -168,7 +168,7 @@ - {#pointer TreeSelectionFunc#} - - foreign import ccall "wrapper" mkTreeSelectionFunc :: -- (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)-> -+ (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)-> - IO TreeSelectionFunc - - -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on. -@@ -199,7 +199,7 @@ - -> TreeSelectionForeachCB - -> IO () - treeSelectionSelectedForeach self fun = do -- fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do -+ fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do - -- make a deep copy of the iterator. This makes it possible to store this - -- iterator in Haskell land somewhere. The TreeModel parameter is not - -- passed to the function due to performance reasons. But since it is -@@ -219,7 +219,7 @@ - {#pointer TreeSelectionForeachFunc#} - - foreign import ccall "wrapper" mkTreeSelectionForeachFunc :: -- (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc -+ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc - - #if GTK_CHECK_VERSION(2,2,0) - -- | Creates a list of paths of all selected rows. -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs gtk/Graphics/UI/Gtk/ModelView/TreeView.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -582,7 +582,7 @@ - {#pointer TreeViewColumnDropFunc#} - - foreign import ccall "wrapper" mkTreeViewColumnDropFunc :: -- (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> -+ (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> - Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc - - -- | Scroll to a coordinate. -@@ -798,7 +798,7 @@ - {#pointer TreeViewMappingFunc#} - - foreign import ccall "wrapper" mkTreeViewMappingFunc :: -- (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) -> -+ (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) -> - IO TreeViewMappingFunc - - -- | Check if row is expanded. -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-10-02 16:27:34.000000000 +0400 -@@ -1251,16 +1251,26 @@ - - -- | A 'Pixbuf' is inserted into the buffer. - -- -+-- * See note in 'bufferInsertText'. -+-- - insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ()) - insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy) - - -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'. - -- Insertion actually occurs in the default handler. - -- -+-- * See note in 'bufferInsertText'. -+-- - insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ()) - insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy) - ---- | Some text was inserted. -+-- | Some text is inserted. Insertion actually occurs in the default handler. -+-- -+-- * The function connected to this handler may not modify the buffer since -+-- this would invalidate the iterator. If this function replaces the -+-- default handler, it needs to stop the emission of this signal in order -+-- to prevent the default handler from running. If additional text should -+-- be inserted, this can be done using the 'after' function to connect. - -- - bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ()) - bufferInsertText = Signal $ \after obj handler -> -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs gtk/Graphics/UI/Gtk/Multiline/TextIter.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -797,7 +797,7 @@ - {#pointer TextCharPredicate#} - - foreign import ccall "wrapper" mkTextCharPredicate :: -- ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate -+ ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate - - -- | Move 'TextIter' forward until a - -- predicate function returns True. -@@ -810,7 +810,7 @@ - textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> - IO Bool - textIterForwardFindChar ti pred limit = do -- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) -+ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) - res <- liftM toBool $ {#call text_iter_forward_find_char#} - ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) - freeHaskellFunPtr fPtr -@@ -827,7 +827,7 @@ - textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> - IO Bool - textIterBackwardFindChar ti pred limit = do -- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) -+ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) - res <- liftM toBool $ {#call text_iter_backward_find_char#} - ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) - freeHaskellFunPtr fPtr -diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs gtk/Graphics/UI/Gtk/Windows/Assistant.chs ---- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs 2012-06-18 01:39:34.000000000 +0400 -+++ gtk/Graphics/UI/Gtk/Windows/Assistant.chs 2012-10-02 16:30:54.000000000 +0400 -@@ -274,7 +274,7 @@ - {#pointer AssistantPageFunc#} - - foreign import ccall "wrapper" mkAssistantPageFunc :: -- ({#type glong#} -> Ptr () -> IO {#type glong#}) -+ ({#type gint#} -> Ptr () -> IO {#type gint#}) - -> IO AssistantPageFunc - - -- | Sets the page type for @page@. The page type determines the page behavior diff --git a/community/haskell-gtk/gtk-gthread.h-include.patch b/community/haskell-gtk/gtk-gthread.h-include.patch deleted file mode 100644 index fc600d6be..000000000 --- a/community/haskell-gtk/gtk-gthread.h-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -u gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c\~ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c ---- gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c~ 2011-11-14 07:15:41.000000000 +0900 -+++ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c 2012-01-08 14:58:45.849209318 +0900 -@@ -26,7 +26,8 @@ - */ - - #include <glib.h> --#include <glib/gthread.h> -+/* f17 gives Error "Only <glib.h> can be included directly." -+ #include <glib/gthread.h> */ - #include <gdk/gdk.h> - #include "hsgthread.h" - - -Diff finished. Sun Jan 8 14:58:54 2012 diff --git a/community/haskell-pango/PKGBUILD b/community/haskell-pango/PKGBUILD index 7c486d507..379fb744a 100644 --- a/community/haskell-pango/PKGBUILD +++ b/community/haskell-pango/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 102063 2013-12-04 14:20:35Z spupykin $ +# $Id: PKGBUILD 108171 2014-03-24 08:30:46Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-pango -pkgver=0.12.5.0 +pkgver=0.12.5.3 pkgrel=1 pkgdesc="Binding to the pango library for Gtk2Hs." url="http://hackage.haskell.org/package/pango" @@ -17,7 +17,7 @@ conflicts=('gtk2hs-pango') options=('strip' 'staticlibs') install=gtk2hs-pango.install source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) -md5sums=('6dca381064ad8488baa69a783b05e28b') +md5sums=('16dabd25374825c5df97997329f97464') build() { cd ${srcdir}/pango-${pkgver} diff --git a/community/haskell-primitive/PKGBUILD b/community/haskell-primitive/PKGBUILD index 3b03198e4..44405ba1b 100644 --- a/community/haskell-primitive/PKGBUILD +++ b/community/haskell-primitive/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 101124 2013-11-17 20:46:26Z spupykin $ +# $Id: PKGBUILD 108167 2014-03-24 08:20:40Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-primitive -pkgver=0.5.1.0 +pkgver=0.5.2.1 pkgrel=1 pkgdesc="Wrappers for primitive operations" url="http://hackage.haskell.org/package/primitive" @@ -15,6 +15,7 @@ install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/primitive/${pkgver}/primitive-${pkgver}.tar.gz") sha256sums=('526c9d4d06b7b379cb1aaffeffbb30bef810e771f29617ef6d0d99df711f4313') sha256sums=('8817a5f307c4605709b37857c048caa22fcc7550d681d64a2eea756126721529') +sha256sums=('0e516b81c2ef2c96d47dc40561663cc2cbfece0f135948e77e9b53025ff1c3ee') build() { cd ${srcdir}/primitive-${pkgver} diff --git a/community/haskell-vector/PKGBUILD b/community/haskell-vector/PKGBUILD index 4202d98db..7e0408b24 100644 --- a/community/haskell-vector/PKGBUILD +++ b/community/haskell-vector/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 101632 2013-11-29 15:58:32Z spupykin $ +# $Id: PKGBUILD 108169 2014-03-24 08:21:00Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=haskell-vector pkgver=0.10.9.1 -pkgrel=1 +pkgrel=2 pkgdesc="Efficient Arrays" url="http://code.haskell.org/vector" license=("custom:BSD3") @@ -14,8 +14,6 @@ depends=("ghc" "haskell-primitive") options=('strip' 'staticlibs') install="${pkgname}.install" source=("http://hackage.haskell.org/packages/archive/vector/${pkgver}/vector-${pkgver}.tar.gz") -sha256sums=('ece945058b01a77c5fff31e89bbea76ac619677041c41286a2da5e8b515508af') -sha256sums=('23a8ab9a5257781db2513a0741a01f0d5f60c6d0730cd88136abfe7ae44c330d') sha256sums=('205656e9741aad406e427e988dbf1665bf5dbdf3e9d574e309c274be4e06bde5') build() { diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD index afdbcf888..2ce437990 100644 --- a/community/lz4/PKGBUILD +++ b/community/lz4/PKGBUILD @@ -1,17 +1,18 @@ -# $Id: PKGBUILD 105324 2014-02-04 23:27:29Z seblu $ +# $Id: PKGBUILD 108214 2014-03-24 21:38:05Z seblu $ # Maintainer: Sébastien Luttringer # Contacted by mail, author use svn commit as release version. # He only push tested release code into svn and support using revision as version pkgname=lz4 -pkgver=113 +pkgver=116 pkgrel=1 pkgdesc='Very fast lossless compression algorithm' arch=('i686' 'x86_64') url='https://code.google.com/p/lz4/' license=('GPL2') makedepends=('svn') +checkdepends=('diffutils') depends=('glibc') source=("$pkgname::svn+http://lz4.googlecode.com/svn/trunk/#revision=$pkgver") md5sums=('SKIP') @@ -21,6 +22,13 @@ build() { make } +check() { + $pkgname/programs/lz4 /etc/passwd passwd.lz4 + $pkgname/programs/lz4 -d passwd.lz4 passwd + diff -q /etc/passwd passwd + rm passwd +} + package() { cd $pkgname make install DESTDIR="$pkgdir" diff --git a/community/mate-panel/PKGBUILD b/community/mate-panel/PKGBUILD index acb846d76..543287adb 100644 --- a/community/mate-panel/PKGBUILD +++ b/community/mate-panel/PKGBUILD @@ -2,7 +2,7 @@ pkgname=mate-panel pkgver=1.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="The MATE Panel" url="http://mate-desktop.org" arch=('i686' 'x86_64') @@ -13,12 +13,18 @@ depends=('caja' 'dbus-glib' 'dconf' 'gtk2' 'libwnck' 'libcanberra' 'libice' makedepends=('gobject-introspection' 'mate-common' 'networkmanager' 'perl-xml-parser' 'yelp-tools') optdepends=('yelp: for reading MATE help documents') -options=('!emptydirs') groups=('mate') -source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz") -sha1sums=('289bca55fb26465f2c155d087932d6973edf07d9') +source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz" + "https://github.com/City-busz/mate-panel/commit/f4d754c48a1cb141407ca28d80431cbd954a5ef5.diff") +sha1sums=('289bca55fb26465f2c155d087932d6973edf07d9' + '8c67a6aacfad3ee8225410f1ff1e37c6da3d5bc8') install=${pkgname}.install +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}/f4d754c48a1cb141407ca28d80431cbd954a5ef5.diff" +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ diff --git a/community/ocrad/PKGBUILD b/community/ocrad/PKGBUILD index bf3ebf7b3..3ae253c77 100644 --- a/community/ocrad/PKGBUILD +++ b/community/ocrad/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 102179 2013-12-06 12:13:24Z giovanni $ +# $Id: PKGBUILD 108204 2014-03-24 17:59:16Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> pkgname=ocrad -pkgver=0.22 +pkgver=0.23 pkgrel=1 pkgdesc="An Optical Character Recognition program" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('gcc-libs' 'texinfo') install=ocrad.install options=('staticlibs') source=("http://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.lz") -md5sums=('e84f0fb0dcd9b7b067201f9a3b89e06c') +md5sums=('bbcf34ec2ed2f6303bf546021184921c') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/pari/PKGBUILD b/community/pari/PKGBUILD index 80510ab06..b8f820c7a 100644 --- a/community/pari/PKGBUILD +++ b/community/pari/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 97765 2013-09-29 05:06:21Z bisson $ +# $Id: PKGBUILD 108200 2014-03-24 16:32:34Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=pari -pkgver=2.5.5 +pkgver=2.7.0 pkgrel=1 pkgdesc='Computer algebra system designed for fast computations in number theory' url='http://pari.math.u-bordeaux.fr/' @@ -11,8 +11,8 @@ arch=('i686' 'x86_64') depends=('gmp' 'readline' 'libx11') makedepends=('perl' 'texlive-core') optdepends=('perl: gphelp, tex2mail') -source=("${url}pub/pari/unix/${pkgname}-${pkgver}.tar.gz"{,.asc}) -sha1sums=('77637f935ee4a3b78e7015cef00146bd2f7e96bc' 'SKIP') +source=("http://pari.math.u-bordeaux.fr/pub/pari/unix/${pkgname}-${pkgver}.tar.gz"{,.asc}) +sha1sums=('ea3764bc0bac37d033e1109087bacba4c94b4c7d' 'SKIP') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -21,7 +21,12 @@ prepare() { build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./Configure --prefix=/usr --with-gmp --with-readline + ./Configure \ + --prefix=/usr \ + --with-readline \ + --mt=pthread \ + --with-gmp \ + make all } diff --git a/community/pitivi/PKGBUILD b/community/pitivi/PKGBUILD index 0f3060f0d..256b9b12b 100644 --- a/community/pitivi/PKGBUILD +++ b/community/pitivi/PKGBUILD @@ -1,23 +1,24 @@ -# $Id: PKGBUILD 108019 2014-03-21 08:50:40Z spupykin $ +# $Id: PKGBUILD 108155 2014-03-24 07:46:13Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Abhishek Dasgupta <abhidg@gmail.com> # Contributor: Gabor Nyekhelyi (n0gabor) <n0gabor@vipmail.hu> pkgname=pitivi pkgver=0.93 -pkgrel=1 +pkgrel=2 pkgdesc="Editor for audio/video projects using the GStreamer framework" arch=('i686' 'x86_64') url="http://www.pitivi.org/" license=('LGPL') depends=('clutter-gtk' 'gnonlin' 'gst-editing-services' 'gst-plugins-good' 'gst-python' 'libnotify' 'python2-gobject' 'python2-gobject2' 'python2-numpy' 'python2-xdg' - 'gnome-icon-theme' 'desktop-file-utils') + 'gnome-icon-theme' 'desktop-file-utils' 'clutter-gst') makedepends=('intltool' 'itstool') optdepends=('frei0r-plugins: additional video effects, clip transformation feature' 'gst-libav: additional multimedia codecs' 'gst-plugins-bad: additional multimedia codecs' - 'gst-plugins-ugly: additional multimedia codecs') + 'gst-plugins-ugly: additional multimedia codecs' + 'gnome-desktop: file thumbnails provided by GNOME'\''s thumbnailers') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz) md5sums=('27fa7e560b6da0cc8f83466c1346b96e') diff --git a/community/profanity/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch b/community/profanity/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch new file mode 100644 index 000000000..f68db6c6c --- /dev/null +++ b/community/profanity/0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch @@ -0,0 +1,32 @@ +From 9815ef3b02dfc05ed2e2dbe40d017b91f4f4fa41 Mon Sep 17 00:00:00 2001 +From: James Booth <boothj5@gmail.com> +Date: Mon, 24 Mar 2014 21:02:10 +0000 +Subject: [PATCH] Change libotr 4.0.0 code to use only OTR spec v2 + +--- + src/otr/otrlibv4.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/otr/otrlibv4.c b/src/otr/otrlibv4.c +index 80013af..01afa86 100644 +--- a/src/otr/otrlibv4.c ++++ b/src/otr/otrlibv4.c +@@ -29,13 +29,13 @@ + OtrlPolicy + otrlib_policy(void) + { +- return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2 | OTRL_POLICY_ALLOW_V3; ++ return OTRL_POLICY_ALLOW_V1 | OTRL_POLICY_ALLOW_V2; + } + + char * + otrlib_start_query(void) + { +- return "?OTR?v23?"; ++ return "?OTR?v2?"; + } + + static const char* +-- +1.9.1 + diff --git a/community/profanity/PKGBUILD b/community/profanity/PKGBUILD index 939a1a1fd..b1707d6b8 100644 --- a/community/profanity/PKGBUILD +++ b/community/profanity/PKGBUILD @@ -4,19 +4,22 @@ pkgname=profanity pkgver=0.4.0.rc1 -pkgrel=1 +pkgrel=2 pkgdesc='Console based XMPP client' arch=('i686' 'x86_64') url='http://www.profanity.im' license=('GPL3') depends=('curl' 'expat' 'glib2' 'libotr') makedepends=('doxygen' 'libstrophe') -source=(https://github.com/boothj5/profanity/archive/$pkgver.tar.gz) -md5sums=('1b96b279bced5896c223d088c99c0ca6') +source=(https://github.com/boothj5/profanity/archive/$pkgver.tar.gz + 0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch) +md5sums=('1b96b279bced5896c223d088c99c0ca6' + 'e957a737bb9d9f456f0b602815e6fe1e') prepare() { cd $pkgname-$pkgver sed -i '21s/development/release/' configure.ac + patch -p1 -i ../0001-Change-libotr-4.0.0-code-to-use-only-OTR-spec-v2.patch autoreconf -fi } diff --git a/community/subsurface/PKGBUILD b/community/subsurface/PKGBUILD index f0d7087db..53fb2697e 100644 --- a/community/subsurface/PKGBUILD +++ b/community/subsurface/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 105595 2014-02-11 07:54:24Z bisson $ +# $Id: PKGBUILD 108147 2014-03-24 00:57:29Z bisson $ # Contributor: Francois Boulogne <fboulogne at april dot org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=subsurface _pkgname=Subsurface -pkgver=4.0.2 +pkgver=4.0.3 pkgrel=1 pkgdesc='Divelog program' url='http://subsurface.hohndel.org/' @@ -12,7 +12,7 @@ license=('GPL2') arch=('i686' 'x86_64') depends=('qt4' 'kdeedu-marble' 'libzip' 'libxml2' 'libxslt' 'sqlite' 'libdivecomputer' 'libusbx') source=("http://subsurface.hohndel.org/downloads/${_pkgname}-${pkgver}.tgz") -sha1sums=('14370c2e91f82a6df32d44e2a0a4b20908c74465') +sha1sums=('f813196bbef98130b1fcb778baf6b504ec01a1eb') build() { cd "${srcdir}/${_pkgname}-${pkgver}" diff --git a/community/udpxy/PKGBUILD b/community/udpxy/PKGBUILD index bec1cca99..a166936c7 100644 --- a/community/udpxy/PKGBUILD +++ b/community/udpxy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 104084 2014-01-15 11:36:44Z spupykin $ +# $Id: PKGBUILD 108157 2014-03-24 07:46:34Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Konstantin Shabanov <kes.eclipse@gmail.com> # Contributor: Evka @@ -7,7 +7,7 @@ pkgname=udpxy pkgver=1.0.23.0 _pkgver=1.0.23-0 -pkgrel=2 +pkgrel=3 pkgdesc="small-footprint UNIX/Linux daemon to relay multicast UDP traffic to client's TCP (HTTP) connection." arch=(i686 x86_64) url="http://udpxy.sf.net" @@ -16,7 +16,7 @@ source=(http://sourceforge.net/projects/$pkgname/files/$pkgname/Chipmunk-1.0/$pk $pkgname.service pidfile.patch) md5sums=('3dd99ba264078e873cbe1d98369ed423' - '19d76e6fbd876b5a7cdaa3e69cecdb0e' + 'f47aeec41aa03acd4b61a6bfa03b0dff' '7a268f58ee964895377c95d16c9c633a') prepare() { diff --git a/community/udpxy/udpxy.service b/community/udpxy/udpxy.service index 9ab244043..a155c5e14 100644 --- a/community/udpxy/udpxy.service +++ b/community/udpxy/udpxy.service @@ -3,7 +3,7 @@ Description=UDP multicast to TCP (HTTP) relay proxy After=network.target [Service] -Type=forking +Type=simple PIDFile=/run/udpxy.pid ExecStart=/usr/bin/udpxy -T -S -p 4022 -B 256kb |