* [PATCH] gnu: Make gtk-glext depend on pangox-compat and remove workaround patch
@ 2014-05-28 7:18 John Darrington
2014-05-28 9:57 ` Ludovic Courtès
0 siblings, 1 reply; 6+ messages in thread
From: John Darrington @ 2014-05-28 7:18 UTC (permalink / raw)
To: guix-devel; +Cc: John Darrington
* gnu/packages/gnome.scm (gtk-glext): Add new dependency and remove patch
* gnu/packages/patches/gtkglext-remove-pangox-dependency.patch: Delete file
---
gnu-system.am | 1 -
gnu/packages/gnome.scm | 2 +-
.../gtkglext-remove-pangox-dependency.patch | 132 --------------------
3 files changed, 1 insertion(+), 134 deletions(-)
delete mode 100644 gnu/packages/patches/gtkglext-remove-pangox-dependency.patch
diff --git a/gnu-system.am b/gnu-system.am
index 9f3b100..cb6cdbe 100644
--- a/gnu-system.am
+++ b/gnu-system.am
@@ -309,7 +309,6 @@ dist_patch_DATA = \
gnu/packages/patches/guile-relocatable.patch \
gnu/packages/patches/guix-test-networking.patch \
gnu/packages/patches/gtkglext-disable-disable-deprecated.patch \
- gnu/packages/patches/gtkglext-remove-pangox-dependency.patch \
gnu/packages/patches/hop-bigloo-4.0b.patch \
gnu/packages/patches/inkscape-stray-comma.patch \
gnu/packages/patches/libevent-dns-tests.patch \
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 232afc6..61ff6f8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -460,7 +460,6 @@ the API")
(sha256
(base32 "1ya4d2j2aacr9ii5zj4ac95fjpdvlm2rg79mgnk7yvl1dcy3y1z5"))
(patches (list
- (search-patch "gtkglext-remove-pangox-dependency.patch")
(search-patch "gtkglext-disable-disable-deprecated.patch")))))
(build-system gnu-build-system)
(inputs `(("gtk+" ,gtk+-2)
@@ -468,6 +467,7 @@ the API")
("libx11" ,libx11)
("libxt" ,libxt)))
(native-inputs `(("pkg-config" ,pkg-config)))
+ (propagated-inputs `(("pangox-compat" ,pangox-compat)))
(home-page "https://projects.gnome.org/gtkglext")
(synopsis "OpenGL extension to GTK+.")
(description "GtkGLExt is an OpenGL extension to GTK+. It provides
diff --git a/gnu/packages/patches/gtkglext-remove-pangox-dependency.patch b/gnu/packages/patches/gtkglext-remove-pangox-dependency.patch
deleted file mode 100644
index 4f03785..0000000
--- a/gnu/packages/patches/gtkglext-remove-pangox-dependency.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-This patch removes the dependency on pangox which has been deprecated. It
-achieves the same result as the upstream patch at
-https://git.gnome.org/browse/gtkglext/commit/?id=df7a7b35b80b395d7ba411c7f727970a46fb0588
-Like the upstream patch, it removes the functions gdk_gl_font_use_pango_font,
-and gdk_gl_font_use_pango_font_for_display from the API.
-
-diff -r -U 3 a/configure b/configure
---- a/configure 2006-02-05 04:17:47.000000000 +0100
-+++ b/configure 2013-12-26 12:55:21.000000000 +0100
-@@ -19880,14 +19880,12 @@
- gtk+-2.0 >= 2.0.0 \\
- gdk-2.0 >= 2.0.0 \\
- pango >= 1.0.0 \\
--pangox >= 1.0.0 \\
- gmodule-2.0 >= 2.0.0 \\
- \"") >&5
- ($PKG_CONFIG --exists --print-errors "\
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ") 2>&5
- ac_status=$?
-@@ -19897,7 +19895,6 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- " 2>/dev/null`
- else
-@@ -19916,14 +19913,12 @@
- gtk+-2.0 >= 2.0.0 \\
- gdk-2.0 >= 2.0.0 \\
- pango >= 1.0.0 \\
--pangox >= 1.0.0 \\
- gmodule-2.0 >= 2.0.0 \\
- \"") >&5
- ($PKG_CONFIG --exists --print-errors "\
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ") 2>&5
- ac_status=$?
-@@ -19933,7 +19928,6 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- " 2>/dev/null`
- else
-@@ -19958,7 +19952,6 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- "`
- else
-@@ -19966,7 +19959,6 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- "`
- fi
-@@ -19977,7 +19969,6 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ) were not met:
-
-@@ -19994,7 +19985,6 @@
- gtk+-2.0 >= 2.0.0 \
- gdk-2.0 >= 2.0.0 \
- pango >= 1.0.0 \
--pangox >= 1.0.0 \
- gmodule-2.0 >= 2.0.0 \
- ) were not met:
-
-@@ -25420,7 +25410,7 @@
- # CFLAGS and LIBS
- ##################################################
-
--GDKGLEXT_PACKAGES="gdk-2.0 pango pangox gmodule-2.0"
-+GDKGLEXT_PACKAGES="gdk-2.0 pango gmodule-2.0"
- GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
- GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
- GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
-diff -r -U 3 a/gdk/x11/Makefile.in b/gdk/x11/Makefile.in
---- a/gdk/x11/Makefile.in 2006-02-05 04:17:42.000000000 +0100
-+++ b/gdk/x11/Makefile.in 2013-12-26 13:12:04.000000000 +0100
-@@ -257,7 +257,6 @@
- gdkgldrawable-x11.c \
- gdkglpixmap-x11.c \
- gdkglwindow-x11.c \
-- gdkglfont-x11.c \
- gdkglglxext.c
-
-
-@@ -288,7 +287,7 @@
- am__objects_1 =
- am__objects_2 = gdkglquery-x11.lo gdkglconfig-x11.lo gdkgloverlay-x11.lo \
- gdkglcontext-x11.lo gdkgldrawable-x11.lo gdkglpixmap-x11.lo \
-- gdkglwindow-x11.lo gdkglfont-x11.lo gdkglglxext.lo
-+ gdkglwindow-x11.lo gdkglglxext.lo
- am__objects_3 = $(am__objects_1) $(am__objects_2)
- am_libgdkglext_x11_la_OBJECTS = $(am__objects_3)
- libgdkglext_x11_la_OBJECTS = $(am_libgdkglext_x11_la_OBJECTS)
-@@ -299,7 +298,6 @@
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/gdkglconfig-x11.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/gdkglcontext-x11.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/gdkgldrawable-x11.Plo \
--@AMDEP_TRUE@ ./$(DEPDIR)/gdkglfont-x11.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/gdkglglxext.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/gdkgloverlay-x11.Plo \
- @AMDEP_TRUE@ ./$(DEPDIR)/gdkglpixmap-x11.Plo \
-@@ -349,7 +347,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkglconfig-x11.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkglcontext-x11.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkgldrawable-x11.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkglfont-x11.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkglglxext.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkgloverlay-x11.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gdkglpixmap-x11.Plo@am__quote@
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Make gtk-glext depend on pangox-compat and remove workaround patch
2014-05-28 7:18 [PATCH] gnu: Make gtk-glext depend on pangox-compat and remove workaround patch John Darrington
@ 2014-05-28 9:57 ` Ludovic Courtès
2014-05-28 11:12 ` John Darrington
0 siblings, 1 reply; 6+ messages in thread
From: Ludovic Courtès @ 2014-05-28 9:57 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel
Hi John,
Could you make it two separate patches? Why is the patch no longer
needed?
John Darrington <jmd@gnu.org> skribis:
> * gnu/packages/gnome.scm (gtk-glext): Add new dependency and remove patch
Rather “Add pangox-compat as a dependency.”
> * gnu/packages/patches/gtkglext-remove-pangox-dependency.patch: Delete file
> ---
> gnu-system.am | 1 -
Mention the gnu-system.am change in the commit log.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Make gtk-glext depend on pangox-compat and remove workaround patch
2014-05-28 9:57 ` Ludovic Courtès
@ 2014-05-28 11:12 ` John Darrington
2014-05-28 11:17 ` John Darrington
2014-05-28 13:18 ` Ludovic Courtès
0 siblings, 2 replies; 6+ messages in thread
From: John Darrington @ 2014-05-28 11:12 UTC (permalink / raw)
To: Ludovic Court??s; +Cc: guix-devel, John Darrington
On Wed, May 28, 2014 at 11:57:28AM +0200, Ludovic Court??s wrote:
Hi John,
Could you make it two separate patches? Why is the patch no longer
needed?
The patch is no longer needed because of the new dependency. I guess I could
make it two changes, but in my opinion, they belong together.
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Make gtk-glext depend on pangox-compat and remove workaround patch
2014-05-28 11:12 ` John Darrington
@ 2014-05-28 11:17 ` John Darrington
2014-05-28 13:20 ` Ludovic Courtès
2014-05-28 13:18 ` Ludovic Courtès
1 sibling, 1 reply; 6+ messages in thread
From: John Darrington @ 2014-05-28 11:17 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel, John Darrington
On Wed, May 28, 2014 at 01:12:59PM +0200, John Darrington wrote:
On Wed, May 28, 2014 at 11:57:28AM +0200, Ludovic Court??s wrote:
Hi John,
Could you make it two separate patches? Why is the patch no longer
needed?
The patch is no longer needed because of the new dependency. I guess I could
make it two changes, but in my opinion, they belong together.
BTW. Both of your questions are a good example of why I believe the *reason*
for a change is far more useful in a commit message, than the details
of what has changed (which is redundant anyway, since it could be seen by
running "git diff").
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://sks-keyservers.net or any PGP keyserver for public key.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Make gtk-glext depend on pangox-compat and remove workaround patch
2014-05-28 11:12 ` John Darrington
2014-05-28 11:17 ` John Darrington
@ 2014-05-28 13:18 ` Ludovic Courtès
1 sibling, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2014-05-28 13:18 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel, John Darrington
John Darrington <john@darrington.wattle.id.au> skribis:
> On Wed, May 28, 2014 at 11:57:28AM +0200, Ludovic Court??s wrote:
> Hi John,
>
> Could you make it two separate patches? Why is the patch no longer
> needed?
>
> The patch is no longer needed because of the new dependency. I guess I could
> make it two changes, but in my opinion, they belong together.
Ah OK. Then indeed, it makes sense to keep it as one change.
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] gnu: Make gtk-glext depend on pangox-compat and remove workaround patch
2014-05-28 11:17 ` John Darrington
@ 2014-05-28 13:20 ` Ludovic Courtès
0 siblings, 0 replies; 6+ messages in thread
From: Ludovic Courtès @ 2014-05-28 13:20 UTC (permalink / raw)
To: John Darrington; +Cc: guix-devel, John Darrington
John Darrington <john@darrington.wattle.id.au> skribis:
> On Wed, May 28, 2014 at 01:12:59PM +0200, John Darrington wrote:
> On Wed, May 28, 2014 at 11:57:28AM +0200, Ludovic Court??s wrote:
> Hi John,
>
> Could you make it two separate patches? Why is the patch no longer
> needed?
>
> The patch is no longer needed because of the new dependency. I guess I could
> make it two changes, but in my opinion, they belong together.
>
> BTW. Both of your questions are a good example of why I believe the *reason*
> for a change is far more useful in a commit message, than the details
> of what has changed (which is redundant anyway, since it could be seen by
> running "git diff").
In this case, it makes sense to mention in the commit log the reason for
the change.
As for the general case, we’ll stick to
<http://www.gnu.org/prep/standards/html_node/Change-Logs.html>. The
rationale still holds.
Ludo’.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-05-28 13:20 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-28 7:18 [PATCH] gnu: Make gtk-glext depend on pangox-compat and remove workaround patch John Darrington
2014-05-28 9:57 ` Ludovic Courtès
2014-05-28 11:12 ` John Darrington
2014-05-28 11:17 ` John Darrington
2014-05-28 13:20 ` Ludovic Courtès
2014-05-28 13:18 ` Ludovic Courtès
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).