diff options
Diffstat (limited to 'textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in')
| -rw-r--r-- | textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in b/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in index cdb29fc9811f..0b3e2e0e187e 100644 --- a/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in +++ b/textproc/uim/files/extra-patch-gtk2_toolbar_Makefile.in @@ -1,6 +1,6 @@ ---- gtk2/toolbar/Makefile.in.orig 2012-03-30 22:02:18.000000000 +0900 -+++ gtk2/toolbar/Makefile.in 2012-04-01 04:11:24.000000000 +0900 -@@ -71,10 +71,7 @@ +--- gtk2/toolbar/Makefile.in.orig 2016-10-14 09:57:35 UTC ++++ gtk2/toolbar/Makefile.in +@@ -88,10 +88,7 @@ am__uim_toolbar_applet_SOURCES_DIST = ap @APPLET_GNOME_TRUE@ uim_toolbar_applet-applet-gnome.$(OBJEXT) \ @APPLET_GNOME_TRUE@ uim_toolbar_applet-common-gtk.$(OBJEXT) uim_toolbar_applet_OBJECTS = $(am_uim_toolbar_applet_OBJECTS) @@ -12,7 +12,7 @@ uim_toolbar_applet_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(uim_toolbar_applet_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -82,9 +79,7 @@ +@@ -99,9 +96,7 @@ uim_toolbar_applet_LINK = $(LIBTOOL) --t am_uim_toolbar_gtk_OBJECTS = uim_toolbar_gtk-standalone-gtk.$(OBJEXT) \ uim_toolbar_gtk-common-gtk.$(OBJEXT) uim_toolbar_gtk_OBJECTS = $(am_uim_toolbar_gtk_OBJECTS) @@ -23,7 +23,7 @@ uim_toolbar_gtk_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(uim_toolbar_gtk_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -@@ -94,10 +89,7 @@ +@@ -111,10 +106,7 @@ am_uim_toolbar_gtk_systray_OBJECTS = \ uim_toolbar_gtk_systray-eggtrayicon.$(OBJEXT) uim_toolbar_gtk_systray_OBJECTS = \ $(am_uim_toolbar_gtk_systray_OBJECTS) @@ -35,7 +35,7 @@ uim_toolbar_gtk_systray_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(uim_toolbar_gtk_systray_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ -@@ -412,16 +404,16 @@ +@@ -443,9 +435,9 @@ uim_pixmapsdir = @uim_pixmapsdir@ EXTRA_DIST = GNOME_UimApplet.server.in.in helper_defs = -DUIM_DATADIR=\""$(datadir)/@PACKAGE@"\" @APPLET_GNOME_TRUE@uim_toolbar_applet_LDADD = @GTK2_LIBS@ @APPLET_GNOME_LIBS@ \ @@ -48,15 +48,7 @@ @APPLET_GNOME_TRUE@uim_toolbar_applet_CPPFLAGS = $(helper_defs) -I$(top_srcdir) -I$(top_builddir) @APPLET_GNOME_TRUE@uim_toolbar_applet_CFLAGS = @GTK2_CFLAGS@ @APPLET_GNOME_CFLAGS@ - # recent version of gcc has the option to suppress the warning - #uim_toolbar_applet_CFLAGS += -Wno-overlength-strings - @APPLET_GNOME_TRUE@uim_toolbar_applet_SOURCES = applet-gnome.c common-gtk.c --@APPLET_GNOME_TRUE@serverdir = $(libdir)/bonobo/servers -+@APPLET_GNOME_TRUE@serverdir = $(prefix)/libdata/bonobo/servers - @APPLET_GNOME_TRUE@server_DATA = GNOME_UimApplet.server - @APPLET_GNOME_TRUE@server_in_files = $(server_DATA:=.in) - @APPLET_GNOME_TRUE@server_in_in_files = $(server_in_files:=.in) -@@ -429,9 +421,9 @@ +@@ -460,9 +452,9 @@ helper_defs = -DUIM_DATADIR=\""$(datadir @APPLET_GNOME_TRUE@ GNOME_UimApplet.server.in.tmp uim_toolbar_gtk_SOURCES = standalone-gtk.c common-gtk.c @@ -69,7 +61,7 @@ uim_toolbar_gtk_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) uim_toolbar_gtk_CFLAGS = @GTK2_CFLAGS@ -@@ -440,9 +432,9 @@ +@@ -471,9 +463,9 @@ uim_toolbar_gtk_systray_SOURCES = systra uim_toolbar_gtk_systray_LDADD = @GTK2_LIBS@ \ @X11_LIBS@ \ |