Skip to content
Permalink
Browse files

libgnomeui: use autoreconf in +x11 to fix intltool configuration, pat…

…ch to fix format-nonliteral error when building with clang (https://trac.macports.org/ticket/42734).

git-svn-id: https://svn.macports.org/repository/macports/trunk/dports@117643 d073be05-634f-4543-b044-5fe20cf6d1d6
  • Loading branch information
dbevans committed Mar 6, 2014
1 parent db68cba commit a2921210d688a41d748efcb006828fd97f93b042
Showing with 49 additions and 3 deletions.
  1. +3 −3 gnome/libgnomeui/Portfile
  2. +46 −0 gnome/libgnomeui/files/patch-libgnomeui-gnome-gconf-ui.c.diff
@@ -5,7 +5,7 @@ PortSystem 1.0

name libgnomeui
version 2.24.5
revision 11
revision 12
set branch [join [lrange [split ${version} .] 0 1] .]
maintainers nomaintainer
categories gnome
@@ -34,7 +34,8 @@ depends_lib port:gconf \
port:libffi \
port:libgnome-keyring

patchfiles patch-configure.in.diff
patchfiles patch-configure.in.diff \
patch-libgnomeui-gnome-gconf-ui.c.diff

use_autoreconf yes
autoreconf.args -fvi
@@ -50,7 +51,6 @@ variant x11 conflicts no_x11 {
depends_lib-append port:xorg-libsm \
port:xorg-libice \
port:xorg-libX11
use_autoreconf no
configure.args-append --x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
configure.args-delete --without-x
@@ -0,0 +1,46 @@
--- libgnomeui/gnome-gconf-ui.c.orig 2014-03-06 13:11:45.000000000 -0800
+++ libgnomeui/gnome-gconf-ui.c 2014-03-06 13:23:51.000000000 -0800
@@ -168,24 +168,27 @@
}

if (have_overridden) {
- fmt = _("The application \"%s\" attempted to change an "
- "aspect of your configuration that your system "
- "administrator or operating system vendor does not "
- "allow you to change. Some of the settings you have "
- "selected may not take effect, or may not be "
- "restored next time you use the application.");
+ dialog = gtk_message_dialog_new (NULL /* parent */,
+ 0 /* flags */,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("The application \"%s\" attempted to change an "
+ "aspect of your configuration that your system "
+ "administrator or operating system vendor does not "
+ "allow you to change. Some of the settings you have "
+ "selected may not take effect, or may not be "
+ "restored next time you use the application."),
+ gnome_program_get_human_readable_name(gnome_program_get()));
} else {
- fmt = _("An error occurred while loading or saving "
- "configuration information for %s. Some of your "
- "configuration settings may not work properly.");
+ dialog = gtk_message_dialog_new (NULL /* parent */,
+ 0 /* flags */,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_OK,
+ _("An error occurred while loading or saving "
+ "configuration information for %s. Some of your "
+ "configuration settings may not work properly."),
+ gnome_program_get_human_readable_name(gnome_program_get()));
}
-
- dialog = gtk_message_dialog_new (NULL /* parent */,
- 0 /* flags */,
- GTK_MESSAGE_ERROR,
- GTK_BUTTONS_OK,
- fmt,
- gnome_program_get_human_readable_name(gnome_program_get()));
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
g_signal_connect (dialog, "response",
G_CALLBACK (gtk_widget_destroy),

0 comments on commit a292121

Please sign in to comment.
You can’t perform that action at this time.