rpms/abrt/devel abrt-1.1.10-applet.patch, NONE, 1.1 abrt.spec, 1.37, 1.38

Jiří Moskovčák jmoskovc at fedoraproject.org
Mon Jul 26 14:07:20 UTC 2010


Author: jmoskovc

Update of /cvs/extras/rpms/abrt/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6559

Modified Files:
	abrt.spec 
Added Files:
	abrt-1.1.10-applet.patch 
Log Message:
build fixes


abrt-1.1.10-applet.patch:
 CCApplet.cpp |    2 +-
 Makefile.am  |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE abrt-1.1.10-applet.patch ---
commit 406c8793bef87fb49333d7196ea23d42be87c21e
Author: Jiri Moskovcak <jmoskovc at redhat.com>
Date:   Mon Jul 26 15:33:02 2010 +0200

    APPLET: minor build fix

diff --git a/src/Applet/CCApplet.cpp b/src/Applet/CCApplet.cpp
index 8596f4c..02d911d 100644
--- a/src/Applet/CCApplet.cpp
+++ b/src/Applet/CCApplet.cpp
@@ -361,7 +361,7 @@ void CApplet::Disable(const char *reason)
     if (pixbuf)
     {
         gray_scaled = gdk_pixbuf_copy(pixbuf);
-        gdk_pixbuf_saturate_and_pixelate(pixbuf, gray_scaled, 0.0, NULL);
+        gdk_pixbuf_saturate_and_pixelate(pixbuf, gray_scaled, 0.0, false);
         gtk_status_icon_set_from_pixbuf(m_pStatusIcon, gray_scaled);
 //do we need to free pixbufs nere?
     }
diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index 6abef3b..77c9fc9 100644
--- a/src/Applet/Makefile.am
+++ b/src/Applet/Makefile.am
@@ -26,10 +26,10 @@ abrt_applet_LDADD = \
     -lglib-2.0 \
     -lgthread-2.0 \
     $(DBUS_LIBS) \
-    $(LIBNOTIFY_LIBS)
+    $(LIBNOTIFY_LIBS) \
+    $(GTK_LIBS)
 #    ../../lib/Utils/libABRTdUtils.la
 #    $(DL_LIBS)
-#    $(GTK_LIBS)
 
 EXTRA_DIST = abrt-applet.desktop
 


Index: abrt.spec
===================================================================
RCS file: /cvs/extras/rpms/abrt/devel/abrt.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- abrt.spec	26 Jul 2010 12:20:42 -0000	1.37
+++ abrt.spec	26 Jul 2010 14:07:20 -0000	1.38
@@ -11,7 +11,7 @@
 %if 0%{?_buildid}
 %define pkg_release 0.%{?_buildid}%{?dist}
 %else
-%define pkg_release 1%{?dist}
+%define pkg_release 2%{?dist}
 %endif
 
 Summary: Automatic bug detection and reporting tool
@@ -27,6 +27,7 @@ Source1: abrt.init
 Patch0: abrt-1.0.9-hideprefs.patch
 Patch1: abrt_disable_gpgcheck.diff
 Patch2: blacklist_mono.patch
+Patch3: abrt-1.1.10-applet.patch
 BuildRequires: dbus-devel
 BuildRequires: gtk2-devel
 BuildRequires: curl-devel
@@ -231,6 +232,7 @@ Virtual package to make easy default ins
 %patch1 -p1 -b .disable_gpg_check
 # general patches
 %patch2 -p1 -b .blacklist_mono
+%patch3 -p1 -b .applet_build
 
 %build
 %configure
@@ -443,6 +445,9 @@ fi
 %defattr(-,root,root,-)
 
 %changelog
+* Mon Jul 26 2010 Jiri Moskovcak <jmoskovc at redhat.com> 1.1.10-2
+- minor build fixes
+
 * Mon Jul 26 2010 Jiri Moskovcak <jmoskovc at redhat.com> 1.1.10-1
 - blacklisted mono-core package
 - die with an error message if the database plugin is not accessible when needed (kklic at redhat.com)



More information about the scm-commits mailing list