From 5ddbbfd5af9236f819933876ba9d0575597db5f8 Mon Sep 17 00:00:00 2001 From: Alexander Boström Date: Jul 11 2011 21:57:22 +0000 Subject: Upgrade to 4.0.20 --- diff --git a/.gitignore b/.gitignore index fcef8e0..acf1dc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ java-gnome-4.0.16.tar.bz2 /java-gnome-4.0.19.tar.bz2 +/java-gnome-4.0.20.tar.xz diff --git a/java-gnome-4.0.20-libnotify-0.7.patch b/java-gnome-4.0.20-libnotify-0.7.patch new file mode 100644 index 0000000..84b9082 --- /dev/null +++ b/java-gnome-4.0.20-libnotify-0.7.patch @@ -0,0 +1,226 @@ +diff -ur java-gnome-4.0.20.orig/configure java-gnome-4.0.20.libnotify/configure +--- java-gnome-4.0.20.orig/configure 2011-07-11 03:13:12.000000000 +0200 ++++ java-gnome-4.0.20.libnotify/configure 2011-07-11 23:22:52.203647600 +0200 +@@ -805,7 +805,7 @@ + "gtkspell"); + + check_system_library(@gnomedev_libs, +- "libnotify >= 0.4.5 libnotify < 0.7.0", ++ "libnotify >= 0.7.0", + "LibNotify", + "libnotify"); + +@@ -853,7 +853,7 @@ + "FIXME"); + + check_system_library(@gnomedev_libs, +- "libnotify >= 0.4.5 libnotify < 0.7.0", ++ "libnotify >= 0.7.0", + "LibNotify", + "FIXME"); + +@@ -917,7 +917,7 @@ + "libgtksourceview2.0-dev"); + + check_system_library(@gnomedev_libs, +- "libnotify >= 0.4.5 libnotify < 0.7.0", ++ "libnotify >= 0.7.0", + "LibNotify", + "libnotify-dev"); + +@@ -968,7 +968,7 @@ + "FIXME"); + + check_system_library(@gnomedev_libs, +- "libnotify >= 0.4.5 libnotify < 0.7.0", ++ "libnotify >= 0.7.0", + "LibNotify", + "FIXME"); + +@@ -1020,7 +1020,7 @@ + "lib${cpu_arch}gtksourceview-2.0-devel"); + + check_system_library(@gnomedev_libs, +- "libnotify >= 0.4.5 libnotify < 0.7.0", ++ "libnotify >= 0.7.0", + "LibNotify", + "lib${cpu_arch}notify-devel"); + +@@ -1083,7 +1083,7 @@ + "gtksourceview2-devel"); + + check_system_library(@gnomedev_libs, +- "libnotify >= 0.4.5 libnotify < 0.7.0", ++ "libnotify >= 0.7.0", + "LibNotify", + "libnotify-devel"); + +Endast i java-gnome-4.0.20.libnotify: configure~ +diff -ur java-gnome-4.0.20.orig/doc/examples/notify/ExampleLowBattery.java java-gnome-4.0.20.libnotify/doc/examples/notify/ExampleLowBattery.java +--- java-gnome-4.0.20.orig/doc/examples/notify/ExampleLowBattery.java 2011-07-11 03:13:12.000000000 +0200 ++++ java-gnome-4.0.20.libnotify/doc/examples/notify/ExampleLowBattery.java 2011-07-11 23:23:05.827558720 +0200 +@@ -61,7 +61,7 @@ + */ + + notification = new Notification("Low Battery Example", "Your battery is low!", +- "messagebox_warning", icon); ++ "messagebox_warning"); + + /* + * Quit the application after notification disappears. +Endast i java-gnome-4.0.20.libnotify/doc/examples/notify: ExampleLowBattery.java~ +diff -ur java-gnome-4.0.20.orig/src/bindings/org/gnome/notify/Notification.java java-gnome-4.0.20.libnotify/src/bindings/org/gnome/notify/Notification.java +--- java-gnome-4.0.20.orig/src/bindings/org/gnome/notify/Notification.java 2011-07-11 03:13:12.000000000 +0200 ++++ java-gnome-4.0.20.libnotify/src/bindings/org/gnome/notify/Notification.java 2011-07-11 23:26:19.123297334 +0200 +@@ -80,45 +80,7 @@ + */ + + public Notification(String summary, String body, String icon) { +- super(NotifyNotification.createNotification(summary, body, icon, null)); +- } +- +- /** +- * Create a new notification. +- * +- *

+- * The summary appears on the titlebar of notification and body appears as +- * its text. Icon may be a string defining a theme icon or the filename +- * identifying the icon that appears next to text. Attach identifies the +- * widget that the notification relates to. +- * +- *

+- * Note that all but summary can be null. +- * +- * @since 4.0.12 +- * @deprecated In GNOME 3, notifications will be independent of widgets +- * and status icons. See +- * http://live.gnome.org/GnomeShell/Design +- * /Guidelines/MessageTray/Compatibility +- */ +- +- public Notification(String summary, String body, String icon, Widget attach) { +- super(NotifyNotification.createNotification(summary, body, icon, attach)); +- } +- +- /** +- * Create a new notification attached to a {@link StatusIcon}. See +- * {@link #Notification(String,String,String,Widget) Notification()} for +- * other parameters. +- * +- * @since 4.0.12 +- * @deprecated In GNOME 3, notifications will be independent of widgets +- * and status icons. See +- * http://live.gnome.org/GnomeShell/Design +- * /Guidelines/MessageTray/Compatibility +- */ +- public Notification(String summary, String body, String icon, StatusIcon statusIcon) { +- super(NotifyNotification.createNotificationWithStatusIcon(summary, body, icon, statusIcon)); ++ super(NotifyNotification.createNotification(summary, body, icon)); + } + + /** +@@ -135,43 +97,6 @@ + } + + /** +- * Attaches Notification to a Widget setting hints to its location. +- * +- * @since 4.0.12 +- * @deprecated In GNOME 3, notifications will be independent of widgets +- * and status icons. See +- * http://live.gnome.org/GnomeShell/Design +- * /Guidelines/MessageTray/Compatibility +- */ +- public void attach(Widget attach) { +- NotifyNotification.attachToWidget(this, attach); +- } +- +- /** +- * Attaches Notification to a {@link StatusIcon} setting hints to its +- * location. +- * +- * @since 4.0.12 +- * @deprecated In GNOME 3, notifications will be independent of widgets +- * and status icons. See +- * http://live.gnome.org/GnomeShell/Design +- * /Guidelines/MessageTray/Compatibility +- */ +- public void attach(StatusIcon statusIcon) { +- NotifyNotification.attachToStatusIcon(this, statusIcon); +- } +- +- /** +- * Sets the position of the notification to display on screen. +- * +- * @since 4.0.12 +- * @deprecated In GNOME 3 +- */ +- public void setGeometryHints(Screen screen, int x, int y) { +- NotifyNotification.setGeometryHints(this, screen, x, y); +- } +- +- /** + * Display the notification on screen. + * + * @since 4.0.12 +Endast i java-gnome-4.0.20.libnotify/src/bindings/org/gnome/notify: Notification.java~ +diff -ur java-gnome-4.0.20.orig/src/defs/NotifyNotification.defs java-gnome-4.0.20.libnotify/src/defs/NotifyNotification.defs +--- java-gnome-4.0.20.orig/src/defs/NotifyNotification.defs 2011-07-11 03:13:12.000000000 +0200 ++++ java-gnome-4.0.20.libnotify/src/defs/NotifyNotification.defs 2011-07-11 23:27:14.920933091 +0200 +@@ -15,19 +15,6 @@ + '("const-gchar*" "summary") + '("const-gchar*" "body" (null-ok)) + '("const-gchar*" "icon" (null-ok)) +- '("GtkWidget*" "attach" (null-ok)) +- ) +-) +- +-(define-function notify_notification_new_with_status_icon +- (is-constructor-of "NotifyNotification") +- (c-name "notify_notification_new_with_status_icon") +- (return-type "NotifyNotification*") +- (parameters +- '("const-gchar*" "summary") +- '("const-gchar*" "body" (null-ok)) +- '("const-gchar*" "icon" (null-ok)) +- '("GtkStatusIcon*" "status_icon") + ) + ) + +@@ -42,35 +29,6 @@ + ) + ) + +-(define-method attach_to_widget +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_widget") +- (return-type "none") +- (parameters +- '("GtkWidget*" "attach") +- ) +-) +- +-(define-method attach_to_status_icon +- (of-object "NotifyNotification") +- (c-name "notify_notification_attach_to_status_icon") +- (return-type "none") +- (parameters +- '("GtkStatusIcon*" "status_icon") +- ) +-) +- +-(define-method set_geometry_hints +- (of-object "NotifyNotification") +- (c-name "notify_notification_set_geometry_hints") +- (return-type "none") +- (parameters +- '("GdkScreen*" "screen") +- '("gint" "x") +- '("gint" "y") +- ) +-) +- + (define-method show + (of-object "NotifyNotification") + (c-name "notify_notification_show") +Endast i java-gnome-4.0.20.libnotify/src/defs: NotifyNotification.defs~ diff --git a/java-gnome.spec b/java-gnome.spec index 6fabbc5..d3b7882 100644 --- a/java-gnome.spec +++ b/java-gnome.spec @@ -1,9 +1,9 @@ Summary: Java GNOME bindings Name: java-gnome -Version: 4.0.19 -Release: 5%{?dist} +Version: 4.0.20 +Release: 1%{?dist} URL: http://java-gnome.sourceforge.net -Source0: http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/java-gnome-%{version}.tar.bz2 +Source0: http://ftp.gnome.org/pub/gnome/sources/java-gnome/4.0/java-gnome-%{version}.tar.xz # This is the "Classpath" exception. License: GPLv2 with exceptions Group: System Environment/Libraries @@ -33,10 +33,9 @@ Requires: java >= 1:1.6.0 Requires: jpackage-utils # A backport from the 4.1 branch, but unfortunately this causes an # incompatible change in the gtk-4.0.jar API as it removes the parts -# that cannot be implemented with libnotify 0.7. Is likely to appear -# in 4.0.20 as well. +# that cannot be implemented with libnotify 0.7. %if (0%{?fedora} >= 15 || 0%{?rhel} >= 7 || 0%{?fedora}%{?rhel} == 0) -Patch0: java-gnome-4.0.19-libnotify-0.7.patch +Patch0: java-gnome-4.0.20-libnotify-0.7.patch %endif # Workaround https://bugzilla.redhat.com/show_bug.cgi?id=715804 Patch1: java-gnome-javadocbuild.patch @@ -66,7 +65,7 @@ design documentation and sample code. %prep %setup -q %if (0%{?fedora} >= 15 || 0%{?rhel} >= 7 || 0%{?fedora}%{?rhel} == 0) -%patch0 -p0 -b .libnotify07 +%patch0 -p1 -b .libnotify07 rm -f doc/examples/*/*.java.libnotify07 %endif %patch1 -p0 -b .javadocbuild @@ -119,6 +118,10 @@ rm -rf %{buildroot} %{_javadocdir}/%{name}-%{version} %changelog +* Mon Jul 11 2011 Alexander Boström - 4.0.20-1 +- Upgrade to 4.0.20 +- reapply libnotify patch + * Thu Jul 07 2011 Alexander Boström - 4.0.19-5 - Rebuild diff --git a/sources b/sources index 09efde4..70b82ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3689f1ca382d87dcd13c5e0af68990a5 java-gnome-4.0.19.tar.bz2 +f8dad414dbd1b864afec59c76e16d7f4 java-gnome-4.0.20.tar.xz