[Midnightbsd-cvs] mports [18795] trunk/x11-toolkits/gtk12/files: move some patches around
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Mon May 4 18:46:19 EDT 2015
Revision: 18795
http://svnweb.midnightbsd.org/mports/?rev=18795
Author: laffer1
Date: 2015-05-04 18:46:18 -0400 (Mon, 04 May 2015)
Log Message:
-----------
move some patches around
Added Paths:
-----------
trunk/x11-toolkits/gtk12/files/patch-Makefile.in
trunk/x11-toolkits/gtk12/files/patch-gtk__gtkrc.c
trunk/x11-toolkits/gtk12/files/patch-gtk__gtkrc.ru
Removed Paths:
-------------
trunk/x11-toolkits/gtk12/files/patch-aa
trunk/x11-toolkits/gtk12/files/patch-ad
trunk/x11-toolkits/gtk12/files/patch-af
Copied: trunk/x11-toolkits/gtk12/files/patch-Makefile.in (from rev 18676, trunk/x11-toolkits/gtk12/files/patch-aa)
===================================================================
--- trunk/x11-toolkits/gtk12/files/patch-Makefile.in (rev 0)
+++ trunk/x11-toolkits/gtk12/files/patch-Makefile.in 2015-05-04 22:46:18 UTC (rev 18795)
@@ -0,0 +1,28 @@
+--- Makefile.in.orig Sun Apr 1 23:14:07 2001
++++ Makefile.in Wed Nov 20 14:56:58 2002
+@@ -35,7 +35,7 @@
+ DESTDIR =
+
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(prefix)/libdata/pkgconfig
+ pkgincludedir = $(includedir)/@PACKAGE@
+
+ top_builddir = .
+@@ -136,7 +136,7 @@
+ EXTRA_DIST = HACKING gtk+.spec.in gtk.m4 makecopyright TODO NEWS.pre-1-0 ChangeLog.pre-1-0 README.cvs-commits intl/libgettext.h intl/po2tbl.sed.in examples/aspectframe/Makefile examples/aspectframe/aspectframe.c examples/Makefile examples/README.1ST examples/extract.awk examples/extract.sh examples/base/Makefile examples/base/base.c examples/buttons/Makefile examples/buttons/buttons.c examples/buttons/info.xpm examples/calendar/Makefile examples/calendar/calendar.c examples/clist/Makefile examples/clist/clist.c examples/entry/Makefile examples/entry/entry.c examples/eventbox/Makefile examples/eventbox/eventbox.c examples/filesel/Makefile examples/filesel/filesel.c examples/gtkdial/Makefile examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c examples/gtkdial/gtkdial.h examples/helloworld/Makefile examples/helloworld/helloworld.c examples/helloworld2/Makefile examples/helloworld2/helloworld2.c examples/list/Makefile examples/list/list.c examples/menu/Makefile examples/menu/menu.c examples/menu/itemfactory.c examples/notebook/Makefile examples/notebook/notebook.c examples/packbox/Makefile examples/packbox/packbox.c examples/packer/Makefile examples/packer/pack.c examples/paned/Makefile examples/paned/paned.c examples/pixmap/Makefile examples/pixmap/pixmap.c examples/progressbar/Makefile examples/progressbar/progressbar.c examples/radiobuttons/Makefile examples/radiobuttons/radiobuttons.c examples/rangewidgets/Makefile examples/rangewidgets/rangewidgets.c examples/rulers/Makefile examples/rulers/rulers.c examples/scribble-simple/Makefile examples/scribble-simple/scribble-simple.c examples/scrolledwin/Makefile examples/scrolledwin/scrolledwin.c examples/selection/Makefile examples/selection/gettargets.c examples/selection/setselection.c examples/statusbar/Makefile examples/statusbar/statusbar.c examples/table/Makefile examples/table/table.c examples/!
text/Makefile examples/text/text.c examples/tictactoe/Makefile examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h examples/tictactoe/ttt_test.c examples/tree/Makefile examples/tree/tree.c examples/wheelbarrow/Makefile examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c examples/fixed/Makefile examples/frame/frame.c examples/frame/Makefile examples/spinbutton/spinbutton.c examples/spinbutton/Makefile examples/find-examples.sh gdk.pc.in gtk+.pc.in
+
+
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(pkglibdir)
+ pkgconfig_DATA = gdk.pc gtk+.pc
+
+ m4datadir = $(datadir)/aclocal
+@@ -438,7 +438,6 @@
+ || exit 1; \
+ fi; \
+ done
+- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
+ info-am:
+ info: info-recursive
+ dvi-am:
Deleted: trunk/x11-toolkits/gtk12/files/patch-aa
===================================================================
--- trunk/x11-toolkits/gtk12/files/patch-aa 2015-05-04 12:58:22 UTC (rev 18794)
+++ trunk/x11-toolkits/gtk12/files/patch-aa 2015-05-04 22:46:18 UTC (rev 18795)
@@ -1,28 +0,0 @@
---- Makefile.in.orig Sun Apr 1 23:14:07 2001
-+++ Makefile.in Wed Nov 20 14:56:58 2002
-@@ -35,7 +35,7 @@
- DESTDIR =
-
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(prefix)/libdata/pkgconfig
- pkgincludedir = $(includedir)/@PACKAGE@
-
- top_builddir = .
-@@ -136,7 +136,7 @@
- EXTRA_DIST = HACKING gtk+.spec.in gtk.m4 makecopyright TODO NEWS.pre-1-0 ChangeLog.pre-1-0 README.cvs-commits intl/libgettext.h intl/po2tbl.sed.in examples/aspectframe/Makefile examples/aspectframe/aspectframe.c examples/Makefile examples/README.1ST examples/extract.awk examples/extract.sh examples/base/Makefile examples/base/base.c examples/buttons/Makefile examples/buttons/buttons.c examples/buttons/info.xpm examples/calendar/Makefile examples/calendar/calendar.c examples/clist/Makefile examples/clist/clist.c examples/entry/Makefile examples/entry/entry.c examples/eventbox/Makefile examples/eventbox/eventbox.c examples/filesel/Makefile examples/filesel/filesel.c examples/gtkdial/Makefile examples/gtkdial/dial_test.c examples/gtkdial/gtkdial.c examples/gtkdial/gtkdial.h examples/helloworld/Makefile examples/helloworld/helloworld.c examples/helloworld2/Makefile examples/helloworld2/helloworld2.c examples/list/Makefile examples/list/list.c examples/menu/Makefile examples/menu/menu.c examples/menu/itemfactory.c examples/notebook/Makefile examples/notebook/notebook.c examples/packbox/Makefile examples/packbox/packbox.c examples/packer/Makefile examples/packer/pack.c examples/paned/Makefile examples/paned/paned.c examples/pixmap/Makefile examples/pixmap/pixmap.c examples/progressbar/Makefile examples/progressbar/progressbar.c examples/radiobuttons/Makefile examples/radiobuttons/radiobuttons.c examples/rangewidgets/Makefile examples/rangewidgets/rangewidgets.c examples/rulers/Makefile examples/rulers/rulers.c examples/scribble-simple/Makefile examples/scribble-simple/scribble-simple.c examples/scrolledwin/Makefile examples/scrolledwin/scrolledwin.c examples/selection/Makefile examples/selection/gettargets.c examples/selection/setselection.c examples/statusbar/Makefile examples/statusbar/statusbar.c examples/table/Makefile examples/table/table.c examples/!
text/Makefile examples/text/text.c examples/tictactoe/Makefile examples/tictactoe/tictactoe.c examples/tictactoe/tictactoe.h examples/tictactoe/ttt_test.c examples/tree/Makefile examples/tree/tree.c examples/wheelbarrow/Makefile examples/wheelbarrow/wheelbarrow.c examples/fixed/fixed.c examples/fixed/Makefile examples/frame/frame.c examples/frame/Makefile examples/spinbutton/spinbutton.c examples/spinbutton/Makefile examples/find-examples.sh gdk.pc.in gtk+.pc.in
-
-
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(pkglibdir)
- pkgconfig_DATA = gdk.pc gtk+.pc
-
- m4datadir = $(datadir)/aclocal
-@@ -438,7 +438,6 @@
- || exit 1; \
- fi; \
- done
-- $(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-hook
- info-am:
- info: info-recursive
- dvi-am:
Deleted: trunk/x11-toolkits/gtk12/files/patch-ad
===================================================================
--- trunk/x11-toolkits/gtk12/files/patch-ad 2015-05-04 12:58:22 UTC (rev 18794)
+++ trunk/x11-toolkits/gtk12/files/patch-ad 2015-05-04 22:46:18 UTC (rev 18795)
@@ -1,45 +0,0 @@
---- gtk/gtkrc.c.orig Thu Mar 15 13:41:40 2001
-+++ gtk/gtkrc.c Fri Apr 16 00:24:54 2004
-@@ -260,9 +260,9 @@
-
- var = getenv("GTK_DATA_PREFIX");
- if (var)
-- path = g_strdup_printf("%s%s", var, "/share/gtk/themes");
-+ path = g_strdup_printf("%s%s", var, "/share/themes");
- else
-- path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
-+ path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes");
-
- for (n = 0; pixmap_path[n]; n++) ;
- if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
-@@ -294,7 +294,7 @@
-
- var = g_get_home_dir ();
- if (var)
-- module_path[n++] = g_strdup_printf("%s%s", var, "/.gtk/lib/themes/engines");
-+ module_path[n++] = g_strdup_printf("%s%s", var, "/.gtk/themes/engines");
- module_path[n] = NULL;
- }
-
-@@ -312,6 +312,10 @@
- gtk_rc_default_files[0] = NULL;
- init = TRUE;
-
-+ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc");
-+ gtk_rc_add_default_file (str);
-+ g_free (str);
-+
- var = getenv("GTK_RC_FILES");
- if (var)
- {
-@@ -326,10 +330,6 @@
- }
- else
- {
-- str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc");
-- gtk_rc_add_default_file (str);
-- g_free (str);
--
- var = g_get_home_dir ();
- if (var)
- {
Deleted: trunk/x11-toolkits/gtk12/files/patch-af
===================================================================
--- trunk/x11-toolkits/gtk12/files/patch-af 2015-05-04 12:58:22 UTC (rev 18794)
+++ trunk/x11-toolkits/gtk12/files/patch-af 2015-05-04 22:46:18 UTC (rev 18795)
@@ -1,11 +0,0 @@
---- gtk/gtkrc.ru.orig Fri May 19 13:18:08 2000
-+++ gtk/gtkrc.ru Fri Feb 9 22:53:43 2001
-@@ -1,7 +1,5 @@
- style "gtk-default-ru" {
-- fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\
-- -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
-- -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
-+ fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
- -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r,*-r-*"
- }
- class "GtkWidget" style "gtk-default-ru"
Copied: trunk/x11-toolkits/gtk12/files/patch-gtk__gtkrc.c (from rev 18676, trunk/x11-toolkits/gtk12/files/patch-ad)
===================================================================
--- trunk/x11-toolkits/gtk12/files/patch-gtk__gtkrc.c (rev 0)
+++ trunk/x11-toolkits/gtk12/files/patch-gtk__gtkrc.c 2015-05-04 22:46:18 UTC (rev 18795)
@@ -0,0 +1,45 @@
+--- gtk/gtkrc.c.orig Thu Mar 15 13:41:40 2001
++++ gtk/gtkrc.c Fri Apr 16 00:24:54 2004
+@@ -260,9 +260,9 @@
+
+ var = getenv("GTK_DATA_PREFIX");
+ if (var)
+- path = g_strdup_printf("%s%s", var, "/share/gtk/themes");
++ path = g_strdup_printf("%s%s", var, "/share/themes");
+ else
+- path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/gtk/themes");
++ path = g_strdup_printf("%s%s", GTK_DATA_PREFIX, "/share/themes");
+
+ for (n = 0; pixmap_path[n]; n++) ;
+ if (n >= GTK_RC_MAX_PIXMAP_PATHS - 1)
+@@ -294,7 +294,7 @@
+
+ var = g_get_home_dir ();
+ if (var)
+- module_path[n++] = g_strdup_printf("%s%s", var, "/.gtk/lib/themes/engines");
++ module_path[n++] = g_strdup_printf("%s%s", var, "/.gtk/themes/engines");
+ module_path[n] = NULL;
+ }
+
+@@ -312,6 +312,10 @@
+ gtk_rc_default_files[0] = NULL;
+ init = TRUE;
+
++ str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtkrc");
++ gtk_rc_add_default_file (str);
++ g_free (str);
++
+ var = getenv("GTK_RC_FILES");
+ if (var)
+ {
+@@ -326,10 +330,6 @@
+ }
+ else
+ {
+- str = g_strdup_printf ("%s%s", GTK_SYSCONFDIR, "/gtk/gtkrc");
+- gtk_rc_add_default_file (str);
+- g_free (str);
+-
+ var = g_get_home_dir ();
+ if (var)
+ {
Copied: trunk/x11-toolkits/gtk12/files/patch-gtk__gtkrc.ru (from rev 18676, trunk/x11-toolkits/gtk12/files/patch-af)
===================================================================
--- trunk/x11-toolkits/gtk12/files/patch-gtk__gtkrc.ru (rev 0)
+++ trunk/x11-toolkits/gtk12/files/patch-gtk__gtkrc.ru 2015-05-04 22:46:18 UTC (rev 18795)
@@ -0,0 +1,11 @@
+--- gtk/gtkrc.ru.orig Fri May 19 13:18:08 2000
++++ gtk/gtkrc.ru Fri Feb 9 22:53:43 2001
+@@ -1,7 +1,5 @@
+ style "gtk-default-ru" {
+- fontset = "-adobe-helvetica-medium-r-normal--12-*-*-*-*-*-iso8859-*,\
+- -*-arial-medium-r-normal--12-*-*-*-*-*-iso8859-1,\
+- -cronyx-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
++ fontset = "-*-helvetica-medium-r-normal--12-*-*-*-*-*-koi8-r,\
+ -*-arial-medium-r-normal--12-*-*-*-*-*-koi8-r,*-r-*"
+ }
+ class "GtkWidget" style "gtk-default-ru"
More information about the Midnightbsd-cvs
mailing list