From 8162cfeb8ccda9635b826249260ba036a58a1f2a Mon Sep 17 00:00:00 2001 From: Timothy Redaelli Date: Fri, 13 Jan 2012 00:14:41 +0000 Subject: [PATCH] updated on Fri Jan 13 00:14:41 UTC 2012 --- acdcontrol/PKGBUILD | 29 + acdcontrol/product_id.diff | 22 + atomzombiesmasher/PKGBUILD | 14 +- avconvert/PKGBUILD | 24 +- blingbling-git/PKGBUILD | 9 +- blingbling-git/blingbling-git.changelog | 3 + buc/PKGBUILD | 87 +- burg-manager/PKGBUILD | 18 +- dvb-usb-af9035/PKGBUILD | 3 +- evince2-light/PKGBUILD | 8 +- extended-actions-bzr/PKGBUILD | 37 +- extended-actions-bzr/avconvert.desktop | 7 + ffmbc/PKGBUILD | 5 +- firefox-beta-bin-ru/PKGBUILD | 8 +- firefox-beta-bin-uk/PKGBUILD | 8 +- firefox-beta-bin/PKGBUILD | 6 +- gnome-shell-extension-weather-git/PKGBUILD | 2 +- gtk2-ubuntu/044_grips.patch | 1563 -------------------- gtk2-ubuntu/PKGBUILD | 12 +- gtk2-ubuntu/fix-ubuntumenuproxy-build.patch | 12 + gtk3-ubuntu/PKGBUILD | 12 +- gtk3-ubuntu/empty_grid.patch | 29 + gtk3-ubuntu/fix_crash_treeview.patch | 55 - indicator-applet/PKGBUILD | 7 +- jrockit/PKGBUILD | 27 +- kid3-qt/PKGBUILD | 66 +- kid3-qt/kid3-qt.install | 14 + linux-bfs/PKGBUILD | 16 +- linux-bfs/config | 9 +- linux-bfs/config.x86_64 | 9 +- linux-bfs/linux-bfs.install | 3 +- nvidia-rt/PKGBUILD | 14 +- nvidia-rt/nvidia_linux_3.0-rt.patch.tar.bz2 | Bin 0 -> 713 bytes nvidia-rt/nvidiart.patch | 44 - plasma-widget-message-indicator/PKGBUILD | 9 +- .../indicator_status.diff | 73 + pogo/PKGBUILD | 16 +- profile-sync-daemon/PKGBUILD | 4 +- ruby-bdb/PKGBUILD | 12 +- screenalert/PKGBUILD | 4 +- tkcvs/PKGBUILD | 10 +- upp-svn/PKGBUILD | 2 +- varka-bzr/PKGBUILD | 34 +- 43 files changed, 476 insertions(+), 1870 deletions(-) create mode 100644 acdcontrol/PKGBUILD create mode 100644 acdcontrol/product_id.diff rewrite buc/PKGBUILD (69%) create mode 100644 extended-actions-bzr/avconvert.desktop delete mode 100644 gtk2-ubuntu/044_grips.patch create mode 100644 gtk2-ubuntu/fix-ubuntumenuproxy-build.patch create mode 100644 gtk3-ubuntu/empty_grid.patch delete mode 100644 gtk3-ubuntu/fix_crash_treeview.patch rewrite kid3-qt/PKGBUILD (80%) create mode 100644 kid3-qt/kid3-qt.install create mode 100644 nvidia-rt/nvidia_linux_3.0-rt.patch.tar.bz2 delete mode 100644 nvidia-rt/nvidiart.patch create mode 100644 plasma-widget-message-indicator/indicator_status.diff diff --git a/acdcontrol/PKGBUILD b/acdcontrol/PKGBUILD new file mode 100644 index 000000000..45908193c --- /dev/null +++ b/acdcontrol/PKGBUILD @@ -0,0 +1,29 @@ +# Maintainer: rwd https://bbs.archlinux.org/profile.php?id=22878 +pkgname=acdcontrol +pkgver=0.4 +pkgrel=1 +pkgdesc="Apple Cinema Display backlight control" +arch=('i686' 'x86_64') +url="https://sourceforge.net/projects/acdcontrol/" +license=('GPL') +depends=(gcc-libs-multilib) +source=( + "http://sourceforge.net/projects/$pkgname/files/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz/download" + "product_id.diff" + ) +md5sums=( + "13393bac07dc7fb88638c701cade2833" + "e29182d48170ca14f0a60e38a1fda7c6" + ) +build() { + cd "$srcdir/$pkgname-$pkgver" + patch -uN acdcontrol.cpp ../product_id.diff || return 1 + make || return 1 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + install -D -m 755 acdcontrol "$pkgdir/usr/bin/acdcontrol" +} + +# vim:set ts=2 sw=2 et: diff --git a/acdcontrol/product_id.diff b/acdcontrol/product_id.diff new file mode 100644 index 000000000..501700770 --- /dev/null +++ b/acdcontrol/product_id.diff @@ -0,0 +1,22 @@ +--- acdcontrol.cpp.orig 2007-04-05 16:41:50.000000000 +0200 ++++ acdcontrol.cpp 2012-01-07 20:08:21.895279144 +0100 +@@ -57,8 +57,9 @@ + const int CINEMA_DISPLAY_23_NEW = 0x9218; + const int CINEMA_DISPLAY_20_OLD = 0x9219; + const int CINEMA_DISPLAY_20_NEW = 0x9219; +-const int CINEMA_DISPLAY_24 = 0x921e; ++const int CINEMA_DISPLAY_24 = 0x9236; + const int CINEMA_DISPLAY_30 = 0x9232; ++const int CINEMA_DISPLAY_27 = 0x9226; + + const int S1 = 0x8002; + +@@ -540,6 +541,8 @@ + "Apple Cinema Display 24\"" )); + supportedDevices.insert( DeviceId( APPLE, CINEMA_DISPLAY_30, + "Apple Cinema HD Display 30\"" )); ++ supportedDevices.insert( DeviceId( APPLE, CINEMA_DISPLAY_27, ++ "Apple Cinema HD Display 27\"" )); + + supportedDevices.insert( DeviceId( SAMSUNG, S1, + "Samsung SyncMaster 757NF" )); diff --git a/atomzombiesmasher/PKGBUILD b/atomzombiesmasher/PKGBUILD index e615a4e17..6db77531f 100644 --- a/atomzombiesmasher/PKGBUILD +++ b/atomzombiesmasher/PKGBUILD @@ -2,11 +2,12 @@ pkgname=atomzombiesmasher pkgver=1.94 -pkgrel=1 +pkgrel=2 pkgdesc="RTS, evacuating civilians out of zombie-contaminated cities. (Commercial)" arch=('any') url="http://blendogames.com/atomzombiesmasher/" license=("custom:commercial") +[ "$CARCH" = "x86_64" ] && depends=('libgdiplus' 'mono' 'csfml-bin') conflicts=("atomzombiesmasherdemo") #source=("http://blendogames.com/files/atomzombiepatch_v${pkgver//./_}_linux.tar") source=("http://blendogames.com/files/atomzombiepatch_v${pkgver//./_}_linux.tar.gz") @@ -84,6 +85,17 @@ package() { # executable link ln -s /opt/$pkgname/AtomZombieSmasher $pkgdir/usr/bin/$pkgname + + if [ "$CARCH" = "x86_64" ]; then + # remove packaged libraries + cd $pkgdir/opt/$pkgname/data + rm *.so* + rm `ls | grep .dll | grep -v ^sfmlnet | grep -v ^Tao` + + # point startup script to system mono + sed -i "s|\./mono|mono|" atomzombiesmasher + fi + } # vim:set ts=2 sw=2 et: diff --git a/avconvert/PKGBUILD b/avconvert/PKGBUILD index c683c3224..317feda5a 100644 --- a/avconvert/PKGBUILD +++ b/avconvert/PKGBUILD @@ -1,13 +1,14 @@ -# Maintainer: Michal Gawronski +# Contributors: Michal Gawronski , crazyelf5 +# Maintainer: crazyelf5 pkgname=avconvert -pkgver=0.83 +pkgver=0.97 pkgrel=1 pkgdesc="Audio/Video/Image/Text/ISO Convert - Multiconverter with support of lots of formats for GNOME" -arch=('i686' 'x86_64') -url="http://gnome-look.org/content/show.php/Audio%2BVideo%2BImage%2BText%2BISO+Convert?content=92533" +arch=('any') +url="http://gnome-look.org/content/show.php/Audio+Video+Image+Text+ISO+Convert?content=92533" license=('GPL') -depends=('nautilus-actions' 'zenity' 'ffmpeg' 'imagemagick') +depends=('zenity' 'ffmpeg' 'imagemagick' 'bc' 'libtranslate') makedepends=() optdepends=('amrwb: AMR codec' 'faac: AAC encodec' @@ -27,14 +28,13 @@ optdepends=('amrwb: AMR codec' 'daa2iso: daa to iso' 'cdd2iso: cdd to iso' 'uif2iso: uif to iso' - 'mencoder: rotating videos') -provides=() -conflicts=() + 'mencoder: rotating videos' + 'transcode: avi merging' + 'nautilus-actions: nautilus integration') source=('http://gnome-look.org/CONTENT/content-files/92533-avconvert.tar.gz') -md5sums=('e7293ae5b6fd5c94c85ef054a408c222') +md5sums=('dd2128e57bd89c5c780233979c210bc7') build() { - cd $srcdir - mkdir -p $pkgdir/usr/bin - install -m 755 ./avconvert $pkgdir/usr/bin + install -dm755 "$pkgdir/usr/bin" + install -m755 "$srcdir/$pkgname" "$pkgdir/usr/bin" } diff --git a/blingbling-git/PKGBUILD b/blingbling-git/PKGBUILD index e4a7faf42..c4f1fbd3e 100644 --- a/blingbling-git/PKGBUILD +++ b/blingbling-git/PKGBUILD @@ -1,8 +1,8 @@ # Contributor: Zsolt Udvari pkgname=blingbling-git -pkgver=20111216 -pkgrel=1 +pkgver=20120112 +pkgrel=2 pkgdesc="Graphical widget library for Awesome Windows Manager." arch=("any") url="http://awesome.naquadah.org/wiki/Blingbling" @@ -34,10 +34,11 @@ build() { install -m644 ${srcdir}/${_gitname}/*.lua ${pkgdir}/usr/share/awesome/lib/${_gitname} cp -r ${srcdir}/${_gitname}/layout ${pkgdir}/usr/share/awesome/lib/${_gitname} - install -d ${pkgdir}/usr/share/doc/${_gitname} + install -d ${pkgdir}/usr/share/doc/${_gitname}/modules install -m644 ${srcdir}/${_gitname}/{README,To_Do} ${pkgdir}/usr/share/doc/${_gitname} install -m644 ${srcdir}/${_gitname}/.udisks-glue.conf ${pkgdir}/usr/share/doc/${_gitname}/udisks-glue.conf - install -m644 ${srcdir}/${_gitname}/modules/*.html ${pkgdir}/usr/share/doc/${_gitname} + install -m644 ${srcdir}/${_gitname}/luadoc.css ${pkgdir}/usr/share/doc/${_gitname} + install -m644 ${srcdir}/${_gitname}/modules/*.html ${pkgdir}/usr/share/doc/${_gitname}/modules cp -r ${srcdir}/${_gitname}/examples ${pkgdir}/usr/share/doc/${_gitname} install -d ${pkgdir}/usr/share/licenses/${_gitname} diff --git a/blingbling-git/blingbling-git.changelog b/blingbling-git/blingbling-git.changelog index a19426733..154ff1280 100644 --- a/blingbling-git/blingbling-git.changelog +++ b/blingbling-git/blingbling-git.changelog @@ -1,2 +1,5 @@ +2012-01-12 Zsolt Udvari + * fix html documentation + * install luadoc.css 2011-12-16 Zsolt Udvari * package layout directory and documentation in modules diff --git a/buc/PKGBUILD b/buc/PKGBUILD dissimilarity index 69% index 385b9a420..f6c19a483 100755 --- a/buc/PKGBUILD +++ b/buc/PKGBUILD @@ -1,39 +1,48 @@ -# Contributor: Emanuele Rossi newdna1510@yahoo.it -# Contributor: Odites odites@gmal.com -# Contributor: cruznick - -pkgname=buc -pkgver=0.5.2 -pkgrel=2 -pkgdesc="BUC is the program which transforms common bash script in GUI applications written in QT" -arch=('i686' 'x86_64') -url="http://buc.billeragroup.net" -license=('GPL') -groups=('devel') -install=buc.install -depends=('libpng' 'qt') -source=(http://buc.intilinux.com/download/$pkgname-${pkgver}_src_full.tar.gz 'gcc-fixes.patch' 'path-fixes.patch') -md5sums=('0e35e0bf8a447170428ff0e570629813' - '3f33e7e4f143305a8d55b97241254384' # gcc-fixes.patch - '88cfeca6c14a3eb4b6dfdd026aaf3357') # path-fixes.patch -build() { - cd "$srcdir/zip/" - - # removing unnecesary stuff - rm -v bucd/usr/local/buc/libQtCore.so.4 - rm -v bucd/usr/local/buc/libQtGui.so.4 - rm -v bucd/usr/local/buc/buc - # patch to facilitate compilation - patch -Np1 -i ${srcdir}/gcc-fixes.patch - # patch to fix paths (usr/local to usr/share) - patch -Np1 -i ${srcdir}/path-fixes.patch - qmake - make - # create dirs and move things to right places - mkdir -p $pkgdir/usr/bin - mkdir -p $pkgdir/usr/share/buc - cp -Rv bucd/usr/share/* $pkgdir/usr/share - cp -Rv bucd/usr/local/buc/ $pkgdir/usr/share - cp -Rv bucd/usr/local/bin/ $pkgdir/usr/ - cp -Rv buc $pkgdir/usr/share/buc/ - } +# Contributor: Emanuele Rossi newdna1510@yahoo.it +# Contributor: Odites odites@gmal.com +# Contributor: cruznick +# Contributor: fsckd + +pkgname=buc +pkgver=0.5.2 +pkgrel=3 +pkgdesc="BUC is the program which transforms common bash script in GUI applications written in QT" +arch=('i686' 'x86_64') +url="http://buc.billeragroup.net" +license=('GPL') +groups=('devel') +install=buc.install +depends=('libpng' 'qt') +source=("http://buc.intilinux.com/download/${pkgname}-${pkgver}_src_full.tar.gz" + 'gcc-fixes.patch' + 'path-fixes.patch') +sha256sums=('9e8951558f838dd655bfb534eabf444274870a6cf7c549bd56e3e11f2ae285d1' #src + 'a4d384345f659652d40fed9047c262ec03229fd20ec434ae0948c5a1500b1ed7' # gcc-fixes.patch + '384efde9a66a7c634830af69a9dc771d03fc0fd290d5b377d437f7091bc5ac5d') # path-fixes.patch + +build() { + cd "${srcdir}/zip/" + + # removing unnecesary stuff + rm -v bucd/usr/local/buc/libQtCore.so.4 + rm -v bucd/usr/local/buc/libQtGui.so.4 + rm -v bucd/usr/local/buc/buc + + # patch to facilitate compilation + patch -Np1 -i "${srcdir}/gcc-fixes.patch" + + # patch to fix paths (usr/local to usr/share) + patch -Np1 -i "${srcdir}/path-fixes.patch" + + qmake + make + + # create dirs and move things to right places + mkdir -p "${pkgdir}/usr/bin" + mkdir -p "${pkgdir}/usr/share/buc" + + cp -Rv bucd/usr/share/* "${pkgdir}/usr/share" + cp -Rv bucd/usr/local/buc/ "${pkgdir}/usr/share" + cp -Rv bucd/usr/local/bin/ "${pkgdir}/usr/" + cp -Rv buc "${pkgdir}/usr/share/buc/" +} diff --git a/burg-manager/PKGBUILD b/burg-manager/PKGBUILD index 6ec97e4bb..3150a6422 100644 --- a/burg-manager/PKGBUILD +++ b/burg-manager/PKGBUILD @@ -1,21 +1,19 @@ # Contributor: cruznick +# Contributor: fsckd pkgname=burg-manager pkgver=1.1.0 -pkgrel=1 +pkgrel=2 pkgdesc="Graphical manager for Burg bootloader" arch=('i686' 'x86_64') url="http://www.sourceslist.eu/burg-manager/" license=('GPL') -install=$pkgname.install +install="${pkgname}.install" depends=('buc' 'zenity' 'xorg-xrandr') -source=(http://dl.dropbox.com/u/11529444/$pkgname/arch/arch-$pkgname-$pkgver.tar.gz) -md5sums=(85f8313d06233d68abe25080d2b9d86b) -package() { - cp -Rv $srcdir/arch-$pkgname-$pkgver/* $pkgdir/ - mkdir -p $pkgdir/etc/burg-manager +source=("http://ompldr.org/vYzgzeQ/arch-burg-manager-1.1.0.tar.gz") +sha256sums=('afd2c482bed481d534dfeeb3e09eced16076ae8181e0752158971534246a6eb3') +package() { + cp -Rv "${srcdir}/arch-${pkgname}-${pkgver}"/* "${pkgdir}/" + mkdir -p "${pkgdir}/etc/burg-manager" } - - - diff --git a/dvb-usb-af9035/PKGBUILD b/dvb-usb-af9035/PKGBUILD index 70404190d..1d81c249e 100644 --- a/dvb-usb-af9035/PKGBUILD +++ b/dvb-usb-af9035/PKGBUILD @@ -2,11 +2,12 @@ pkgname=dvb-usb-af9035 pkgver=1 -pkgrel=1 +pkgrel=2 pkgdesc="TerraTec Cinergy T Stick USB DVB-T kernel module" arch=('i686' 'x86_64') url="http://linuxtv.org/wiki/index.php/TerraTec_Cinergy_T_Stick" license=('GPL') +makedepends=('linux-headers') depends=('linux') source=('http://mennucc1.debian.net/terratec_af9035-a_m.tar.gz') md5sums=('472caeed389c4dc57f3f545dc9e47967') diff --git a/evince2-light/PKGBUILD b/evince2-light/PKGBUILD index 8a5ae4c2f..c766b18b6 100644 --- a/evince2-light/PKGBUILD +++ b/evince2-light/PKGBUILD @@ -4,18 +4,18 @@ pkgname=evince2-light pkgver=2.32.0 -pkgrel=1 +pkgrel=2 pkgdesc="Simply a document viewer (GTK2 version, GNOME free!)" arch=('i686' 'x86_64') url="http://projects.gnome.org/evince/" license=('GPL') -depends=('dconf' 'poppler-glib' 'libspectre' 'djvulibre' 't1lib' 'gsfonts' 'hicolor-icon-theme' 'desktop-file-utils') +depends=('gtk2' 'poppler-glib' 'libspectre' 'djvulibre' 't1lib' 'gsfonts' 'hicolor-icon-theme' 'desktop-file-utils') makedepends=('intltool') provides=('evince') conflicts=('evince') options=('!libtool') install=evince2-light.install -source=(http://ftp.gnome.org/pub/gnome/sources/evince/2.32/evince-$pkgver.tar.bz2 ) +source=(http://ftp.gnome.org/pub/gnome/sources/evince/2.32/evince-$pkgver.tar.bz2) md5sums=('ebc3ce6df8dcbf29cb9492f8dd031319') build() { @@ -44,4 +44,6 @@ package() { cd "$srcdir"/evince-$pkgver make DESTDIR="$pkgdir" install + + rm -rf $pkgdir/usr/share/GConf } diff --git a/extended-actions-bzr/PKGBUILD b/extended-actions-bzr/PKGBUILD index b4af4cbee..89842e228 100644 --- a/extended-actions-bzr/PKGBUILD +++ b/extended-actions-bzr/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: crazyelf5 pkgname=extended-actions-bzr -pkgver=latest +pkgver=5 pkgrel=1 pkgdesc="Service for generating extended actions on files" arch=('i686' 'x86_64') @@ -9,14 +9,39 @@ url="https://launchpad.net/extended-actions" license=('GPL3') depends=('glib2' 'libgee' 'glibc') makedepends=('bzr' 'gcc' 'vala' 'cmake') +optdepends=('avconvert: Audio/Video conversion integration [AUR]') +source=('avconvert.desktop') +md5sums=('8b51b407b695ffe88a2dde8d7f1abf58') -build() -{ - bzr branch lp:extended-actions - cd extended-actions +_bzrtrunk=lp:extended-actions +_bzrmod=extended-actions + +build() { + msg "Connecting to Bazaar server...." + + if [ -d $_bzrmod ]; then + cd $_bzrmod && bzr pull $_bzrtrunk -r $pkgver + msg "The local files are updated." + cd "$srcdir" + else + bzr branch $_bzrtrunk $_bzrmod -r $pkgver + fi + + msg "BZR checkout done or server timeout" + msg "Starting make..." + + [ -d $_bzrmod-build ] && rm -rf $_bzrmod-build + cp -r $_bzrmod $_bzrmod-build + cd $_bzrmod-build + [ -d build ] && rm -rf build mkdir build cd build cmake .. -DCMAKE_INSTALL_PREFIX=/usr make - make DESTDIR="${pkgdir}" install +} + +package() { + cd "$srcdir/$_bzrmod-build/build" + make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install + install -m644 "$srcdir/avconvert.desktop" "$pkgdir/usr/share/extended-actions" } diff --git a/extended-actions-bzr/avconvert.desktop b/extended-actions-bzr/avconvert.desktop new file mode 100644 index 000000000..5a143f167 --- /dev/null +++ b/extended-actions-bzr/avconvert.desktop @@ -0,0 +1,7 @@ +[Extended Action Entry] +Name=Convert with avconvert +Icon= +Description=Convert +MimeType=audio;image;text;video; +StrictCondition=false +Exec=/usr/bin/avconvert %f diff --git a/ffmbc/PKGBUILD b/ffmbc/PKGBUILD index dc5c3a111..3e3fae183 100644 --- a/ffmbc/PKGBUILD +++ b/ffmbc/PKGBUILD @@ -7,11 +7,11 @@ pkgdesc="FFmpeg customized for broadcast and professional usage" arch=('i686' 'x86_64') url="http://code.google.com/p/ffmbc/" license=('GPL') -depends=('bzip2' 'faac' 'lame' 'x264-git' 'zlib') +depends=('faac' 'lame' 'libass' 'x264-git' 'zlib') makedepends=('yasm') conflicts=('ffmpeg') source=("http://ffmbc.googlecode.com/files/FFmbc-${pkgver//_/-}.tar.bz2") -sha1sums=('') +sha1sums=('4785159faed913dfc541a071204b16ed91d3baad') build() { cd ${srcdir}/FFmbc-${pkgver//_/-} @@ -20,6 +20,7 @@ build() { --prefix=/usr \ --enable-gpl \ --enable-nonfree \ + --enable-libass \ --enable-libfaac \ --enable-libmp3lame \ --enable-libx264 diff --git a/firefox-beta-bin-ru/PKGBUILD b/firefox-beta-bin-ru/PKGBUILD index 4e2a50b17..85e315d55 100755 --- a/firefox-beta-bin-ru/PKGBUILD +++ b/firefox-beta-bin-ru/PKGBUILD @@ -3,7 +3,7 @@ pkgname=firefox-beta-bin-ru _pkgreal=firefox-beta-bin _pkgnome=firefox-beta -pkgver=10.0b1 +pkgver=10.0b4 pkgrel=1 _lang=ru _srcurl=http://pv-mirror02.mozilla.org/pub/mozilla.org/firefox/releases @@ -12,19 +12,19 @@ url='http://www.mozilla.org/projects/firefox' arch=('i686' 'x86_64') depends=('dbus-glib' 'desktop-file-utils' 'libxt' 'mime-types' 'nss' 'shared-mime-info') license=('MPL' 'GPL' 'LGPL') -provides=('firefox-10.0b1') +provides=('firefox-10.0b4') _source_x86=(${_srcurl}/${pkgver}/linux-i686/${_lang}/firefox-${pkgver}.tar.bz2 ${_pkgnome}.desktop ${_pkgnome}-safe.desktop) -_md5sums_x86=('b520dfbcef76afae56f8387940a66d8e' +_md5sums_x86=('87b9571afbe427686862d68875c16ae5' '8698d9cd40cdd170349db1315f0f1304' '052799fafa03136743b439fafb17d751') _source_x86_64=(${_srcurl}/${pkgver}/linux-x86_64/${_lang}/firefox-${pkgver}.tar.bz2 ${_pkgnome}.desktop ${_pkgnome}-safe.desktop) -_md5sums_x86_64=('72149cba0663ba2f304df660e5a82265' +_md5sums_x86_64=('4d19a801511a0e6484f80264a624ae93' '8698d9cd40cdd170349db1315f0f1304' '052799fafa03136743b439fafb17d751') diff --git a/firefox-beta-bin-uk/PKGBUILD b/firefox-beta-bin-uk/PKGBUILD index b9e6a878b..bdb049999 100755 --- a/firefox-beta-bin-uk/PKGBUILD +++ b/firefox-beta-bin-uk/PKGBUILD @@ -3,7 +3,7 @@ pkgname=firefox-beta-bin-uk _pkgreal=firefox-beta-bin _pkgnome=firefox-beta -pkgver=10.0b1 +pkgver=10.0b4 pkgrel=1 _lang=uk _srcurl=http://pv-mirror02.mozilla.org/pub/mozilla.org/firefox/releases @@ -12,19 +12,19 @@ url='http://www.mozilla.org/projects/firefox' arch=('i686' 'x86_64') depends=('dbus-glib' 'desktop-file-utils' 'libxt' 'mime-types' 'nss' 'shared-mime-info') license=('MPL' 'GPL' 'LGPL') -provides=('firefox-10.0b1') +provides=('firefox-10.0b4') _source_x86=(${_srcurl}/${pkgver}/linux-i686/${_lang}/firefox-${pkgver}.tar.bz2 ${_pkgnome}.desktop ${_pkgnome}-safe.desktop) -_md5sums_x86=('f1b70cb9d741a617033adbead06acb5c' +_md5sums_x86=('be4e04c9866698718d6eecfdc1098434' '560e14d6cfb802255c6f2f71705201dc' 'fbd49e056293bc8b4acbda98da857a8f') _source_x86_64=(${_srcurl}/${pkgver}/linux-x86_64/${_lang}/firefox-${pkgver}.tar.bz2 ${_pkgnome}.desktop ${_pkgnome}-safe.desktop) -_md5sums_x86_64=('18d68eba588d1a00b1ed84e3697a61a7' +_md5sums_x86_64=('008183651596cfa03beb378f3d1ab18d' '560e14d6cfb802255c6f2f71705201dc' 'fbd49e056293bc8b4acbda98da857a8f') diff --git a/firefox-beta-bin/PKGBUILD b/firefox-beta-bin/PKGBUILD index b1abedd8e..27901244a 100644 --- a/firefox-beta-bin/PKGBUILD +++ b/firefox-beta-bin/PKGBUILD @@ -3,7 +3,7 @@ # Maintainer : Axilleas P pkgname=firefox-beta-bin -pkgver=10.0b3 +pkgver=10.0b4 pkgrel=1 pkgdesc='Standalone web browser from mozilla.org, beta build binaries.' url='http://www.mozilla.com/en-US/firefox/fx/' @@ -14,11 +14,11 @@ source=("ftp://ftp.mozilla.org/pub/firefox/releases/${pkgver}/linux-${CARCH}/en- "$pkgname.desktop" "$pkgname-safe.desktop") -sha1sums=('8c77d90c948f037be5e0fa542ca9f4fc0f0a19ec' +sha1sums=('db9d0b1cecc42593b4cd45a8cf0873cf1f1e0f7b' 'dd2afa6a6369b9c6ca549152d2df46794b3b385d' '30990dafa5bea211ea2b84dadb56ac68324f48a3') -[[ "$CARCH" == "i686" ]] && sha1sums[0]="2ff508e357b9d191d9aac29794de925c60d57926" +[[ "$CARCH" == "i686" ]] && sha1sums[0]="398fc59430362dc52274549da2af90d6de2e756c" build() { diff --git a/gnome-shell-extension-weather-git/PKGBUILD b/gnome-shell-extension-weather-git/PKGBUILD index 7603dcbb3..a48bfb749 100644 --- a/gnome-shell-extension-weather-git/PKGBUILD +++ b/gnome-shell-extension-weather-git/PKGBUILD @@ -1,7 +1,7 @@ #Submitter: linx56 #Maintainer: Simon Legner pkgname=gnome-shell-extension-weather-git -pkgver=20111229 +pkgver=20120113 pkgrel=1 pkgdesc="A GNOME Shell extension for displaying weather notifications" arch=('any') diff --git a/gtk2-ubuntu/044_grips.patch b/gtk2-ubuntu/044_grips.patch deleted file mode 100644 index f3a35f310..000000000 --- a/gtk2-ubuntu/044_grips.patch +++ /dev/null @@ -1,1563 +0,0 @@ -## Description: add some description -## Origin/Author: add some origin or author -## Bug: bug URL -Index: gtk+-2.24.4/gtk/gtk.symbols -=================================================================== ---- gtk+-2.24.4.orig/gtk/gtk.symbols 2011-04-04 10:57:59.396596969 +1000 -+++ gtk+-2.24.4/gtk/gtk.symbols 2011-04-04 10:58:00.236596968 +1000 -@@ -5381,6 +5381,7 @@ - gtk_window_get_modal - gtk_window_get_position - gtk_window_get_resizable -+gtk_window_get_resize_grip_area - gtk_window_get_role - gtk_window_get_screen - gtk_window_get_size -@@ -5416,6 +5417,7 @@ - gtk_window_remove_mnemonic - gtk_window_reshow_with_initial_size - gtk_window_resize -+gtk_window_resize_grip_is_visible - gtk_window_set_accept_focus - gtk_window_set_auto_startup_notification - gtk_window_set_decorated -@@ -5443,6 +5445,8 @@ - gtk_window_get_has_frame - gtk_window_set_has_frame - #endif -+gtk_window_get_has_resize_grip -+gtk_window_set_has_resize_grip - gtk_window_set_icon - #ifndef _WIN64 - gtk_window_set_icon_from_file PRIVATE -Index: gtk+-2.24.4/gtk/gtkalias.h -=================================================================== ---- gtk+-2.24.4.orig/gtk/gtkalias.h 2011-04-02 08:43:12.000000000 +1100 -+++ gtk+-2.24.4/gtk/gtkalias.h 2011-04-04 10:58:00.236596968 +1000 -@@ -12827,6 +12827,9 @@ - extern __typeof (gtk_window_get_group) IA__gtk_window_get_group __attribute((visibility("hidden"))); - #define gtk_window_get_group IA__gtk_window_get_group - -+extern __typeof (gtk_window_get_has_resize_grip) IA__gtk_window_get_has_resize_grip __attribute((visibility("hidden"))); -+#define gtk_window_get_has_resize_grip IA__gtk_window_get_has_resize_grip -+ - extern __typeof (gtk_window_get_icon) IA__gtk_window_get_icon __attribute((visibility("hidden"))); - #define gtk_window_get_icon IA__gtk_window_get_icon - -@@ -12851,6 +12854,9 @@ - extern __typeof (gtk_window_get_resizable) IA__gtk_window_get_resizable __attribute((visibility("hidden"))); - #define gtk_window_get_resizable IA__gtk_window_get_resizable - -+extern __typeof (gtk_window_get_resize_grip_area) IA__gtk_window_get_resize_grip_area __attribute((visibility("hidden"))); -+#define gtk_window_get_resize_grip_area IA__gtk_window_get_resize_grip_area -+ - extern __typeof (gtk_window_get_role) IA__gtk_window_get_role __attribute((visibility("hidden"))); - #define gtk_window_get_role IA__gtk_window_get_role - -@@ -12956,6 +12962,9 @@ - extern __typeof (gtk_window_resize) IA__gtk_window_resize __attribute((visibility("hidden"))); - #define gtk_window_resize IA__gtk_window_resize - -+extern __typeof (gtk_window_resize_grip_is_visible) IA__gtk_window_resize_grip_is_visible __attribute((visibility("hidden"))); -+#define gtk_window_resize_grip_is_visible IA__gtk_window_resize_grip_is_visible -+ - extern __typeof (gtk_window_set_accept_focus) IA__gtk_window_set_accept_focus __attribute((visibility("hidden"))); - #define gtk_window_set_accept_focus IA__gtk_window_set_accept_focus - -Index: gtk+-2.24.4/gtk/gtkaliasdef.c -=================================================================== ---- gtk+-2.24.4.orig/gtk/gtkaliasdef.c 2011-04-02 08:43:10.000000000 +1100 -+++ gtk+-2.24.4/gtk/gtkaliasdef.c 2011-04-04 10:58:00.246596968 +1000 -@@ -12830,6 +12830,9 @@ - #undef gtk_window_get_group - extern __typeof (gtk_window_get_group) gtk_window_get_group __attribute((alias("IA__gtk_window_get_group"), visibility("default"))); - -+#undef gtk_window_get_has_resize_grip -+extern __typeof (gtk_window_get_has_resize_grip) gtk_window_get_has_resize_grip __attribute((alias("IA__gtk_window_get_has_resize_grip"), visibility("default"))); -+ - #undef gtk_window_get_icon - extern __typeof (gtk_window_get_icon) gtk_window_get_icon __attribute((alias("IA__gtk_window_get_icon"), visibility("default"))); - -@@ -12854,6 +12857,9 @@ - #undef gtk_window_get_resizable - extern __typeof (gtk_window_get_resizable) gtk_window_get_resizable __attribute((alias("IA__gtk_window_get_resizable"), visibility("default"))); - -+#undef gtk_window_get_resize_grip_area -+extern __typeof (gtk_window_get_resize_grip_area) gtk_window_get_resize_grip_area __attribute((alias("IA__gtk_window_get_resize_grip_area"), visibility("default"))); -+ - #undef gtk_window_get_role - extern __typeof (gtk_window_get_role) gtk_window_get_role __attribute((alias("IA__gtk_window_get_role"), visibility("default"))); - -@@ -12959,6 +12965,9 @@ - #undef gtk_window_resize - extern __typeof (gtk_window_resize) gtk_window_resize __attribute((alias("IA__gtk_window_resize"), visibility("default"))); - -+#undef gtk_window_resize_grip_is_visible -+extern __typeof (gtk_window_resize_grip_is_visible) gtk_window_resize_grip_is_visible __attribute((alias("IA__gtk_window_resize_grip_is_visible"), visibility("default"))); -+ - #undef gtk_window_set_accept_focus - extern __typeof (gtk_window_set_accept_focus) gtk_window_set_accept_focus __attribute((alias("IA__gtk_window_set_accept_focus"), visibility("default"))); - -Index: gtk+-2.24.4/gtk/gtkassistant.c -=================================================================== ---- gtk+-2.24.4.orig/gtk/gtkassistant.c 2011-02-20 01:31:37.000000000 +1100 -+++ gtk+-2.24.4/gtk/gtkassistant.c 2011-04-04 10:58:00.246596968 +1000 -@@ -1413,6 +1413,9 @@ - { - container = GTK_CONTAINER (widget); - -+ if (GTK_WIDGET_CLASS (gtk_assistant_parent_class)->expose_event) -+ GTK_WIDGET_CLASS (gtk_assistant_parent_class)->expose_event (widget, event); -+ - assistant_paint_colored_box (widget); - - gtk_container_propagate_expose (container, priv->header_image, event); -Index: gtk+-2.24.4/gtk/gtkrange.c -=================================================================== ---- gtk+-2.24.4.orig/gtk/gtkrange.c 2011-03-18 11:14:36.000000000 +1100 -+++ gtk+-2.24.4/gtk/gtkrange.c 2011-04-04 10:58:00.246596968 +1000 -@@ -39,6 +39,7 @@ - #include "gtkrange.h" - #include "gtkscale.h" - #include "gtkscrollbar.h" -+#include "gtkwindow.h" - #include "gtkprivate.h" - #include "gtkintl.h" - #include "gtkalias.h" -@@ -149,6 +150,8 @@ - GtkRequisition *requisition); - static void gtk_range_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); -+static void gtk_range_hierarchy_changed (GtkWidget *widget, -+ GtkWidget *previous_toplevel); - static void gtk_range_realize (GtkWidget *widget); - static void gtk_range_unrealize (GtkWidget *widget); - static void gtk_range_map (GtkWidget *widget); -@@ -179,6 +182,8 @@ - gint mouse_x, - gint mouse_y); - static void stop_scrolling (GtkRange *range); -+static gboolean modify_allocation_for_window_grip (GtkWidget *widget, -+ GtkAllocation *allocation); - - /* Range methods */ - -@@ -257,8 +262,9 @@ - - widget_class->size_request = gtk_range_size_request; - widget_class->size_allocate = gtk_range_size_allocate; -+ widget_class->hierarchy_changed = gtk_range_hierarchy_changed; - widget_class->realize = gtk_range_realize; -- widget_class->unrealize = gtk_range_unrealize; -+ widget_class->unrealize = gtk_range_unrealize; - widget_class->map = gtk_range_map; - widget_class->unmap = gtk_range_unmap; - widget_class->expose_event = gtk_range_expose; -@@ -1534,6 +1540,67 @@ - requisition->height = range_rect.height + border.top + border.bottom; - } - -+static gboolean -+modify_allocation_for_window_grip (GtkWidget *widget, -+ GtkAllocation *allocation) -+{ -+ GtkRange *range = GTK_RANGE (widget); -+ GtkWidget *window; -+ GdkRectangle grip_rect; -+ GdkRectangle translated_rect; -+ gint border_width; -+ gint x; -+ gint y; -+ -+ window = gtk_widget_get_toplevel (widget); -+ if (!GTK_IS_WINDOW (window)) -+ return FALSE; -+ -+ if (!gtk_window_resize_grip_is_visible (GTK_WINDOW (window))) -+ return FALSE; -+ -+ /* Get the area of the window's corner grip */ -+ gtk_window_get_resize_grip_area (GTK_WINDOW (window), &grip_rect); -+ -+ x = 0; -+ y = 0; -+ -+ /* Translate the stepper's area into window coords */ -+ if (gtk_widget_translate_coordinates (gtk_widget_get_parent (widget), -+ window, -+ allocation->x, -+ allocation->y, -+ &x, -+ &y)) -+ { -+ translated_rect.x = x; -+ translated_rect.y = y; -+ translated_rect.width = allocation->width; -+ translated_rect.height = allocation->height; -+ -+ border_width = gtk_container_get_border_width (GTK_CONTAINER (window)); -+ -+ /* If the stepper button intersects the window resize grip.. */ -+ if (gdk_rectangle_intersect (&grip_rect, &translated_rect, NULL)) -+ { -+ if (range->orientation == GTK_ORIENTATION_HORIZONTAL) -+ { -+ allocation->width -= (grip_rect.width - border_width); -+ if (gtk_widget_get_direction (window) == GTK_TEXT_DIR_RTL) -+ allocation->x += grip_rect.width; -+ } -+ else -+ { -+ allocation->height -= (grip_rect.height - border_width); -+ } -+ -+ return TRUE; -+ } -+ } -+ -+ return FALSE; -+} -+ - static void - gtk_range_size_allocate (GtkWidget *widget, - GtkAllocation *allocation) -@@ -1542,6 +1609,7 @@ - - range = GTK_RANGE (widget); - -+ modify_allocation_for_window_grip (widget, allocation); - widget->allocation = *allocation; - - range->layout->recalc_marks = TRUE; -@@ -1558,11 +1626,36 @@ - } - - static void -+resize_grip_visible_changed (GObject *object, -+ GParamSpec *pspec, -+ gpointer user_data) -+{ -+ gtk_widget_queue_resize (GTK_WIDGET (user_data)); -+} -+ -+static void -+gtk_range_hierarchy_changed (GtkWidget *widget, -+ GtkWidget *previous_toplevel) -+{ -+ GtkWidget *window; -+ -+ if (previous_toplevel) -+ g_signal_handlers_disconnect_by_func (previous_toplevel, -+ G_CALLBACK (resize_grip_visible_changed), -+ widget); -+ window = gtk_widget_get_toplevel (widget); -+ if (GTK_IS_WINDOW (window)) -+ g_signal_connect (window, "notify::resize-grip-visible", -+ G_CALLBACK (resize_grip_visible_changed), widget); -+} -+ -+static void - gtk_range_realize (GtkWidget *widget) - { - GtkRange *range; - GdkWindowAttr attributes; -- gint attributes_mask; -+ gint attributes_mask; -+ GtkAllocation allocation; - - range = GTK_RANGE (widget); - -@@ -1572,7 +1665,11 @@ - - widget->window = gtk_widget_get_parent_window (widget); - g_object_ref (widget->window); -- -+ -+ gtk_widget_get_allocation (widget, &allocation); -+ if (modify_allocation_for_window_grip (widget, &allocation)) -+ gtk_widget_set_allocation (widget, &allocation); -+ - attributes.window_type = GDK_WINDOW_CHILD; - attributes.x = widget->allocation.x; - attributes.y = widget->allocation.y; -Index: gtk+-2.24.4/gtk/gtkstatusbar.c -=================================================================== ---- gtk+-2.24.4.orig/gtk/gtkstatusbar.c 2011-02-20 01:31:37.000000000 +1100 -+++ gtk+-2.24.4/gtk/gtkstatusbar.c 2011-04-04 10:58:00.246596968 +1000 -@@ -72,20 +72,8 @@ - static void gtk_statusbar_unrealize (GtkWidget *widget); - static void gtk_statusbar_map (GtkWidget *widget); - static void gtk_statusbar_unmap (GtkWidget *widget); --static gboolean gtk_statusbar_button_press (GtkWidget *widget, -- GdkEventButton *event); --static gboolean gtk_statusbar_expose_event (GtkWidget *widget, -- GdkEventExpose *event); --static void gtk_statusbar_size_request (GtkWidget *widget, -- GtkRequisition *requisition); - static void gtk_statusbar_size_allocate (GtkWidget *widget, - GtkAllocation *allocation); --static void gtk_statusbar_direction_changed (GtkWidget *widget, -- GtkTextDirection prev_dir); --static void gtk_statusbar_state_changed (GtkWidget *widget, -- GtkStateType previous_state); --static void gtk_statusbar_create_window (GtkStatusbar *statusbar); --static void gtk_statusbar_destroy_window (GtkStatusbar *statusbar); - static void gtk_statusbar_get_property (GObject *object, - guint prop_id, - GValue *value, -@@ -125,13 +113,8 @@ - widget_class->unrealize = gtk_statusbar_unrealize; - widget_class->map = gtk_statusbar_map; - widget_class->unmap = gtk_statusbar_unmap; -- widget_class->button_press_event = gtk_statusbar_button_press; -- widget_class->expose_event = gtk_statusbar_expose_event; -- widget_class->size_request = gtk_statusbar_size_request; - widget_class->size_allocate = gtk_statusbar_size_allocate; -- widget_class->direction_changed = gtk_statusbar_direction_changed; -- widget_class->state_changed = gtk_statusbar_state_changed; -- -+ - class->text_pushed = gtk_statusbar_update; - class->text_popped = gtk_statusbar_update; - -@@ -550,21 +533,7 @@ - if (setting != statusbar->has_resize_grip) - { - statusbar->has_resize_grip = setting; -- gtk_widget_queue_resize (statusbar->label); -- gtk_widget_queue_draw (GTK_WIDGET (statusbar)); - -- if (gtk_widget_get_realized (GTK_WIDGET (statusbar))) -- { -- if (statusbar->has_resize_grip && statusbar->grip_window == NULL) -- { -- gtk_statusbar_create_window (statusbar); -- if (gtk_widget_get_mapped (GTK_WIDGET (statusbar))) -- gdk_window_show (statusbar->grip_window); -- } -- else if (!statusbar->has_resize_grip && statusbar->grip_window != NULL) -- gtk_statusbar_destroy_window (statusbar); -- } -- - g_object_notify (G_OBJECT (statusbar), "has-resize-grip"); - } - } -@@ -678,123 +647,6 @@ - } - - static void --get_grip_rect (GtkStatusbar *statusbar, -- GdkRectangle *rect) --{ -- GtkWidget *widget; -- gint w, h; -- -- widget = GTK_WIDGET (statusbar); -- -- /* These are in effect the max/default size of the grip. */ -- w = 18; -- h = 18; -- -- if (w > widget->allocation.width) -- w = widget->allocation.width; -- -- if (h > widget->allocation.height - widget->style->ythickness) -- h = widget->allocation.height - widget->style->ythickness; -- -- rect->width = w; -- rect->height = h; -- rect->y = widget->allocation.y + widget->allocation.height - h; -- -- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) -- rect->x = widget->allocation.x + widget->allocation.width - w; -- else -- rect->x = widget->allocation.x + widget->style->xthickness; --} -- --static void --set_grip_cursor (GtkStatusbar *statusbar) --{ -- if (statusbar->has_resize_grip && statusbar->grip_window != NULL) -- { -- GtkWidget *widget = GTK_WIDGET (statusbar); -- GdkDisplay *display = gtk_widget_get_display (widget); -- GdkCursorType cursor_type; -- GdkCursor *cursor; -- -- if (gtk_widget_is_sensitive (widget)) -- { -- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) -- cursor_type = GDK_BOTTOM_RIGHT_CORNER; -- else -- cursor_type = GDK_BOTTOM_LEFT_CORNER; -- -- cursor = gdk_cursor_new_for_display (display, cursor_type); -- gdk_window_set_cursor (statusbar->grip_window, cursor); -- gdk_cursor_unref (cursor); -- } -- else -- gdk_window_set_cursor (statusbar->grip_window, NULL); -- } --} -- --static void --gtk_statusbar_create_window (GtkStatusbar *statusbar) --{ -- GtkWidget *widget; -- GdkWindowAttr attributes; -- gint attributes_mask; -- GdkRectangle rect; -- -- widget = GTK_WIDGET (statusbar); -- -- g_return_if_fail (gtk_widget_get_realized (widget)); -- g_return_if_fail (statusbar->has_resize_grip); -- -- get_grip_rect (statusbar, &rect); -- -- attributes.x = rect.x; -- attributes.y = rect.y; -- attributes.width = rect.width; -- attributes.height = rect.height; -- attributes.window_type = GDK_WINDOW_CHILD; -- attributes.wclass = GDK_INPUT_ONLY; -- attributes.event_mask = gtk_widget_get_events (widget) | -- GDK_BUTTON_PRESS_MASK; -- -- attributes_mask = GDK_WA_X | GDK_WA_Y; -- -- statusbar->grip_window = gdk_window_new (widget->window, -- &attributes, attributes_mask); -- -- gdk_window_set_user_data (statusbar->grip_window, widget); -- -- gdk_window_raise (statusbar->grip_window); -- -- set_grip_cursor (statusbar); --} -- --static void --gtk_statusbar_direction_changed (GtkWidget *widget, -- GtkTextDirection prev_dir) --{ -- GtkStatusbar *statusbar = GTK_STATUSBAR (widget); -- -- set_grip_cursor (statusbar); --} -- --static void --gtk_statusbar_state_changed (GtkWidget *widget, -- GtkStateType previous_state) --{ -- GtkStatusbar *statusbar = GTK_STATUSBAR (widget); -- -- set_grip_cursor (statusbar); --} -- --static void --gtk_statusbar_destroy_window (GtkStatusbar *statusbar) --{ -- gdk_window_set_user_data (statusbar->grip_window, NULL); -- gdk_window_destroy (statusbar->grip_window); -- statusbar->grip_window = NULL; --} -- --static void - gtk_statusbar_realize (GtkWidget *widget) - { - GtkStatusbar *statusbar; -@@ -802,9 +654,6 @@ - statusbar = GTK_STATUSBAR (widget); - - GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->realize (widget); -- -- if (statusbar->has_resize_grip) -- gtk_statusbar_create_window (statusbar); - } - - static void -@@ -814,9 +663,6 @@ - - statusbar = GTK_STATUSBAR (widget); - -- if (statusbar->grip_window) -- gtk_statusbar_destroy_window (statusbar); -- - GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->unrealize (widget); - } - -@@ -828,9 +674,6 @@ - statusbar = GTK_STATUSBAR (widget); - - GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->map (widget); -- -- if (statusbar->grip_window) -- gdk_window_show (statusbar->grip_window); - } - - static void -@@ -840,103 +683,9 @@ - - statusbar = GTK_STATUSBAR (widget); - -- if (statusbar->grip_window) -- gdk_window_hide (statusbar->grip_window); -- - GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->unmap (widget); - } - --static gboolean --gtk_statusbar_button_press (GtkWidget *widget, -- GdkEventButton *event) --{ -- GtkStatusbar *statusbar; -- GtkWidget *ancestor; -- GdkWindowEdge edge; -- -- statusbar = GTK_STATUSBAR (widget); -- -- if (!statusbar->has_resize_grip || -- event->type != GDK_BUTTON_PRESS || -- event->window != statusbar->grip_window) -- return FALSE; -- -- ancestor = gtk_widget_get_toplevel (widget); -- -- if (!GTK_IS_WINDOW (ancestor)) -- return FALSE; -- -- edge = get_grip_edge (statusbar); -- -- if (event->button == 1) -- gtk_window_begin_resize_drag (GTK_WINDOW (ancestor), -- edge, -- event->button, -- event->x_root, event->y_root, -- event->time); -- else if (event->button == 2) -- gtk_window_begin_move_drag (GTK_WINDOW (ancestor), -- event->button, -- event->x_root, event->y_root, -- event->time); -- else -- return FALSE; -- -- return TRUE; --} -- --static gboolean --gtk_statusbar_expose_event (GtkWidget *widget, -- GdkEventExpose *event) --{ -- GtkStatusbar *statusbar; -- GdkRectangle rect; -- -- statusbar = GTK_STATUSBAR (widget); -- -- GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->expose_event (widget, event); -- -- if (statusbar->has_resize_grip) -- { -- GdkWindowEdge edge; -- -- edge = get_grip_edge (statusbar); -- -- get_grip_rect (statusbar, &rect); -- -- gtk_paint_resize_grip (widget->style, -- widget->window, -- gtk_widget_get_state (widget), -- &event->area, -- widget, -- "statusbar", -- edge, -- rect.x, rect.y, -- /* don't draw grip over the frame, though you -- * can click on the frame. -- */ -- rect.width - widget->style->xthickness, -- rect.height - widget->style->ythickness); -- } -- -- return FALSE; --} -- --static void --gtk_statusbar_size_request (GtkWidget *widget, -- GtkRequisition *requisition) --{ -- GtkStatusbar *statusbar; -- GtkShadowType shadow_type; -- -- statusbar = GTK_STATUSBAR (widget); -- -- gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow-type", &shadow_type, NULL); -- gtk_frame_set_shadow_type (GTK_FRAME (statusbar->frame), shadow_type); -- -- GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->size_request (widget, requisition); --} -- - /* look for extra children between the frame containing - * the label and where we want to draw the resize grip - */ -@@ -979,40 +728,62 @@ - { - GtkStatusbar *statusbar = GTK_STATUSBAR (widget); - gboolean extra_children = FALSE; -+ gboolean has_resize_grip = FALSE; - GdkRectangle rect; -- -- if (statusbar->has_resize_grip) -- { -- get_grip_rect (statusbar, &rect); -- -- extra_children = has_extra_children (statusbar); -- -- /* If there are extra children, we don't want them to occupy -- * the space where we draw the resize grip, so we temporarily -- * shrink the allocation. -- * If there are no extra children, we want the frame to get -- * the full allocation, and we fix up the allocation of the -- * label afterwards to make room for the grip. -- */ -- if (extra_children) -- { -- allocation->width -= rect.width; -- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) -- allocation->x += rect.width; -- } -+ GtkWidget *window; -+ gint x, y; -+ GdkRectangle translated_rect; -+ -+ window = gtk_widget_get_toplevel (widget); -+ if (GTK_IS_WINDOW (window) && gtk_window_resize_grip_is_visible (GTK_WINDOW (window))) -+ { -+ gtk_window_get_resize_grip_area (GTK_WINDOW (window), &rect); -+ -+ if (gtk_widget_translate_coordinates (gtk_widget_get_parent (widget), -+ window, -+ allocation->x, -+ allocation->y, -+ &x, -+ &y)) -+ { -+ translated_rect.x = x; -+ translated_rect.y = y; -+ translated_rect.width = allocation->width; -+ translated_rect.height = allocation->height; -+ -+ if (gdk_rectangle_intersect (&rect, &translated_rect, NULL)) -+ { -+ has_resize_grip = TRUE; -+ extra_children = has_extra_children (statusbar); -+ -+ /* If there are extra children, we don't want them to occupy -+ * the space where we draw the resize grip, so we temporarily -+ * shrink the allocation. -+ * If there are no extra children, we want the frame to get -+ * the full allocation, and we fix up the allocation of the -+ * label afterwards to make room for the grip. -+ */ -+ if (extra_children) -+ { -+ allocation->width -= rect.width; -+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) -+ allocation->x += rect.width; -+ } -+ } -+ } - } - - /* chain up normally */ - GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->size_allocate (widget, allocation); - -- if (statusbar->has_resize_grip) -+ if (has_resize_grip) - { -- if (extra_children) -- { -- allocation->width += rect.width; -- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) -- allocation->x -= rect.width; -- -+ if (extra_children) -+ { -+ allocation->width += rect.width; -+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) -+ allocation->x -= rect.width; -+ - widget->allocation = *allocation; - } - else -@@ -1036,17 +807,6 @@ - gtk_widget_size_allocate (child, allocation); - } - } -- -- if (statusbar->grip_window) -- { -- get_grip_rect (statusbar, &rect); -- -- gdk_window_raise (statusbar->grip_window); -- gdk_window_move_resize (statusbar->grip_window, -- rect.x, rect.y, -- rect.width, rect.height); -- } -- - } - } - -Index: gtk+-2.24.4/gtk/gtkwindow.c -=================================================================== ---- gtk+-2.24.4.orig/gtk/gtkwindow.c 2011-04-04 10:57:59.406596969 +1000 -+++ gtk+-2.24.4/gtk/gtkwindow.c 2011-04-04 10:58:00.246596968 +1000 -@@ -95,6 +95,8 @@ - PROP_TRANSIENT_FOR, - PROP_OPACITY, - PROP_NO_PROXY, -+ PROP_HAS_RESIZE_GRIP, -+ PROP_RESIZE_GRIP_VISIBLE, - - /* Readonly properties */ - PROP_IS_ACTIVE, -@@ -198,6 +200,10 @@ - - gboolean no_proxy; - -+ gboolean has_resize_grip; -+ GdkWindow *grip_window; -+ gboolean resize_grip_visible; -+ - gchar *startup_id; - }; - -@@ -226,6 +232,8 @@ - GdkEventKey *event); - static gint gtk_window_key_release_event (GtkWidget *widget, - GdkEventKey *event); -+static gint gtk_window_button_press_event (GtkWidget *widget, -+ GdkEventButton *event); - static gint gtk_window_enter_notify_event (GtkWidget *widget, - GdkEventCrossing *event); - static gint gtk_window_leave_notify_event (GtkWidget *widget, -@@ -236,11 +244,17 @@ - GdkEventFocus *event); - static gint gtk_window_client_event (GtkWidget *widget, - GdkEventClient *event); -+static gboolean gtk_window_state_event (GtkWidget *widget, -+ GdkEventWindowState *event); - static void gtk_window_check_resize (GtkContainer *container); - static gint gtk_window_focus (GtkWidget *widget, - GtkDirectionType direction); - static void gtk_window_real_set_focus (GtkWindow *window, - GtkWidget *focus); -+static void gtk_window_direction_changed (GtkWidget *widget, -+ GtkTextDirection prev_dir); -+static void gtk_window_state_changed (GtkWidget *widget, -+ GtkStateType previous_state); - - static void gtk_window_real_activate_default (GtkWindow *window); - static void gtk_window_real_activate_focus (GtkWindow *window); -@@ -300,6 +314,10 @@ - const gchar *name); - static void gtk_window_realize_icon (GtkWindow *window); - static void gtk_window_unrealize_icon (GtkWindow *window); -+static void resize_grip_create_window (GtkWindow *window); -+static void resize_grip_destroy_window (GtkWindow *window); -+static void update_grip_visibility (GtkWindow *window); -+ - - static void gtk_window_notify_keys_changed (GtkWindow *window); - static GtkKeyHash *gtk_window_get_key_hash (GtkWindow *window); -@@ -462,10 +480,14 @@ - widget_class->enter_notify_event = gtk_window_enter_notify_event; - widget_class->leave_notify_event = gtk_window_leave_notify_event; - widget_class->focus_in_event = gtk_window_focus_in_event; -+ widget_class->button_press_event = gtk_window_button_press_event; - widget_class->focus_out_event = gtk_window_focus_out_event; - widget_class->client_event = gtk_window_client_event; - widget_class->focus = gtk_window_focus; - widget_class->expose_event = gtk_window_expose; -+ widget_class->window_state_event = gtk_window_state_event; -+ widget_class->direction_changed = gtk_window_direction_changed; -+ widget_class->state_changed = gtk_window_state_changed; - - container_class->check_resize = gtk_window_check_resize; - -@@ -514,6 +536,42 @@ - GTK_PARAM_READWRITE)); - - /** -+ * GtkWindow:has-resize-grip -+ * -+ * Whether the window has a corner resize grip. -+ * -+ * Note that the resize grip is only shown if the window is -+ * actually resizable and not maximized. Use -+ * #GtkWindow:resize-grip-visible to find out if the resize -+ * grip is currently shown. -+ * -+ * Since: 3.0 -+ */ -+ g_object_class_install_property (gobject_class, -+ PROP_HAS_RESIZE_GRIP, -+ g_param_spec_boolean ("has-resize-grip", -+ P_("Resize grip"), -+ P_("Specifies whether the window should have a resize grip"), -+ TRUE, -+ GTK_PARAM_READWRITE)); -+ -+ /** -+ * GtkWindow: resize-grip-visible: -+ * -+ * Whether a corner resize grip is currently shown. -+ * -+ * Since: 3.0 -+ */ -+ g_object_class_install_property (gobject_class, -+ PROP_RESIZE_GRIP_VISIBLE, -+ g_param_spec_boolean ("resize-grip-visible", -+ P_("Resize grip is visible"), -+ P_("Specifies whether the window's resize grip is visible."), -+ FALSE, -+ GTK_PARAM_READABLE)); -+ -+ -+ /** - * GtkWindow:startup-id: - * - * The :startup-id is a write-only property for setting window's -@@ -816,6 +874,21 @@ - 1.0, - GTK_PARAM_READWRITE)); - -+ /* Style properties. -+ */ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("resize-grip-width", -+ P_("Width of resize grip"), -+ P_("Width of resize grip"), -+ 0, G_MAXINT, 16, GTK_PARAM_READWRITE)); -+ -+ gtk_widget_class_install_style_property (widget_class, -+ g_param_spec_int ("resize-grip-height", -+ P_("Height of resize grip"), -+ P_("Height of resize grip"), -+ 0, G_MAXINT, 16, GTK_PARAM_READWRITE)); -+ -+ - window_signals[SET_FOCUS] = - g_signal_new (I_("set-focus"), - G_TYPE_FROM_CLASS (gobject_class), -@@ -967,6 +1040,7 @@ - priv->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL; - priv->opacity = 1.0; - priv->startup_id = NULL; -+ priv->has_resize_grip = TRUE; - priv->mnemonics_visible = TRUE; - - colormap = _gtk_widget_peek_colormap (); -@@ -1020,9 +1094,7 @@ - g_object_notify (G_OBJECT (window), "resizable"); - break; - case PROP_RESIZABLE: -- window->allow_grow = g_value_get_boolean (value); -- gtk_widget_queue_resize (GTK_WIDGET (window)); -- g_object_notify (G_OBJECT (window), "allow-grow"); -+ gtk_window_set_resizable (window, g_value_get_boolean (value)); - break; - case PROP_MODAL: - gtk_window_set_modal (window, g_value_get_boolean (value)); -@@ -1092,6 +1164,9 @@ - case PROP_OPACITY: - gtk_window_set_opacity (window, g_value_get_double (value)); - break; -+ case PROP_HAS_RESIZE_GRIP: -+ gtk_window_set_has_resize_grip (window, g_value_get_boolean (value)); -+ break; - case PROP_MNEMONICS_VISIBLE: - gtk_window_set_mnemonics_visible (window, g_value_get_boolean (value)); - break; -@@ -1213,6 +1288,12 @@ - case PROP_OPACITY: - g_value_set_double (value, gtk_window_get_opacity (window)); - break; -+ case PROP_HAS_RESIZE_GRIP: -+ g_value_set_boolean (value, priv->has_resize_grip); -+ break; -+ case PROP_RESIZE_GRIP_VISIBLE: -+ g_value_set_boolean (value, gtk_window_resize_grip_is_visible (window)); -+ break; - case PROP_MNEMONICS_VISIBLE: - g_value_set_boolean (value, priv->mnemonics_visible); - break; -@@ -4656,6 +4737,9 @@ - if (window->frame) - gdk_window_show (window->frame); - -+ if (priv->grip_window) -+ gdk_window_show (priv->grip_window); -+ - if (!disable_startup_notification) - { - /* Do we have a custom startup-notification id? */ -@@ -4871,6 +4955,9 @@ - if (window->frame) - gtk_style_set_background (widget->style, window->frame, GTK_STATE_NORMAL); - -+ if (priv->grip_window) -+ gtk_style_set_background (widget->style, priv->grip_window, GTK_STATE_NORMAL); -+ - /* This is a bad hack to set the window background. */ - gtk_window_paint (widget, NULL); - -@@ -4922,15 +5009,20 @@ - - /* Icons */ - gtk_window_realize_icon (window); -+ -+ if (priv->has_resize_grip) -+ resize_grip_create_window (window); - } - - static void - gtk_window_unrealize (GtkWidget *widget) - { - GtkWindow *window; -+ GtkWindowPrivate *priv; - GtkWindowGeometryInfo *info; - - window = GTK_WINDOW (widget); -+ priv = GTK_WINDOW_GET_PRIVATE (widget); - - /* On unrealize, we reset the size of the window such - * that we will re-apply the default sizing stuff -@@ -4962,9 +5054,146 @@ - /* Icons */ - gtk_window_unrealize_icon (window); - -+ if (priv->grip_window != NULL) -+ resize_grip_destroy_window (window); -+ - GTK_WIDGET_CLASS (gtk_window_parent_class)->unrealize (widget); - } - -+static GdkWindowEdge -+get_grip_edge (GtkWidget *widget) -+{ -+ return gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ? GDK_WINDOW_EDGE_SOUTH_EAST : GDK_WINDOW_EDGE_SOUTH_WEST; -+} -+ -+static gboolean -+get_drag_edge (GtkWidget *widget, -+ GdkWindowEdge *edge) -+{ -+ GtkTextDirection dir; -+ -+ dir = gtk_widget_get_direction (widget); -+ -+ if (!GTK_WINDOW (widget)->allow_grow) -+ return FALSE; -+ -+ *edge = dir == GTK_TEXT_DIR_LTR ? GDK_WINDOW_EDGE_SOUTH_EAST : GDK_WINDOW_EDGE_SOUTH_WEST; -+ -+ return TRUE; -+} -+ -+static void -+set_grip_cursor (GtkWindow *window) -+{ -+ GtkWidget *widget = GTK_WIDGET (window); -+ GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE(window); -+ -+ if (priv->grip_window == NULL) -+ return; -+ -+ if (gtk_widget_is_sensitive (widget)) -+ { -+ GdkWindowEdge edge; -+ GdkDisplay *display; -+ GdkCursorType cursor_type; -+ GdkCursor *cursor; -+ -+ cursor_type = GDK_LEFT_PTR; -+ -+ if (get_drag_edge (widget, &edge)) -+ { -+ switch (edge) -+ { -+ case GDK_WINDOW_EDGE_EAST: -+ cursor_type = GDK_RIGHT_SIDE; -+ break; -+ case GDK_WINDOW_EDGE_SOUTH_EAST: -+ cursor_type = GDK_BOTTOM_RIGHT_CORNER; -+ break; -+ case GDK_WINDOW_EDGE_SOUTH: -+ cursor_type = GDK_BOTTOM_SIDE; -+ break; -+ case GDK_WINDOW_EDGE_SOUTH_WEST: -+ cursor_type = GDK_BOTTOM_LEFT_CORNER; -+ break; -+ case GDK_WINDOW_EDGE_WEST: -+ cursor_type = GDK_LEFT_SIDE; -+ break; -+ default: ; -+ } -+ } -+ -+ display = gtk_widget_get_display (widget); -+ cursor = gdk_cursor_new_for_display (display, cursor_type); -+ gdk_window_set_cursor (priv->grip_window, cursor); -+ gdk_cursor_unref (cursor); -+ } -+ else -+ gdk_window_set_cursor (priv->grip_window, NULL); -+} -+ -+static void -+set_grip_shape (GtkWindow *window) -+{ -+ GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window); -+ GdkDrawable *mask; -+ cairo_t *cr; -+ gint width, height; -+ -+ if (priv->grip_window == NULL) -+ return; -+ -+ gdk_window_get_geometry (priv->grip_window, -+ NULL, NULL, -+ &width, &height, -+ NULL); -+ -+ mask = (GdkDrawable *) gdk_pixmap_new (NULL, width, height, 1); -+ -+ cr = gdk_cairo_create (mask); -+ -+ cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE); -+ cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0); -+ cairo_paint (cr); -+ cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 1.0); -+ -+ if (get_grip_edge (GTK_WIDGET (window)) == GDK_WINDOW_EDGE_SOUTH_EAST) -+ { -+ cairo_move_to (cr, width, 0.0); -+ cairo_line_to (cr, width, height); -+ cairo_line_to (cr, 0.0, height); -+ } -+ else -+ { -+ cairo_move_to (cr, 0.0, 0.0); -+ cairo_line_to (cr, width, height); -+ cairo_line_to (cr, 0.0, height); -+ } -+ -+ cairo_close_path (cr); -+ cairo_fill (cr); -+ cairo_destroy (cr); -+ -+ gdk_window_shape_combine_mask (priv->grip_window, NULL, 0, 0); -+ gdk_window_shape_combine_mask (priv->grip_window, mask, 0, 0); -+} -+ -+static void -+set_grip_position (GtkWindow *window) -+{ -+ GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE(window); -+ GdkRectangle rect; -+ -+ if (priv->grip_window == NULL) -+ return; -+ -+ gtk_window_get_resize_grip_area (window, &rect); -+ gdk_window_raise (priv->grip_window); -+ gdk_window_move_resize (priv->grip_window, -+ rect.x, rect.y, -+ rect.width, rect.height); -+} -+ - static void - gtk_window_size_request (GtkWidget *widget, - GtkRequisition *requisition) -@@ -5011,14 +5240,293 @@ - gtk_widget_size_allocate (window->bin.child, &child_allocation); - } - -- if (gtk_widget_get_realized (widget) && window->frame) -+ if (gtk_widget_get_realized (widget)) - { -- gdk_window_resize (window->frame, -- allocation->width + window->frame_left + window->frame_right, -- allocation->height + window->frame_top + window->frame_bottom); -+ if (window->frame) -+ { -+ gdk_window_resize (window->frame, -+ allocation->width + window->frame_left + window->frame_right, -+ allocation->height + window->frame_top + window->frame_bottom); -+ } -+ -+ update_grip_visibility (window); -+ set_grip_position (window); - } - } - -+static gboolean -+gtk_window_state_event (GtkWidget *widget, -+ GdkEventWindowState *event) -+{ -+ update_grip_visibility (GTK_WINDOW (widget)); -+ -+ return FALSE; -+} -+ -+static void -+gtk_window_direction_changed (GtkWidget *widget, -+ GtkTextDirection prev_dir) -+{ -+ GtkWindow *window = GTK_WINDOW (widget); -+ -+ set_grip_cursor (window); -+ set_grip_position (window); -+ set_grip_shape (window); -+} -+ -+static void -+gtk_window_state_changed (GtkWidget *widget, -+ GtkStateType previous_state) -+{ -+ GtkWindow *window = GTK_WINDOW (widget); -+ -+ set_grip_cursor (window); -+ update_grip_visibility (window); -+} -+ -+static void -+resize_grip_create_window (GtkWindow *window) -+{ -+ GtkWidget *widget; -+ GtkWindowPrivate *priv; -+ GdkWindowAttr attributes; -+ gint attributes_mask; -+ GdkRectangle rect; -+ -+ priv = GTK_WINDOW_GET_PRIVATE(window); -+ widget = GTK_WIDGET (window); -+ -+ g_return_if_fail (gtk_widget_get_realized (widget)); -+ g_return_if_fail (priv->grip_window == NULL); -+ -+ gtk_window_get_resize_grip_area (window, &rect); -+ -+ attributes.x = rect.x; -+ attributes.y = rect.y; -+ attributes.width = rect.width; -+ attributes.height = rect.height; -+ attributes.window_type = GDK_WINDOW_CHILD; -+ attributes.wclass = GDK_INPUT_OUTPUT; -+ attributes.visual = gtk_widget_get_visual (widget); -+ attributes.event_mask = gtk_widget_get_events (widget) | -+ GDK_EXPOSURE_MASK | -+ GDK_BUTTON_PRESS_MASK; -+ -+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; -+ -+ priv->grip_window = gdk_window_new (gtk_widget_get_window (widget), -+ &attributes, -+ attributes_mask); -+ -+ gdk_window_set_user_data (priv->grip_window, widget); -+ -+ gdk_window_raise (priv->grip_window); -+ -+ set_grip_cursor (window); -+ set_grip_shape (window); -+ update_grip_visibility (window); -+} -+ -+static void -+resize_grip_destroy_window (GtkWindow *window) -+{ -+ GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE(window); -+ -+ gdk_window_set_user_data (priv->grip_window, NULL); -+ gdk_window_destroy (priv->grip_window); -+ priv->grip_window = NULL; -+ update_grip_visibility (window); -+} -+ -+/** -+ * gtk_window_set_has_resize_grip: -+ * @window: a #GtkWindow -+ * @value: %TRUE to allow a resize grip -+ * -+ * Sets whether @window has a corner resize grip. -+ * -+ * Note that the resize grip is only shown if the window -+ * is actually resizable and not maximized. Use -+ * gtk_window_resize_grip_is_visible() to find out if the -+ * resize grip is currently shown. -+ * -+ * Since: 3.0 -+ */ -+void -+gtk_window_set_has_resize_grip (GtkWindow *window, -+ gboolean value) -+{ -+ GtkWidget *widget = GTK_WIDGET (window); -+ GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE(window); -+ -+ value = value != FALSE; -+ -+ if (value != priv->has_resize_grip) -+ { -+ priv->has_resize_grip = value; -+ gtk_widget_queue_draw (widget); -+ -+ if (gtk_widget_get_realized (widget)) -+ { -+ if (priv->has_resize_grip && priv->grip_window == NULL) -+ resize_grip_create_window (window); -+ else if (!priv->has_resize_grip && priv->grip_window != NULL) -+ resize_grip_destroy_window (window); -+ } -+ -+ g_object_notify (G_OBJECT (window), "has-resize-grip"); -+ } -+} -+ -+static void -+update_grip_visibility (GtkWindow *window) -+{ -+ GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE(window); -+ gboolean val; -+ -+ val = gtk_window_resize_grip_is_visible (window); -+ -+ if (priv->grip_window != NULL) -+ { -+ if (val) -+ { -+ gdk_window_show (priv->grip_window); -+ set_grip_cursor (window); -+ } -+ else -+ { -+ gdk_window_hide (priv->grip_window); -+ } -+ } -+ -+ if (priv->resize_grip_visible != val) -+ { -+ priv->resize_grip_visible = val; -+ -+ g_object_notify (G_OBJECT (window), "resize-grip-visible"); -+ } -+} -+ -+/** -+ * gtk_window_resize_grip_is_visible: -+ * @window: a #GtkWindow -+ * -+ * Determines whether a resize grip is visible for the specified window. -+ * -+ * Returns %TRUE if a resize grip exists and is visible. -+ * -+ * Since: 3.0 -+ */ -+gboolean -+gtk_window_resize_grip_is_visible (GtkWindow *window) -+{ -+ GtkWindowPrivate *priv; -+ GdkWindowEdge edge; -+ -+ g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); -+ -+ priv = GTK_WINDOW_GET_PRIVATE(window); -+ -+ if (window->type == GTK_WINDOW_POPUP || !window->allow_grow) -+ return FALSE; -+ -+ if (gtk_widget_get_realized (GTK_WIDGET (window))) -+ { -+ GdkWindowState state; -+ -+ state = gdk_window_get_state (gtk_widget_get_window (GTK_WIDGET (window))); -+ -+ if (state & GDK_WINDOW_STATE_MAXIMIZED || state & GDK_WINDOW_STATE_FULLSCREEN) -+ return FALSE; -+ } -+ -+ if (!get_drag_edge (GTK_WIDGET (window), &edge)) -+ return FALSE; -+ -+ return priv->has_resize_grip; -+} -+ -+/** -+ * gtk_window_get_has_resize_grip: -+ * @window: a #GtkWindow -+ * -+ * Determines whether the window may has a resize grip. -+ * -+ * Returns: %TRUE if the window has a resize grip. -+ * -+ * Since: 3.0 -+ */ -+gboolean -+gtk_window_get_has_resize_grip (GtkWindow *window) -+{ -+ GtkWindowPrivate *priv; -+ -+ g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); -+ -+ priv = GTK_WINDOW_GET_PRIVATE(window); -+ -+ return priv->has_resize_grip; -+} -+ -+/** -+ * gtk_window_get_resize_grip_area: -+ * @window: a #GtkWindow -+ * @rect: a pointer to a #GdkRectangle which we should store the -+ * resize grip area. -+ * -+ * If a window has a resize grip, this will retrieve the grip -+ * position, width and height into the specified #GdkRectangle. -+ * -+ * Returns: %TRUE if the resize grip's area was retrieved. -+ * -+ * Since: 3.0 -+ */ -+gboolean -+gtk_window_get_resize_grip_area (GtkWindow *window, -+ GdkRectangle *rect) -+{ -+ GtkWidget *widget; -+ GtkWindowPrivate *priv; -+ GtkAllocation allocation; -+ GtkStyle *style; -+ gint grip_width; -+ gint grip_height; -+ -+ g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE); -+ -+ widget = GTK_WIDGET (window); -+ priv = GTK_WINDOW_GET_PRIVATE (window); -+ -+ if (!priv->has_resize_grip) -+ return FALSE; -+ -+ gtk_widget_get_allocation (widget, &allocation); -+ style = gtk_widget_get_style (widget); -+ -+ gtk_widget_style_get (widget, -+ "resize-grip-width", &grip_width, -+ "resize-grip-height", &grip_height, -+ NULL); -+ -+ if (grip_width > allocation.width) -+ grip_width = allocation.width; -+ -+ if (grip_height > allocation.height) -+ grip_height = allocation.height; -+ -+ rect->width = grip_width; -+ rect->height = grip_height; -+ rect->y = allocation.y + allocation.height - grip_height; -+ -+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR) -+ rect->x = allocation.x + allocation.width - grip_width; -+ else -+ rect->x = allocation.x; -+ -+ return TRUE; -+} -+ -+ - static gint - gtk_window_event (GtkWidget *widget, GdkEvent *event) - { -@@ -5270,6 +5778,29 @@ - return handled; - } - -+static gint -+gtk_window_button_press_event (GtkWidget *widget, -+ GdkEventButton *event) -+{ -+ GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (widget); -+ GdkWindowEdge edge; -+ -+ if (event->window == priv->grip_window) -+ { -+ if (get_drag_edge (widget, &edge)) -+ gtk_window_begin_resize_drag (GTK_WINDOW (widget), -+ get_grip_edge (widget), -+ event->button, -+ event->x_root, -+ event->y_root, -+ event->time); -+ -+ return TRUE; -+ } -+ -+ return FALSE; -+} -+ - static void - gtk_window_real_activate_default (GtkWindow *window) - { -@@ -6051,6 +6582,7 @@ - * the position request to be centered. - */ - GtkWidget *widget; -+ GtkWindowPrivate *priv; - GtkContainer *container; - GtkWindowGeometryInfo *info; - GdkGeometry new_geometry; -@@ -6064,7 +6596,8 @@ - widget = GTK_WIDGET (window); - container = GTK_CONTAINER (widget); - info = gtk_window_get_geometry_info (window, TRUE); -- -+ priv = GTK_WINDOW_GET_PRIVATE (window); -+ - configure_request_size_changed = FALSE; - configure_request_pos_changed = FALSE; - -@@ -6260,6 +6793,9 @@ - allocation = widget->allocation; - gtk_widget_size_allocate (widget, &allocation); - -+ set_grip_position (window); -+ update_grip_visibility (window); -+ - gdk_window_process_updates (widget->window, TRUE); - - gdk_window_configure_finished (widget->window); -@@ -6636,24 +7172,75 @@ - ***********************/ - - static void --gtk_window_paint (GtkWidget *widget, -- GdkRectangle *area) -+paint_window_grip (GtkWidget *widget, GdkRectangle *area) - { -- gtk_paint_flat_box (widget->style, widget->window, GTK_STATE_NORMAL, -- GTK_SHADOW_NONE, area, widget, "base", 0, 0, -1, -1); -+ GtkWindow *window = GTK_WINDOW (widget); -+ GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (window); -+ -+ if (gtk_window_resize_grip_is_visible (window) && priv->grip_window != NULL) -+ { -+ GdkWindowEdge edge; -+ GdkRectangle rect; -+ -+ gtk_window_get_resize_grip_area (window, &rect); -+ -+ edge = get_grip_edge (widget); -+ -+ gtk_window_get_resize_grip_area (window, &rect); -+ -+ gtk_paint_flat_box (widget->style, -+ priv->grip_window, -+ GTK_STATE_NORMAL, -+ GTK_SHADOW_NONE, -+ area, -+ widget, -+ "base", -+ 0, 0, -+ -1, -1); -+ -+ gtk_paint_resize_grip (gtk_widget_get_style (widget), -+ priv->grip_window, -+ gtk_widget_get_state (widget), -+ area, -+ widget, -+ "statusbar", -+ edge, -+ 0, 0, -+ rect.width, -+ rect.height); -+ } -+} -+ -+static void -+gtk_window_paint (GtkWidget *widget, -+ GdkRectangle *area) -+{ -+ gtk_paint_flat_box (widget->style, widget->window, GTK_STATE_NORMAL, -+ GTK_SHADOW_NONE, area, widget, "base", 0, 0, -1, -1); - } - - static gint - gtk_window_expose (GtkWidget *widget, - GdkEventExpose *event) - { -- if (!gtk_widget_get_app_paintable (widget)) -- gtk_window_paint (widget, &event->area); -- -- if (GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event) -- return GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event (widget, event); -+ GtkWindowPrivate *priv = GTK_WINDOW_GET_PRIVATE (widget); -+ gboolean ret = FALSE; - -- return FALSE; -+ if (event->window == widget->window) -+ { -+ if (!gtk_widget_get_app_paintable (widget)) -+ gtk_window_paint (widget, &event->area); -+ -+ if (GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event) -+ ret = GTK_WIDGET_CLASS (gtk_window_parent_class)->expose_event (widget, event); -+ } -+ else if (event->window == priv->grip_window) -+ { -+ paint_window_grip (widget, &event->area); -+ ret = TRUE; -+ } -+ -+ return ret; - } - - /** -@@ -7265,8 +7852,16 @@ - gtk_window_set_resizable (GtkWindow *window, - gboolean resizable) - { -+ GtkWindowPrivate *priv; -+ - g_return_if_fail (GTK_IS_WINDOW (window)); - -+ priv = GTK_WINDOW_GET_PRIVATE (window); -+ -+ // XXX - need to do this after setting policy? -+ if (priv->grip_window != NULL) -+ update_grip_visibility (window); -+ - gtk_window_set_policy_internal (window, FALSE, resizable, FALSE); - } - -Index: gtk+-2.24.4/gtk/gtkwindow.h -=================================================================== ---- gtk+-2.24.4.orig/gtk/gtkwindow.h 2011-02-20 01:31:37.000000000 +1100 -+++ gtk+-2.24.4/gtk/gtkwindow.h 2011-04-04 10:58:00.246596968 +1000 -@@ -404,6 +404,17 @@ - GList * gtk_window_group_list_windows (GtkWindowGroup *window_group); - - -+ -+/* Window grips -+ */ -+void gtk_window_set_has_resize_grip (GtkWindow *window, -+ gboolean value); -+gboolean gtk_window_get_has_resize_grip (GtkWindow *window); -+gboolean gtk_window_resize_grip_is_visible (GtkWindow *window); -+gboolean gtk_window_get_resize_grip_area (GtkWindow *window, -+ GdkRectangle *rect); -+ -+ - /* --- internal functions --- */ - void _gtk_window_internal_set_focus (GtkWindow *window, - GtkWidget *focus); diff --git a/gtk2-ubuntu/PKGBUILD b/gtk2-ubuntu/PKGBUILD index a767e3301..564ad7ad1 100644 --- a/gtk2-ubuntu/PKGBUILD +++ b/gtk2-ubuntu/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=gtk2-ubuntu pkgname=gtk2-ubuntu true && pkgname=('gtk2-ubuntu' 'gtk-update-icon-cache-ubuntu') pkgver=2.24.8 -pkgrel=2 +pkgrel=2.1 arch=('i686' 'x86_64') url="http://www.gtk.org/" makedepends=('gtk-doc' 'atk' 'pango' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' @@ -18,7 +18,7 @@ source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-$pkgver.tar.xz 010_make_bg_changes_queue_repaint.patch 012_ubuntu-set-grab-add.patch 043_ubuntu_menu_proxy.patch - 044_grips.patch + fix-ubuntumenuproxy-build.patch 071_no_offscreen_widgets_grabbing.patch 100_overlay_scrollbar_loading.patch) sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c' @@ -27,7 +27,7 @@ sha256sums=('8a3b29f667933cf52eea2db7b066723edbc80443ca9c75b7cd7cbe8c8b90b93c' '910feb3b592c5699f7b5b11ca0b5a33b950824eec9ddd063106cad676a627e86' '32e6765f7e0bebb135eb715561be05ecdc178b1bd24b6ae6526fef8c815e5b00' '83280aa0f3ac1e2456656d3e97d804ec5f891737f93799fcb1cc1f1dd0d9a41a' - '6d128b78f978452fd719fce8a6ec2f589366c7e2d0276c83573e649617ce6193' + '765557de3d3c1ee2e097d5d281ccd58f7bb3f61236702079cfe5d6fac373f669' 'e2e2ed1ee10a9ef7672eaa4b44c66c7422e24ca55f50cf4989967ed3392b1fa8' '14c658b025c06fb832abf8a5fd5ae911e22276f95051f4f8453cd983880a24ca') @@ -44,9 +44,7 @@ build() { # Add Ubuntu menuproxy module (required for appmenu-gtk) patch -Np1 -i "$srcdir/043_ubuntu_menu_proxy.patch" - - # Add resize grips to GtkWindow - patch -Np1 -i "$srcdir/044_grips.patch" + patch -Np1 -i "$srcdir/fix-ubuntumenuproxy-build.patch" # Don't let offscreen widget do grabbing (fix for ido) patch -Np1 -i "$srcdir/071_no_offscreen_widgets_grabbing.patch" @@ -54,7 +52,7 @@ build() { # Add support for the ayatana overlay scrollbars (required for overlay-scrollbar) patch -Np1 -i "$srcdir/100_overlay_scrollbar_loading.patch" - automake + autoreconf -fi CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/gtk2-ubuntu/fix-ubuntumenuproxy-build.patch b/gtk2-ubuntu/fix-ubuntumenuproxy-build.patch new file mode 100644 index 000000000..fca65737c --- /dev/null +++ b/gtk2-ubuntu/fix-ubuntumenuproxy-build.patch @@ -0,0 +1,12 @@ +diff -Naur gtk+-2.24.8.orig/gtk/gtkmenushell.h gtk+-2.24.8/gtk/gtkmenushell.h +--- gtk+-2.24.8.orig/gtk/gtkmenushell.h 2011-11-10 18:38:03.000000000 +0100 ++++ gtk+-2.24.8/gtk/gtkmenushell.h 2012-01-12 21:13:12.851805399 +0100 +@@ -135,6 +135,8 @@ + void _gtk_menu_shell_set_keyboard_mode (GtkMenuShell *menu_shell, + gboolean keyboard_mode); + gboolean _gtk_menu_shell_get_keyboard_mode (GtkMenuShell *menu_shell); ++gboolean ubuntu_gtk_menu_shell_activate_mnemonic (GtkMenuShell *shell, GtkWidget *item); ++gboolean ubuntu_gtk_menu_shell_activate_first (GtkMenuShell *menu_shell, gboolean search_sensitive); + + G_END_DECLS + diff --git a/gtk3-ubuntu/PKGBUILD b/gtk3-ubuntu/PKGBUILD index 22bb88e18..e900d2fe2 100644 --- a/gtk3-ubuntu/PKGBUILD +++ b/gtk3-ubuntu/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Ionut Biru pkgname=gtk3-ubuntu -pkgver=3.2.2 +pkgver=3.2.3 pkgrel=2 pkgdesc="GTK+ is a multi-platform toolkit (v3) with Ubuntu's modifications" arch=('i686' 'x86_64') @@ -17,16 +17,16 @@ backup=(etc/gtk-3.0/settings.ini) license=('LGPL') source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz settings.ini - fix_crash_treeview.patch + empty_grid.patch 016_no_offscreen_widgets_grabbing.patch 017_no_offscreen_device_grabbing.patch 043_ubuntu_menu_proxy.patch 062_ubuntu-set-grab-add.patch 075_expose_gdkwidget_for_gtkrange.patch 100_overlay_scrollbar_loading.patch) -sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84' +sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d' 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621' - 'eb187ef05f3735b24b58cd4c533dc3d4f616103cafba399c009ea3eb519be0b9' + 'a0b5859cd5c2ac78b5273d6be61d46ed79f1c38719b2424742254902fd6d3194' 'c4a43b254b9719ac026fa6a92366bdc1d32e42fa79461ff8aaa206933b9f9c7e' 'cb8f4eb9d10c6d8645d23812aaa7d64c14560476f19f8c779d10a546748de684' '3c40814a3ba51dbbd169b5fc8f4a3c47aff6c5b97433a1f6c13fa66d465947d9' @@ -36,7 +36,7 @@ sha256sums=('f7ec82de393cd7ae2aa45022576400941704709d1f0f35fb0b17f3be1f2e7d84' build() { cd "$srcdir/gtk+-$pkgver" - patch -Np1 -R -i "$srcdir/fix_crash_treeview.patch" + patch -Np1 -i "$srcdir/empty_grid.patch" # Don't let offscreen widget do grabbing (fix for ido) patch -Np1 -i "$srcdir/016_no_offscreen_widgets_grabbing.patch" @@ -56,7 +56,7 @@ build() { # Add support for the ayatana overlay scrollbars (required for overlay-scrollbar) patch -Np1 -i "$srcdir/100_overlay_scrollbar_loading.patch" - automake + autoreconf -fi CXX=/bin/false ./configure --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ diff --git a/gtk3-ubuntu/empty_grid.patch b/gtk3-ubuntu/empty_grid.patch new file mode 100644 index 000000000..24c52b079 --- /dev/null +++ b/gtk3-ubuntu/empty_grid.patch @@ -0,0 +1,29 @@ +From 97c1df4bb05966a4ce53b07271eff2f53284e235 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen +Date: Fri, 21 Oct 2011 20:23:03 +0000 +Subject: Fix natural/min widht calculations for empty grids + +https://bugzilla.gnome.org/show_bug.cgi?id=660139 +--- +diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c +index a122ad4..78ae2ff 100644 +--- a/gtk/gtkgrid.c ++++ b/gtk/gtkgrid.c +@@ -927,8 +927,13 @@ gtk_grid_request_sum (GtkGridRequest *request, + linedata = &priv->linedata[orientation]; + lines = &request->lines[orientation]; + +- min = (nonempty - 1) * linedata->spacing; +- nat = (nonempty - 1) * linedata->spacing; ++ min = 0; ++ nat = 0; ++ if (nonempty > 0) ++ { ++ min = (nonempty - 1) * linedata->spacing; ++ nat = (nonempty - 1) * linedata->spacing; ++ } + + for (i = 0; i < lines->max - lines->min; i++) + { +-- +cgit v0.9.0.2 diff --git a/gtk3-ubuntu/fix_crash_treeview.patch b/gtk3-ubuntu/fix_crash_treeview.patch deleted file mode 100644 index 12c6372f1..000000000 --- a/gtk3-ubuntu/fix_crash_treeview.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 456b19a35adbdc4b098e6da020c3a87cb62ae7f4 Mon Sep 17 00:00:00 2001 -From: Benjamin Otte -Date: Thu, 10 Nov 2011 15:52:44 +0000 -Subject: a11y: Fix gcc warning - ---- -diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c -index 663bb51..b2ca9ba 100644 ---- a/gtk/a11y/gtktreeviewaccessible.c -+++ b/gtk/a11y/gtktreeviewaccessible.c -@@ -238,7 +238,7 @@ gtk_tree_view_accessible_initialize (AtkObject *obj, - accessible->n_children_deleted = 0; - - accessible->cell_info_by_index = g_hash_table_new_full (g_int_hash, -- g_int_equal, NULL, cell_info_free); -+ g_int_equal, NULL, (GDestroyNotify) cell_info_free); - - widget = GTK_WIDGET (data); - tree_view = GTK_TREE_VIEW (widget); --- -cgit v0.9.0.2 -From b25621173734ad1c9cee83802f7ac32ab7df20e7 Mon Sep 17 00:00:00 2001 -From: Guillaume Desmottes -Date: Wed, 09 Nov 2011 13:32:32 +0000 -Subject: gtktreeviewaccessible: use a value_destroy_func with the cell_info_by_index hash - -This ensures that we don't leak any GtkTreeViewAccessibleCellInfo when -re-inserting a new one with the same key. - -https://bugzilla.gnome.org/show_bug.cgi?id=663694 ---- -diff --git a/gtk/a11y/gtktreeviewaccessible.c b/gtk/a11y/gtktreeviewaccessible.c -index 046e253..4ad323c 100644 ---- a/gtk/a11y/gtktreeviewaccessible.c -+++ b/gtk/a11y/gtktreeviewaccessible.c -@@ -237,7 +237,8 @@ gtk_tree_view_accessible_initialize (AtkObject *obj, - accessible->idle_expand_path = NULL; - accessible->n_children_deleted = 0; - -- accessible->cell_info_by_index = g_hash_table_new (g_int_hash, g_int_equal); -+ accessible->cell_info_by_index = g_hash_table_new_full (g_int_hash, -+ g_int_equal, NULL, cell_info_free); - - widget = GTK_WIDGET (data); - tree_view = GTK_TREE_VIEW (widget); -@@ -2845,7 +2846,6 @@ garbage_collect_cell_data (gpointer data) - { - if (!cell_info->in_use) - { -- cell_info_free (cell_info); - g_hash_table_iter_remove (&iter); - } - } --- -cgit v0.9.0.2 diff --git a/indicator-applet/PKGBUILD b/indicator-applet/PKGBUILD index 625d03d15..31032cef4 100644 --- a/indicator-applet/PKGBUILD +++ b/indicator-applet/PKGBUILD @@ -1,13 +1,12 @@ # Maintainer: György Balló pkgname=indicator-applet -pkgver=0.4.13 +pkgver=0.4.14 pkgrel=1 pkgdesc="A small applet to display information from various applications consistently in the panel" arch=('i686' 'x86_64') url="https://launchpad.net/indicator-applet" license=('GPL') -depends=('gnome-panel>=3.0' 'libindicator>=0.3.92' 'xdg-utils') -true && depends=('gnome-panel>=3.0' 'libindicator3>=0.3.92' 'xdg-utils') +depends=('gnome-panel>=3.0' 'libindicator3>=0.3.92' 'xdg-utils') makedepends=('intltool>=0.35.0') optdepends=('indicator-application: take menus from applications and place them in the panel' 'indicator-appmenu: host the menus from an application' @@ -18,7 +17,7 @@ optdepends=('indicator-application: take menus from applications and place them 'indicator-sound: a unified sound menu') install=$pkgname.install source=(https://launchpad.net/~jconti/+archive/gnome3/+files/${pkgname}_$pkgver.orig.tar.gz) -md5sums=('5cd9908c6ae366e4ef82f373325056cd') +md5sums=('34b98ac46bda4dc2f9ee4fa17f27b41d') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/jrockit/PKGBUILD b/jrockit/PKGBUILD index af1fb4495..2b0ac55d2 100644 --- a/jrockit/PKGBUILD +++ b/jrockit/PKGBUILD @@ -1,48 +1,51 @@ +# Maintainer: Shanto # Original Contributor: AqD # Contributor: Ignacio Galmarino pkgname=jrockit -pkgver=1.6.0_26 -filever=R28.1.4-4.0.1 -pkgrel=3 +pkgver=1.6.0_29 +_relver=28.2.0-4.1.0 +pkgrel=1 pkgdesc="JRockit is a high performace JVM from Oracle (formerly from BEA)" url="http://www.oracle.com/technetwork/middleware/jrockit/" depends=('alsa-lib' 'unixodbc' 'libxtst' 'gtk2') replaces=('jdk' 'j2sdk' 'java-environment' 'j2re' 'java-runtime' 'jre' 'jrockit-jdk') -provides=('jdk=6' 'j2sdk' 'java-environment' 'j2re' 'java-runtime' 'jre=6') +provides=('jdk=6' 'j2sdk' 'java-environment=6' 'j2re' 'java-runtime=6' 'jre=6') license=('custom') arch=('i686' 'x86_64') install=${pkgname}.install options=(!strip !zipman) source=( - installer.bin::http://download.oracle.com/otn/bea/jrockit/jrockit-jdk1.6.0_26-R28.1.4-4.0.1-linux-x64.bin + http://www.cwinkler.com/files/oracle/jrockit-jdk${pkgver}-R${_relver}-linux-x64.bin + #http://download.oracle.com/otn/bea/jrockit/jrockit-jdk${pkgver}-R${_relver}-linux-x64.bin license.html ${pkgname}.profile silent.xml ) md5sums=( - '39b92834e1ed029425cd68706dd5f914' + 'c4f3cc9f92e0c6c35b87e68a9313ca81' '9212c2dbe1fefa6cea5163497661d704' '83556c506af39ae5956a0713b9bd98cc' 'cb117b969a643a2ed7b9f10d5afba44c' ) if test "$CARCH" == i686; then - source[0]=installer.bin::http://download.oracle.com/otn/bea/jrockit/jrockit-jdk1.6.0_26-R28.1.4-4.0.1-linux-ia32.bin - md5sums[0]=`md5sum installer.bin` + source[0]=http://www.cwinkler.com/files/oracle/jrockit-jdk${pkgver}-R${_relver}-linux-ia32.bin + #http://download.oracle.com/otn/bea/jrockit/jrockit-jdk${pkgver}-R${_relver}-linux-ia32.bin + md5sums[0]='bc5a16a965622653b4a901c6c580e1a0' fi build() { mkdir -p $startdir/pkg/opt/java cd $pkgdir/opt/java - chmod 755 $startdir/src/installer.bin - $srcdir/installer.bin -mode=silent -silent_xml=$startdir/src/silent.xml || return 1 + chmod 755 $srcdir/$(basename ${source[0]}) + $srcdir/$(basename ${source[0]}) -mode=silent -silent_xml=$srcdir/silent.xml mkdir -p $pkgdir/usr/bin cd $pkgdir/usr/bin for b in `ls -1 ../../opt/java/bin/`; do ln -sf "../../opt/java/bin/$b"; done; - cd $startdir/src + cd $srcdir install -D -m755 ${pkgname}.profile $startdir/pkg/etc/profile.d/${pkgname}.sh - install -D -m 644 $startdir/src/license.html $startdir/pkg/usr/share/licenses/$pkgname/license.html + install -D -m 644 $srcdir/license.html $startdir/pkg/usr/share/licenses/$pkgname/license.html } diff --git a/kid3-qt/PKGBUILD b/kid3-qt/PKGBUILD dissimilarity index 80% index 4908c263d..4252750e1 100644 --- a/kid3-qt/PKGBUILD +++ b/kid3-qt/PKGBUILD @@ -1,28 +1,38 @@ -# Contributor: Alois Nespor -# Contributor: Nezmer -# Contributor: anubis2591 - -pkgname=kid3-qt -pkgver=2.0.1 -pkgrel=1 -pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor (without KDE dependencies)" -arch=('i686' 'x86_64') -url="http://kid3.sourceforge.net" -license=('GPL') -depends=('id3lib' 'tunepimp' 'docbook-xsl' 'qt') -makedepends=('cmake') -source=(http://downloads.sourceforge.net/sourceforge/kid3/kid3-$pkgver.tar.gz) -md5sums=('08741a839ca2ff0e6759d5a1ff74e063') - -build() { - cd "${srcdir}/kid3-$pkgver/" - cmake . -DCMAKE_BUILD_TYPE=Release \ - -DWITH_KDE=OFF \ - -DWITH_PHONON=OFF \ - -DWITH_DBUS=OFF \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DDOCBOOK_XSL_DIR=/usr/share/xml/docbook/xsl-stylesheets-1.75.2/ - make || return 1 - make DESTDIR=${pkgdir} install -} - +# Maintainer: Alessio Sergi +# Contributor: anubis2591 + +pkgname=kid3-qt +pkgver=2.0.1 +pkgrel=2 +pkgdesc="An efficient ID3 tag editor - non KDE version" +arch=('i686' 'x86_64') +url="http://kid3.sourceforge.net" +license=('GPL') +depends=('id3lib' 'qt' 'tunepimp') +makedepends=('cmake' 'docbook-xsl') +install="$pkgname".install +source=("http://downloads.sourceforge.net/sourceforge/kid3/kid3-$pkgver.tar.gz") +md5sums=('08741a839ca2ff0e6759d5a1ff74e063') + +build() { + cd "$srcdir" + + rm -rf build + mkdir build && cd build + + cmake ../kid3-"$pkgver" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DWITH_KDE=OFF \ + -DWITH_PHONON=OFF + + make +} + +package() { + cd "$srcdir/build" + + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: diff --git a/kid3-qt/kid3-qt.install b/kid3-qt/kid3-qt.install new file mode 100644 index 000000000..307c8f710 --- /dev/null +++ b/kid3-qt/kid3-qt.install @@ -0,0 +1,14 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &>/dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} + +# vim:set ts=2 sw=2 et: \ No newline at end of file diff --git a/linux-bfs/PKGBUILD b/linux-bfs/PKGBUILD index 408400afb..54bc5ecc8 100644 --- a/linux-bfs/PKGBUILD +++ b/linux-bfs/PKGBUILD @@ -36,15 +36,15 @@ true && pkgname=('linux-bfs' 'linux-bfs-headers') _kernelname=${pkgname#linux} _basekernel=3.2 _bfsrel=416 -pkgver=${_basekernel} -pkgrel=${_bfsrel}.1 +pkgver=${_basekernel}.1 +pkgrel=${_bfsrel} arch=('i686' 'x86_64') url="http://ck-hack.blogspot.com/" license=('GPL2') options=('!strip') _bfspatch="${_basekernel}-sched-bfs-${_bfsrel}.patch" source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.tar.xz" - #"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" + "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" # the main kernel config files 'config' 'config.x86_64' # BFS patch @@ -54,8 +54,9 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.2.tar.xz" 'change-default-console-loglevel.patch' 'i915-fix-ghost-tv-output.patch') md5sums=('364066fa18767ec0ae5f4e4abcf9dc51' - '4a6567864c49c5bb0f7d76d1a638912e' - 'd9efdc5f471a4082caf2f61afede6302' + '62ac6ac9b870162f693ecf5e8606423a' + '4079a2ae3e2ee308e6db188f7bc04959' + '875b121a32a619e0ee262c541f330427' '18d5f982d4d21446a32843f9eb766ff0' '19af8b861a9a46ddf9c480b57b728f3e' '9d3c56a4b999c8bfbd4018089a62f662' @@ -65,7 +66,7 @@ build() { cd "${srcdir}/linux-${_basekernel}" # add upstream patch - #patch -p1 -i "${srcdir}/patch-${pkgver}" + patch -p1 -i "${srcdir}/patch-${pkgver}" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -100,9 +101,10 @@ build() { # Use current kernel's config # Code originally by nous; http://aur.archlinux.org/packages.php?ID=40191 if [ "${_USE_CURRENT_CFG}" = "y" ]; then + msg "Running sudo modprobe configs" + sudo modprobe configs if [[ -s /proc/config.gz ]]; then msg "Extracting config from /proc/config.gz" - modprobe configs zcat /proc/config.gz > ./.config else warning "You kernel was not compiled with IKCONFIG_PROC!" diff --git a/linux-bfs/config b/linux-bfs/config index 032ce3884..31667d08c 100644 --- a/linux-bfs/config +++ b/linux-bfs/config @@ -2266,13 +2266,11 @@ CONFIG_CARL9170_WPC=y CONFIG_ATH6KL=m # CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=m -CONFIG_B43_BCMA=y CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -2292,6 +2290,7 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m CONFIG_BRCMFMAC=m # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m @@ -3317,11 +3316,7 @@ CONFIG_BCMA_POSSIBLE=y # # Broadcom specific AMBA # -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -# CONFIG_BCMA_DEBUG is not set +# CONFIC_BCMA is not set # # Multifunction device drivers diff --git a/linux-bfs/config.x86_64 b/linux-bfs/config.x86_64 index 3aa38e517..3971c5cb7 100644 --- a/linux-bfs/config.x86_64 +++ b/linux-bfs/config.x86_64 @@ -2152,13 +2152,11 @@ CONFIG_CARL9170_WPC=y CONFIG_ATH6KL=m # CONFIG_ATH6KL_DEBUG is not set CONFIG_B43=m -CONFIG_B43_BCMA=y CONFIG_B43_SSB=y CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y CONFIG_B43_PCMCIA=y CONFIG_B43_SDIO=y -CONFIG_B43_BCMA_PIO=y CONFIG_B43_PIO=y CONFIG_B43_PHY_N=y CONFIG_B43_PHY_LP=y @@ -2178,6 +2176,7 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # CONFIG_B43LEGACY_DMA_MODE is not set # CONFIG_B43LEGACY_PIO_MODE is not set CONFIG_BRCMUTIL=m +CONFIG_BRCMSMAC=m CONFIG_BRCMFMAC=m # CONFIG_BRCMDBG is not set CONFIG_HOSTAP=m @@ -3166,11 +3165,7 @@ CONFIG_BCMA_POSSIBLE=y # # Broadcom specific AMBA # -CONFIG_BCMA=m -CONFIG_BCMA_BLOCKIO=y -CONFIG_BCMA_HOST_PCI_POSSIBLE=y -CONFIG_BCMA_HOST_PCI=y -# CONFIG_BCMA_DEBUG is not set +# CONFIG_BCMA is not set # # Multifunction device drivers diff --git a/linux-bfs/linux-bfs.install b/linux-bfs/linux-bfs.install index df2f44d15..9ac0e064b 100644 --- a/linux-bfs/linux-bfs.install +++ b/linux-bfs/linux-bfs.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME=-bfs -KERNEL_VERSION=3.2.0-416.1-bfs +KERNEL_VERSION=3.2.1-416-bfs post_install () { # updating module dependencies @@ -33,7 +33,6 @@ post_upgrade() { if findmnt --fstab -uno SOURCE /boot &>/dev/null && ! mountpoint -q /boot; then echo "WARNING: /boot appears to be a separate partition but is not mounted." - echo " You probably just broke your system. Congratulations." fi # updating module dependencies diff --git a/nvidia-rt/PKGBUILD b/nvidia-rt/PKGBUILD index c4dc3d465..667a55c63 100644 --- a/nvidia-rt/PKGBUILD +++ b/nvidia-rt/PKGBUILD @@ -5,7 +5,7 @@ # Maintainer for kernel26-rt : Morgan Cox pkgname=nvidia-rt -pkgver=285.05.09 +pkgver=290.10 _kernver='3.0-rt' pkgrel=1 pkgdesc="NVIDIA drivers for kernel26." @@ -18,16 +18,18 @@ license=('custom') install=nvidia.install if [ "$CARCH" = "i686" ]; then _arch='x86' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}" && md5sums=('2d469a90abef50320f548cfa8085e3a0' '8f57481f4ae28fb1ec5a5f3af366cceb') + _pkg="NVIDIA-Linux-${_arch}-${pkgver}" && md5sums=('50319a4b3818c12c9c7243525e0e6316' 'b1ed7b018f2836e1d904004457cf6355') source=("http://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run" - nvidiart.patch + nvidia_linux_3.0-rt.patch.tar.bz2 + ) elif [ "$CARCH" = "x86_64" ]; then _arch='x86_64' - _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" && md5sums=('2f4a0e78f5560c07220b7ed6fc1e27aa' '8f57481f4ae28fb1ec5a5f3af366cceb') + _pkg="NVIDIA-Linux-${_arch}-${pkgver}-no-compat32" && md5sums=('cebfba9a7e91716a06c66bb5b38d9661' 'b1ed7b018f2836e1d904004457cf6355') source=("http://download.nvidia.com/XFree86/Linux-${_arch}/${pkgver}/${_pkg}.run" - nvidiart.patch + nvidia_linux_3.0-rt.patch.tar.bz2 + ) @@ -55,7 +57,7 @@ build() { cd $srcdir sh ${_pkg}.run --extract-only cd ${_pkg}/kernel - patch < $srcdir/nvidiart.patch + bzcat $srcdir/nvidia_linux_3.0-rt.patch.tar.bz2 | patch -p1 make SYSSRC=/lib/modules/${_kernver}/build module } diff --git a/nvidia-rt/nvidia_linux_3.0-rt.patch.tar.bz2 b/nvidia-rt/nvidia_linux_3.0-rt.patch.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..8f75b6216722243579ce55d1bc77dd2d26a8c656 GIT binary patch literal 713 zcwPa?0yh0ZT4*^jL0KkKSrq^Xa{vQ+|AhWj0RU-l|M+X~|J48Q|Kb1wAP7JL=sO_L zWF-|K9(?HMw0B8)1ngAZ4l+q#qji}L}27mxGXc}k$Xk;`8Fq#8EXwigd zF&biI#L!_H20$`k6(o}>7OIP( zL=^|3fC`LJIH&!=cI`dpc> z`v%Qot#T2VV4aTjDa8t%L=__xC|Gh3i1JD#o!umocXt`bCWnyKn*HRR-6yzmh1PKx zfyUBz3Tzq_PMA9wUKCy|ItG>lr6G+n7)r1xS~SU7qg@Oy+J%yVgn4b}Ql?FNpFd@s z(){enPv3@Fa@K5J!pF&zV`+{07hi(QID7{9>EcN%*2jB=NeJPHW29>)8pmvmX=NHI z1)I=7=S0F4Dy()#z47EWxU+}ZxDyl@%i(}9n2bPuPw4IQD7^0+<==XaV;9}1(qM9z z!r-Yeo~0)l$`rWgW?v;rQ&Fu&%NikkpE4E_+ zgK=XkmSSgXVyaFuJ6YM2vt?@Vt;|JyRl1U_z zNLJcGqA9_bPe)9cy~{IkaekQPT(o(fm|ILS_z5?m?~uMd_;nd7Lwh|^$+tZOnJ`lG zNsQ4&NS;YI pkgname=plasma-widget-message-indicator pkgver=0.5.8 -pkgrel=1 +pkgrel=2 pkgdesc="A Plasma widget which displays messages from message-indicator enabled applications" arch=('i686' 'x86_64') url="https://launchpad.net/plasma-widget-message-indicator" license=('GPL') depends=('kdelibs>=4.4' 'libindicate-qt>=0.2.5') makedepends=('cmake>=2.6' 'automoc4') -source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.bz2) -md5sums=('5fb2af552c8d71fbd596a2635fb70901') +source=(http://launchpad.net/$pkgname/trunk/$pkgver/+download/$pkgname-$pkgver.tar.bz2 + indicator_status.diff) +md5sums=('5fb2af552c8d71fbd596a2635fb70901' + '60b3168d95c8b54685b3522e04b6ac5a') build() { cd "$srcdir/$pkgname-$pkgver" + patch -Np1 -i "$srcdir/indicator_status.diff" mkdir build cd build diff --git a/plasma-widget-message-indicator/indicator_status.diff b/plasma-widget-message-indicator/indicator_status.diff new file mode 100644 index 000000000..efd93dbc8 --- /dev/null +++ b/plasma-widget-message-indicator/indicator_status.diff @@ -0,0 +1,73 @@ +Description: Fix the indicator icon sometimes turning green when clicking on it. +Author: Felix Geyer +Bug: https://bugs.launchpad.net/bugs/755537 + +--- plasma-widget-message-indicator-0.5.7.orig/src/message-indicator.h ++++ plasma-widget-message-indicator-0.5.7/src/message-indicator.h +@@ -61,6 +61,7 @@ private: + Plasma::Svg* mSvg; + QLabel* mNoIndicatorLabel; + QWidget* mCurrentWidget; ++ Plasma::ItemStatus m_status; + + void initIcon(); + void initSourceModel(); +--- plasma-widget-message-indicator-0.5.7.orig/src/message-indicator.cpp ++++ plasma-widget-message-indicator-0.5.7/src/message-indicator.cpp +@@ -45,6 +45,7 @@ MessageIndicator::MessageIndicator(QObje + , mView(new ExpandedTreeView(mStack)) + , mSvg(new Plasma::Svg(this)) + , mNoIndicatorLabel(new QLabel(mStack)) ++, m_status(Plasma::UnknownStatus) + { + setBackgroundHints(StandardBackground); + setAspectRatioMode(Plasma::ConstrainedSquare); +@@ -191,7 +192,7 @@ void MessageIndicator::toolTipAboutToSho + QSizeF oldSize = mSvg->size(); + // FIXME: Hardcoded size + mSvg->resize(32, 32); +- QString element = status() == Plasma::NeedsAttentionStatus ? NEW_STUFF_ICON : NO_NEW_STUFF_ICON; ++ QString element = m_status == Plasma::NeedsAttentionStatus ? NEW_STUFF_ICON : NO_NEW_STUFF_ICON; + QPixmap pix = mSvg->pixmap(element); + mSvg->resize(oldSize); + toolTip.setImage(pix); +@@ -237,7 +238,7 @@ void MessageIndicator::paintInterface(QP + int minSize = qMin(contentsRect.height(), contentsRect.width()); + QRect contentsSquare = QRect(contentsRect.x() + (contentsRect.width() - minSize) / 2, contentsRect.y() + (contentsRect.height() - minSize) / 2, minSize, minSize); + +- QString element = status() == Plasma::NeedsAttentionStatus ? NEW_STUFF_ICON : NO_NEW_STUFF_ICON; ++ QString element = m_status == Plasma::NeedsAttentionStatus ? NEW_STUFF_ICON : NO_NEW_STUFF_ICON; + mSvg->paint(painter, contentsSquare, element); + } + +@@ -274,7 +275,6 @@ void MessageIndicator::slotDrawAttention + + void MessageIndicator::updateStatus() + { +- Plasma::ItemStatus status; + if (mSourceModel && mSourceModel->rowCount() > 0) { + // Check if one of the indicators want to draw attention + QModelIndexList lst = mSourceModel->match(mSourceModel->index(0, 0), +@@ -282,18 +282,18 @@ void MessageIndicator::updateStatus() + QVariant(true), + 1 /* hits */, + Qt::MatchExactly | Qt::MatchRecursive); +- status = lst.isEmpty() ? Plasma::ActiveStatus : Plasma::NeedsAttentionStatus; ++ m_status = lst.isEmpty() ? Plasma::ActiveStatus : Plasma::NeedsAttentionStatus; + } else { +- status = Plasma::PassiveStatus; ++ m_status = Plasma::PassiveStatus; + } + +- setStatus(status); ++ setStatus(m_status); + + // Update icon + update(); + + // Update views +- if (status == Plasma::PassiveStatus) { ++ if (m_status == Plasma::PassiveStatus) { + mView->hide(); + mNoIndicatorLabel->show(); + mCurrentWidget = mNoIndicatorLabel; diff --git a/pogo/PKGBUILD b/pogo/PKGBUILD index 3a81a2e32..79420305c 100644 --- a/pogo/PKGBUILD +++ b/pogo/PKGBUILD @@ -1,29 +1,31 @@ # Maintainer: SpepS pkgname=pogo -pkgver=0.4 +pkgver=0.5 pkgrel=1 pkgdesc="Probably the simplest and fastest audio player for Linux" arch=('any') url="https://launchpad.net/pogo/" license=('GPL') -depends=('pygtk' 'dbus-python' 'mutagen' 'python-imaging' 'gstreamer0.10-python') +depends=('pygtk' 'dbus-python' 'mutagen' 'python-imaging' + 'gstreamer0.10-python' 'desktop-file-utils') optdepends=('python-notify: notifications support') install="$pkgname.install" source=("${url}trunk/$pkgver/+download/$pkgname-$pkgver.tar.gz") -md5sums=('162f997f4d355945d9f9d5414678c515') +md5sums=('6e77d4b15753b6eed2fc8f4dce92d770') build() { - cd "$srcdir/$pkgname-$pkgver" - - # python2 fix - sed "s_\(python\).*_\12_" -i $pkgname.py src/__init__.py + return 0 } package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install + + # python2 fix + sed "s/python/&2/" -i $pkgname.py \ + ${pkgdir}/usr/{bin/pogo,share/pogo/src/__init__.py} } # vim:set ts=2 sw=2 et: diff --git a/profile-sync-daemon/PKGBUILD b/profile-sync-daemon/PKGBUILD index 1f2446c41..70bc76b17 100644 --- a/profile-sync-daemon/PKGBUILD +++ b/profile-sync-daemon/PKGBUILD @@ -2,7 +2,7 @@ pkgname='profile-sync-daemon' _pkgname_short='psd' -pkgver=2.6 +pkgver=2.7 pkgrel=1 pkgdesc='Symlinks and syncs browser profile dirs to RAM thus reducing HDD/SDD calls and speeding-up browsers.' arch=('any') @@ -15,7 +15,7 @@ replaces=('sync-browsers-daemon') source="http://repo-ck.com/source/$pkgname/$pkgname-$pkgver.tar.xz" backup=("etc/$_pkgname_short.conf") install=readme.install -sha256sums=('d3ece6b68d9258135bfe76790714fdb524068f10b8a45429aa5f800acebc35da') +sha256sums=('3675f7b4af739da193e536421288048dcafce10600e24256821121fe36e3d8d8') package() { cd "$srcdir/$pkgname-$pkgver" diff --git a/ruby-bdb/PKGBUILD b/ruby-bdb/PKGBUILD index 2298db914..de493687e 100644 --- a/ruby-bdb/PKGBUILD +++ b/ruby-bdb/PKGBUILD @@ -6,23 +6,23 @@ arch=('i686' 'x86_64') url="http://raa.ruby-lang.org/project/bdb" license=('Ruby') depends=('ruby') -source=(http://ftp.riken.go.jp/pub/FreeBSD/distfiles/ruby/bdb-${pkgver}.tar.bz2) +source=("http://ftp.riken.go.jp/pub/FreeBSD/distfiles/ruby/bdb-$pkgver.tar.bz2") md5sums=('2f782d729c8bab571a6b9867f7280d16') build() { - cd "${srcdir}/bdb-${pkgver}" + cd "$srcdir/bdb-$pkgver" ruby extconf.rb make } package() { - cd "${srcdir}/bdb-${pkgver}" + cd "$srcdir/bdb-$pkgver" - make DESTDIR="${pkgdir}" install + make DESTDIR="$pkgdir/" install - install -d -m755 ${pkgdir}/usr/share/doc/${pkgname} - install -m644 README ${pkgdir}/usr/share/doc/${pkgname}/README + install -d -m 755 "$pkgdir/usr/share/doc/$pkgname/" + install -m 644 README.en "$pkgdir/usr/share/doc/$pkgname/" } # vim:set ts=2 sw=2 et: diff --git a/screenalert/PKGBUILD b/screenalert/PKGBUILD index 063e5881e..991e04c02 100644 --- a/screenalert/PKGBUILD +++ b/screenalert/PKGBUILD @@ -5,8 +5,10 @@ pkgver=0.1 pkgrel=2 pkgdesc="Screenalert, are notifications windows styled, every user/program can send an alert on your display." url="http://sourceforge.net/projects/screenalert/" +arch=('i686') depends=('gtk2') -source=(http://dl.sourceforge.net/sourceforge/screenalert/$pkgname-$pkgver.tar.bz2) +source=(http://ignum.dl.sourceforge.net/project/screenalert/ScreenAlert/0.1%20-%20beta/$pkgname-$pkgver.tar.bz2) +license=('GLP') md5sums=('8348e0951c43a2e15278b8e2a5f294b9') build() { diff --git a/tkcvs/PKGBUILD b/tkcvs/PKGBUILD index 596d8ec88..103ad0aba 100644 --- a/tkcvs/PKGBUILD +++ b/tkcvs/PKGBUILD @@ -3,17 +3,17 @@ # Contributor: Tom Newsom pkgname=tkcvs -pkgver=8.2.2 +pkgver=8.2.3 pkgrel=1 -pkgdesc="tkcvs is a graphical front end for cvs" +pkgdesc="tkcvs is a graphical interface to cvs and subversion" license=('GPL') depends=('subversion' 'cvs' 'tk' 'diffutils') arch=('i686' 'x86_64') -source=(http://www.twobarleycorns.net/tkcvs_${pkgver//./_}.tar.gz) +source=(http://www.twobarleycorns.net/tkcvs-$pkgver.tar.gz) url="http://www.twobarleycorns.net/tkcvs.html" -md5sums=('8ad8f5a3b32392fa02a2fffa42032432') +md5sums=('d6bde44169d5943bd7f63e58c0748509') build() { - cd $startdir/src/tkcvs_${pkgver//./_} + cd $startdir/src/tkcvs-$pkgver ./doinstall.tcl -nox $startdir/pkg/usr } diff --git a/upp-svn/PKGBUILD b/upp-svn/PKGBUILD index 28be058f3..cfbfefb92 100644 --- a/upp-svn/PKGBUILD +++ b/upp-svn/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Jan Dolinar pkgname=upp-svn -pkgver=4401 +pkgver=4407 pkgrel=1 pkgdesc="Radical and innovative multiplatform C++ framework (known as U++)" arch=('any') diff --git a/varka-bzr/PKGBUILD b/varka-bzr/PKGBUILD index eebac7714..f60b9b72d 100644 --- a/varka-bzr/PKGBUILD +++ b/varka-bzr/PKGBUILD @@ -1,8 +1,7 @@ -# Contributor: crazyelf5 # Maintainer: crazyelf5 pkgname=varka-bzr -pkgver=latest +pkgver=6 pkgrel=1 pkgdesc="A library on top of gtk to build applications." arch=('i686' 'x86_64') @@ -11,14 +10,35 @@ license=('GPL3') depends=('gobject-introspection' 'gtk3' 'glib2') makedepends=('gcc' 'bzr' 'cmake' 'vala') -build() -{ - bzr branch lp:varka - cd varka +_bzrtrunk=lp:varka +_bzrmod=varka + +build() { + msg "Connecting to Bazaar server...." + + if [[ -d "$_bzrmod" ]]; then + cd "$_bzrmod" && bzr pull "$_bzrtrunk" -r "$pkgver" + msg "The local files are updated." + else + bzr branch "$_bzrtrunk" "$_bzrmod" -r "$pkgver" + fi + + msg "Bazaar checkout done or server timeout" + msg "Starting build..." + + [ -d "$srcdir/$_bzrmod-build" ] && rm -rf "$srcdir/$_bzrmod-build" + cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-build" + cd "$srcdir/$_bzrmod-build" + [ -d build ] && rm -rf build mkdir build cd build cmake .. -DCMAKE_INSTALL_PREFIX=/usr make - make DESTDIR="${pkgdir}" install } +package() { + cd "$srcdir/$_bzrmod-build/build" + make DESTDIR="$pkgdir/" install +} + +# vim:set ts=2 sw=2 et: -- 2.11.4.GIT