Gentoo Archives: gentoo-commits

From: Amy Winston <amynka@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-scheme/guile-gnome-platform/files/
Date: Thu, 29 Sep 2016 17:16:21
Message-Id: 1475169269.aafbc8c1ae9fcd1bef32f88873c208edc1f1afb7.amynka@gentoo
1 commit: aafbc8c1ae9fcd1bef32f88873c208edc1f1afb7
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Sep 28 17:10:11 2016 +0000
4 Commit: Amy Winston <amynka <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 29 17:14:29 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aafbc8c1
7
8 dev-scheme/guile-gnome-platform: remove unused patches
9
10 .../files/2.15.92-add-atk-overrides.patch | 12 ---
11 .../files/2.15.92-add-cairo-fix-from-bzr.patch | 91 ----------------------
12 2 files changed, 103 deletions(-)
13
14 diff --git a/dev-scheme/guile-gnome-platform/files/2.15.92-add-atk-overrides.patch b/dev-scheme/guile-gnome-platform/files/2.15.92-add-atk-overrides.patch
15 deleted file mode 100644
16 index 6168c79..00000000
17 --- a/dev-scheme/guile-gnome-platform/files/2.15.92-add-atk-overrides.patch
18 +++ /dev/null
19 @@ -1,12 +0,0 @@
20 -diff -urN guile-gnome-platform-2.15.92.orig/atk/gnome/Makefile.am guile-gnome-platform-2.15.92/atk/gnome/Makefile.am
21 ---- guile-gnome-platform-2.15.92.orig/atk/gnome/Makefile.am 2007-06-01 13:50:55.000000000 -0700
22 -+++ guile-gnome-platform-2.15.92/atk/gnome/Makefile.am 2007-06-01 13:51:52.000000000 -0700
23 -@@ -6,7 +6,7 @@
24 -
25 - if HAVE_PANGO
26 - guilemodule_DATA += atk.scm
27 --SUBDIRS += gw
28 -+SUBDIRS += gw overrides
29 - endif
30 -
31 - EXTRA_DIST = atk.scm
32
33 diff --git a/dev-scheme/guile-gnome-platform/files/2.15.92-add-cairo-fix-from-bzr.patch b/dev-scheme/guile-gnome-platform/files/2.15.92-add-cairo-fix-from-bzr.patch
34 deleted file mode 100644
35 index 030e5c1..00000000
36 --- a/dev-scheme/guile-gnome-platform/files/2.15.92-add-cairo-fix-from-bzr.patch
37 +++ /dev/null
38 @@ -1,91 +0,0 @@
39 -=== modified file 'ChangeLog'
40 ---- ChangeLog 2007-05-24 15:14:46 +0000
41 -+++ ChangeLog 2007-05-25 15:49:00 +0000
42 -@@ -1,3 +1,16 @@
43 -+2007-05-25 Andy Wingo <wingo@×××××.com>
44 -+
45 -+ * gnome/gw/cairo-spec.scm: Now that we are actually making a
46 -+ shlib, init guile-cairo in the shlib instead of in every dependant
47 -+ wrapset.
48 -+
49 -+ * gnome/gw/Makefile.am: I tried really hard to avoid making a
50 -+ shared library for this g-wrap wrapset, since it is not necessary
51 -+ at all, but I have failed for the moment: other wrapsets depending
52 -+ on this one will check to see that something has registered the
53 -+ "guile-cairo" wrapset with the C g-wrap runtime, which will fail
54 -+ unless we actually have a shlib that registers the wrapset. Suck.
55 -+
56 - 2007-05-24 Andy Wingo <wingo@×××××.com>
57 -
58 - * == Released guile-gnome-platform version 2.15.92 ==
59 -
60 -=== modified file 'gnome/gw/Makefile.am'
61 ---- gnome/gw/Makefile.am 2007-05-20 17:43:35 +0000
62 -+++ gnome/gw/Makefile.am 2007-05-25 15:49:00 +0000
63 -@@ -1,5 +1,27 @@
64 - include $(top_srcdir)/common.mk
65 -
66 --guilegwmodule_DATA = cairo-spec.scm
67 -+guilegwmodule_DATA = cairo-spec.scm cairo.scm
68 -
69 - EXTRA_DIST = cairo-spec.scm
70 -+
71 -+CLEANFILES = $(wildcard gnome-*.log)
72 -+
73 -+# I wanted to avoid having a cairo shlib, because there is no need, but
74 -+# fighting g-wrap is too difficult for the moment.
75 -+
76 -+guilegnomelib_LTLIBRARIES = libgw-guile-gnome-cairo.la
77 -+
78 -+########################################################################
79 -+## cairo
80 -+nodist_libgw_guile_gnome_cairo_la_SOURCES = guile-gnome-gw-cairo.c
81 -+
82 -+libgw_guile_gnome_cairo_la_CFLAGS = $(GUILE_GLIB_CFLAGS) $(GLIB_CFLAGS) \
83 -+ $(AM_CFLAGS) $(GUILE_CAIRO_CFLAGS) $(GUILE_CFLAGS) \
84 -+ $(G_WRAP_CFLAGS)
85 -+libgw_guile_gnome_cairo_la_LIBADD = $(GUILE_CAIRO_LIBS) $(GUILE_LIBS) \
86 -+ $(G_WRAP_LIBS) $(GUILE_GLIB_LIBS)
87 -+libgw_guile_gnome_cairo_la_LDFLAGS = -module
88 -+
89 -+CLEANFILES += $(wildcard guile-gnome-gw-cairo.*) cairo.scm
90 -+
91 -+BUILT_SOURCES = guile-gnome-gw-cairo.c
92 -
93 -=== modified file 'gnome/gw/cairo-spec.scm'
94 ---- gnome/gw/cairo-spec.scm 2007-05-20 22:39:45 +0000
95 -+++ gnome/gw/cairo-spec.scm 2007-05-25 15:49:00 +0000
96 -@@ -27,7 +27,7 @@
97 - (define-module (gnome gw cairo-spec)
98 - #:use-module (oop goops)
99 - #:use-module (gnome gw support g-wrap)
100 -- #:use-module (gnome gw support defs)
101 -+ #:use-module (gnome gw gobject-spec)
102 - #:use-module (gnome gw support gobject))
103 -
104 - ;; G-Wrap inelegance
105 -@@ -116,8 +116,6 @@
106 - (define-class <client-actions> (<gw-item>))
107 - (define-method (global-declarations-cg (ws <gw-guile-wrapset>) (a <client-actions>))
108 - '("#include <guile-cairo.h>\n"))
109 --(define-method (initializations-cg (wrapset <gw-guile-wrapset>) (a <client-actions>) err)
110 -- (list "scm_init_cairo ();\n"))
111 -
112 - (define-class <cairo-wrapset> (<gobject-wrapset-base>)
113 - #:id 'gnome-cairo
114 -@@ -144,6 +142,14 @@
115 - #:take "scm_take_cairo_font_options"))
116 - (add-type-alias! ws "cairo_font_options_t*" 'cairo-font-options-t))
117 -
118 -+(define-method (global-declarations-cg (ws <cairo-wrapset>))
119 -+ (list (next-method)
120 -+ "#include <guile-cairo.h>\n"))
121 -+
122 -+(define-method (initializations-cg (wrapset <cairo-wrapset>) err)
123 -+ (list (next-method)
124 -+ "scm_init_cairo ();\n"))
125 -+
126 - ;; pango-cairo
127 - ;; cairo_t, cairo_font_options_t
128 -
129 -