summaryrefslogtreecommitdiffstats
path: root/ports-mgmt/gnome-packagekit/files
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-08-24 18:43:50 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2011-08-24 18:43:50 +0800
commit71dfde0760b13ea318c656ddead128dbe634597d (patch)
tree604a8dbb563a5add31be347304c3eef5aa78e2a5 /ports-mgmt/gnome-packagekit/files
parentaf8341069438e68bbabd2ab98ad25e0876c4d400 (diff)
downloadmarcuscom-ports-71dfde0760b13ea318c656ddead128dbe634597d.tar
marcuscom-ports-71dfde0760b13ea318c656ddead128dbe634597d.tar.gz
marcuscom-ports-71dfde0760b13ea318c656ddead128dbe634597d.tar.bz2
marcuscom-ports-71dfde0760b13ea318c656ddead128dbe634597d.tar.lz
marcuscom-ports-71dfde0760b13ea318c656ddead128dbe634597d.tar.xz
marcuscom-ports-71dfde0760b13ea318c656ddead128dbe634597d.tar.zst
marcuscom-ports-71dfde0760b13ea318c656ddead128dbe634597d.zip
Clean up after libproxy,libnotify,poppler*,webkit-gtk2 and glib+gtk updates.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16129 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'ports-mgmt/gnome-packagekit/files')
-rw-r--r--ports-mgmt/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in11
-rw-r--r--ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c66
-rw-r--r--ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c11
-rw-r--r--ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus.c59
-rw-r--r--ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c38
-rw-r--r--ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c11
-rw-r--r--ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c29
7 files changed, 0 insertions, 225 deletions
diff --git a/ports-mgmt/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in b/ports-mgmt/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in
deleted file mode 100644
index fc8e606d8..000000000
--- a/ports-mgmt/gnome-packagekit/files/patch-data_gnome-packagekit.schemas.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/gnome-packagekit.schemas.in.orig 2010-02-27 14:22:29.000000000 +0800
-+++ data/gnome-packagekit.schemas.in 2010-02-27 14:22:45.000000000 +0800
-@@ -540,7 +540,7 @@
- <applyto>/apps/gnome_settings_daemon/gtk-modules/pk-gtk-module</applyto>
- <owner>gnome-packagekit</owner>
- <type>bool</type>
-- <default>true</default>
-+ <default>false</default>
- <locale name="C">
- <short>GTK+ module for font installation</short>
- <long>This key determines if applications should be able to prompt for fonts</long>
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c
deleted file mode 100644
index 36c7b7258..000000000
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-check-update.c
+++ /dev/null
@@ -1,66 +0,0 @@
---- src/gpk-check-update.c.orig 2010-09-22 17:20:47.000000000 +0200
-+++ src/gpk-check-update.c 2011-03-07 18:27:18.000000000 +0100
-@@ -388,9 +388,8 @@ gpk_check_update_finished_notify (GpkChe
- }
-
- /* TRANSLATORS: title: system update completed all okay */
-- notification = notify_notification_new_with_status_icon (_("The system update has completed"),
-- message_text->str, "help-browser",
-- cupdate->priv->status_icon);
-+ notification = notify_notification_new (_("The system update has completed"),
-+ message_text->str, "help-browser");
- notify_notification_set_timeout (notification, 15000);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- if (restart == PK_RESTART_ENUM_SYSTEM) {
-@@ -456,7 +455,7 @@ gpk_check_update_show_error (GpkCheckUpd
-
- /* do the bubble */
- egg_debug ("title=%s, message=%s", title, message);
-- notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon);
-+ notification = notify_notification_new (title, message, "help-browser");
- if (notification == NULL) {
- egg_warning ("failed to get bubble");
- goto out;
-@@ -656,7 +655,7 @@ gpk_check_update_critical_updates_warnin
-
- /* do the bubble */
- egg_debug ("title=%s, message=%s", title, message);
-- notification = notify_notification_new_with_status_icon (title, message, "help-browser", cupdate->priv->status_icon);
-+ notification = notify_notification_new (title, message, "help-browser");
- if (notification == NULL) {
- egg_warning ("failed to get bubble");
- return;
-@@ -782,9 +781,8 @@ gpk_check_update_check_on_battery (GpkCh
- /* TRANSLATORS: policy says update, but we are on battery and so prompt */
- message = _("Automatic updates are not being installed as the computer is running on battery power");
- /* TRANSLATORS: informs user will not install by default */
-- notification = notify_notification_new_with_status_icon (_("Updates not installed"),
-- message, "help-browser",
-- cupdate->priv->status_icon);
-+ notification = notify_notification_new (_("Updates not installed"),
-+ message, "help-browser");
- notify_notification_set_timeout (notification, 15000);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- // notify_notification_add_action (notification, "do-not-show-update-not-battery",
-@@ -839,10 +837,10 @@ gpk_check_update_notify_doing_updates (G
- goto out;
-
- /* TRANSLATORS: title: notification when we scheduled an automatic update */
-- notification = notify_notification_new_with_status_icon (_("Updates are being installed"),
-+ notification = notify_notification_new (_("Updates are being installed"),
- /* TRANSLATORS: tell the user why the hard disk is grinding... */
- _("Updates are being automatically installed on your computer"),
-- "software-update-urgent", cupdate->priv->status_icon);
-+ "software-update-urgent");
- notify_notification_set_timeout (notification, 15000);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- /* TRANSLATORS: button: cancel the update system */
-@@ -1328,7 +1326,7 @@ gpk_check_update_get_distro_upgrades_fin
-
- /* TRANSLATORS: a distro update is available, e.g. Fedora 8 to Fedora 9 */
- title = _("Distribution upgrades available");
-- notification = notify_notification_new_with_status_icon (title, string->str, "help-browser", cupdate->priv->status_icon);
-+ notification = notify_notification_new (title, string->str, "help-browser");
- if (notification == NULL) {
- egg_warning ("failed to make bubble");
- goto out;
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c
deleted file mode 100644
index 78c8ceaa5..000000000
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus-task.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gpk-dbus-task.c.orig 2011-03-07 18:28:01.000000000 +0100
-+++ src/gpk-dbus-task.c 2011-03-07 18:28:10.000000000 +0100
-@@ -377,7 +377,7 @@ gpk_dbus_task_handle_error (GpkDbusTask
- dtask->priv->cached_error_code = g_object_ref (error_code);
-
- /* do the bubble */
-- notification = notify_notification_new (title, message, "help-browser", NULL);
-+ notification = notify_notification_new (title, message, "help-browser");
- notify_notification_set_timeout (notification, 15000);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- notify_notification_add_action (notification, "show-error-details",
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus.c
deleted file mode 100644
index 471734de6..000000000
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-dbus.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- src/gpk-dbus.c.orig 2010-07-20 09:56:17.000000000 +0200
-+++ src/gpk-dbus.c 2010-07-21 17:14:31.000000000 +0200
-@@ -32,6 +32,12 @@
- #include <unistd.h>
- #endif /* HAVE_UNISTD_H */
-
-+#ifdef __FreeBSD__
-+#include <sys/sysctl.h>
-+//#include <errno.h>
-+#include <string.h>
-+#endif
-+
- #include <sys/wait.h>
- #include <fcntl.h>
-
-@@ -212,6 +218,13 @@ gpk_dbus_get_exec_for_sender (GpkDbus *d
- GError *error = NULL;
- guint pid;
-
-+#ifdef __FreeBSD__
-+ size_t len;
-+ int mib[4];
-+/* figure out how to use the above GError */
-+ int error2;
-+#endif
-+
- g_return_val_if_fail (PK_IS_DBUS (dbus), NULL);
- g_return_val_if_fail (sender != NULL, NULL);
-
-@@ -223,7 +236,29 @@ gpk_dbus_get_exec_for_sender (GpkDbus *d
- }
-
- /* get command line from proc */
-+#ifdef __FreeBSD__
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PATHNAME;
-+ mib[3] = pid;
-+
-+ len = 0;
-+
-+ error2 = sysctl(mib, 4, NULL, &len, NULL, 0);
-+ if (error2) {
-+ printf ("Error: %s\n", strerror(error2));
-+ goto out;
-+ }
-+
-+ filename = malloc(len);
-+ error2 = sysctl(mib, 4, filename, &len, NULL, 0);
-+ if (error2) {
-+ printf ("Error: %s\n", strerror(error2));
-+ goto out;
-+ }
-+#else
- filename = g_strdup_printf ("/proc/%i/exe", pid);
-+#endif
- cmdline = g_file_read_link (filename, &error);
- if (cmdline == NULL) {
- egg_warning ("failed to find exec: %s", error->message);
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c
deleted file mode 100644
index 2fb068576..000000000
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-firmware.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/gpk-firmware.c.orig 2011-03-07 18:20:16.000000000 +0100
-+++ src/gpk-firmware.c 2011-03-07 18:20:38.000000000 +0100
-@@ -268,7 +268,7 @@ gpk_firmware_require_restart (GpkFirmwar
- message = _("You will need to restart this computer before the hardware will work correctly.");
-
- /* TRANSLATORS: title of libnotify bubble */
-- notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL);
-+ notification = notify_notification_new (_("Additional software was installed"), message, "help-browser");
- notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
-
-@@ -303,7 +303,7 @@ gpk_firmware_require_replug (GpkFirmware
- message = _("You will need to remove and then reinsert the hardware before it will work correctly.");
-
- /* TRANSLATORS: title of libnotify bubble */
-- notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL);
-+ notification = notify_notification_new (_("Additional software was installed"), message, "help-browser");
- notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
-
-@@ -330,7 +330,7 @@ gpk_firmware_require_nothing (GpkFirmwar
- message = _("Your hardware has been set up and is now ready to use.");
-
- /* TRANSLATORS: title of libnotify bubble */
-- notification = notify_notification_new (_("Additional software was installed"), message, "help-browser", NULL);
-+ notification = notify_notification_new (_("Additional software was installed"), message, "help-browser");
- notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
-
-@@ -624,7 +624,7 @@ gpk_firmware_timeout_cb (gpointer data)
- }
-
- /* TRANSLATORS: title of libnotify bubble */
-- notification = notify_notification_new (_("Additional firmware required"), string->str, "help-browser", NULL);
-+ notification = notify_notification_new (_("Additional firmware required"), string->str, "help-browser");
- notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- notify_notification_add_action (notification, "install-firmware",
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c
deleted file mode 100644
index 51cc104ea..000000000
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-hardware.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gpk-hardware.c.orig 2011-03-07 18:21:23.000000000 +0100
-+++ src/gpk-hardware.c 2011-03-07 18:21:32.000000000 +0100
-@@ -183,7 +183,7 @@ gpk_hardware_what_provides_cb (GObject *
- message = g_strdup_printf ("%s\n\t%s", _("Additional packages can be installed to support this hardware"), package);
- /* TRANSLATORS: a new bit of hardware has been plugged in */
- body = g_strdup_printf ("%s", _("New hardware attached"));
-- notification = notify_notification_new (body, message, "help-browser", NULL);
-+ notification = notify_notification_new (body, message, "help-browser");
- notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- notify_notification_add_action (notification, GPK_HARDWARE_INSTALL_ACTION,
diff --git a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c b/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c
deleted file mode 100644
index f724d7845..000000000
--- a/ports-mgmt/gnome-packagekit/files/patch-src_gpk-watch.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/gpk-watch.c.orig 2010-09-22 17:20:31.000000000 +0200
-+++ src/gpk-watch.c 2011-03-07 09:32:41.000000000 +0100
-@@ -1153,7 +1153,7 @@ gpk_watch_process_messages_cb (PkMessage
- }
-
- /* do the bubble */
-- notification = notify_notification_new_with_status_icon (gpk_message_enum_to_localised_text (type), details, "emblem-important", watch->priv->status_icon);
-+ notification = notify_notification_new (gpk_message_enum_to_localised_text (type), details, "emblem-important");
- notify_notification_set_timeout (notification, NOTIFY_EXPIRES_NEVER);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- ret = notify_notification_show (notification, &error);
-@@ -1213,7 +1213,7 @@ gpk_watch_process_error_code (GpkWatch *
- title_prefix = g_strdup_printf ("%s: %s", _("Package Manager"), title);
-
- /* do the bubble */
-- notification = notify_notification_new (title_prefix, message, "help-browser", NULL);
-+ notification = notify_notification_new (title_prefix, message, "help-browser");
- notify_notification_set_timeout (notification, 15000);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- notify_notification_add_action (notification, "show-error-details",
-@@ -1392,7 +1392,7 @@ gpk_watch_adopt_cb (PkClient *client, GA
- goto out;
-
- /* TRANSLATORS: title: an action has finished, and we are showing the libnotify bubble */
-- notification = notify_notification_new (_("Task completed"), message, "help-browser", NULL);
-+ notification = notify_notification_new (_("Task completed"), message, "help-browser");
- notify_notification_set_timeout (notification, 5000);
- notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW);
- notify_notification_add_action (notification, "do-not-show-notify-complete",