Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=ayatana.git;a=commitdiff;h=938e1eb682b78aac1c3f5912f3cd9c6400920876

commit 938e1eb682b78aac1c3f5912f3cd9c6400920876
Merge: 65b30a9 dddd74f
Author: Devil505 <devil505li...@gmail.com>
Date:   Tue Oct 4 08:51:32 2011 +0200

Merge branch 'master' of git.frugalware.org:/pub/frugalware/frugalware-current

Conflicts:
source/ayatana-extra/bamf/FrugalBuild
source/base/glib2/FrugalBuild
source/devel/json-glib/FrugalBuild
source/xapps-extra/marlin/FrugalBuild
source/xlib-extra/qt4/FrugalBuild
source/xlib/gdk-pixbuf2/FrugalBuild
source/xlib/gtk+3/FrugalBuild
source/xlib/pango/FrugalBuild

diff --cc source/xlib-extra/qt4/FrugalBuild
index dde2254,75c63cf..0993eae
--- a/source/xlib-extra/qt4/FrugalBuild
+++ b/source/xlib-extra/qt4/FrugalBuild
@@@ -6,8 -6,8 +6,8 @@@ USE_DETECTDEPENDS=${USE_DETECTDEPENDS:-

pkgname=qt4
_F_archive_name=qt-everywhere-opensource-src
- pkgver=4.7.3
- pkgrel=5
+ pkgver=4.7.4
-pkgrel=1
++pkgrel=2
pkgdesc="The QT4 GUI toolkit."
url="http://qt.nokia.com/products/";
depends=()
@@@ -21,23 -21,11 +21,21 @@@ options=('scriptlet' 'nodocs'
_F_archive_grepv="-tp"
up2date="Flasttar ftp://ftp.qt.nokia.com/qt/source/";
source=(ftp://ftp.qt.nokia.com/qt/source/$_F_archive_name-$pkgver.tar.gz \
+        qtbug-16292.patch \
+        14_systemtrayicon.diff \
+        15_appmenu.diff \
+        16_qt-designer-toplevel-mode-menubar.diff \
+        26_dbusconnection_pointer.diff \
+        27_dbus_signal_filter_passes_not_handled.diff \
frugalware.patch \
fix-config.tests.patch)
- sha1sums=('765eb70d9779f93fefddddda5e6ddb33f4c0b71e' \
+ sha1sums=('af9016aa924a577f7b06ffd28c9773b56d74c939' \
-          '8d65e6bff36eb0b3219d30101ea7d062504aaaf8' \
-          'e2522839807839f1af77de7ccd4c9e8c7df4acd0')
+          'ec8607cca4b4f71f6fab7309fd59f059f47d5f52' \
+          'b13575e295829fa26ccaf6b11eafa394955ae073' \
+          'db49f3fb3b7711a61cc6009347e455ef4030e91f' \
+          '2391d180dea337fd5230273e0f1adda43491cc19' \
+          '88c4b4c59718b237cebbff4925d8361d0c24db64' \
+          '95d384a06306b0f545c90364a12e4a70efc2f99d' \
-           '8d65e6bff36eb0b3219d30101ea7d062504aaaf8' \
-           'e2522839807839f1af77de7ccd4c9e8c7df4acd0')
export LD_LIBRARY_PATH=$Fsrcdir/$_F_archive_name-$pkgver/lib:${LD_LIBRARY_PATH}
export YACC='yacc -d'

diff --cc source/xlib/gtk+3/FrugalBuild
index 255e98b,95a9622..e9d825e
--- a/source/xlib/gtk+3/FrugalBuild
+++ b/source/xlib/gtk+3/FrugalBuild
@@@ -18,17 -19,9 +19,17 @@@ _F_gnome_glib="y
Finclude gnome gnome-scriptlet
url="http://www.gtk.org/";
_F_cd_path="gtk+-$pkgver"
-source=($source im-cedilla.conf)
+source=($source im-cedilla.conf \
+        043_ubuntu_menu_proxy.patch \
+        062_ubuntu-set-grab-add.patch \
+        072_indicator_menu_update.patch \
+        100_overlay_scrollbar_loading.patch)
- sha1sums=('30bf6240b3df62d6032c939d0eddbcae228ab7e2' \
+ sha1sums=('907962ce042827cd6db89ba16cbfa72c2d3942a2' \
-          'f8a64241bcc873c1f1110e16306e48577a41852b')
+          'f8a64241bcc873c1f1110e16306e48577a41852b' \
+          'a96b2be5f4cae4a9591bebfdbaae1bb504b569d4' \
+          'f4f56d3d79d0f84f5f882efd901d7951b412391d' \
+          '430896c9631da8d12b240fc0a9f47fe054da89eb' \
+          '67fe5f488339fb94cb6830ce285241b5fea8e590')

if [ "$_F_gnome_git" != "n" ]; then
unset sha1sums
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to