diff mbox

gnu: Move gtkglext from gnome to gtk.

Message ID 20160816180104.20832-1-dannym@scratchpost.org
State New
Headers show

Commit Message

Danny Milosavljevic Aug. 16, 2016, 6:01 p.m. UTC
gnu: Move gtkglext from gnome to gtk.

* gnu/packages/gnome.scm (gtkglext): Moved from here...
* gnu/packages/gtk.scm (gtkglext): ... to here
---
 gnu/packages/gnome.scm | 28 ----------------------------
 gnu/packages/gtk.scm   | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 28 deletions(-)

Comments

Leo Famulari Aug. 16, 2016, 8:03 p.m. UTC | #1
On Tue, Aug 16, 2016 at 08:01:04PM +0200, Danny Milosavljevic wrote:
> gnu: Move gtkglext from gnome to gtk.
> 
> * gnu/packages/gnome.scm (gtkglext): Moved from here...
> * gnu/packages/gtk.scm (gtkglext): ... to here

Why? I see that the package relates to GTK+, but it's also GNOME
software.

And, moving packages around like this does cause problems, because all
the referring packages have to update their module imports. Not to
mention the possibility of more conflicts when merging core-updates and
other updates branches.
Danny Milosavljevic Aug. 16, 2016, 8:09 p.m. UTC | #2
Hi Leo,

On Tue, 16 Aug 2016 16:03:03 -0400
Leo Famulari <leo@famulari.name> wrote:

> On Tue, Aug 16, 2016 at 08:01:04PM +0200, Danny Milosavljevic wrote:
> > gnu: Move gtkglext from gnome to gtk.
> > 
> > * gnu/packages/gnome.scm (gtkglext): Moved from here...
> > * gnu/packages/gtk.scm (gtkglext): ... to here  
> 
> Why? I see that the package relates to GTK+, but it's also GNOME
> software.

Is it? Well its name and its dependencies say it should be gtk :)

> And, moving packages around like this does cause problems, because all
> the referring packages have to update their module imports. Not to
> mention the possibility of more conflicts when merging core-updates and
> other updates branches.

I know what you mean and I usually don't move stuff around. This one is very well-mannered since we have only 3 clients for it (two in games.scm and one in engineering.scm - both modules already include gtk as well).
Leo Famulari Aug. 16, 2016, 8:14 p.m. UTC | #3
On Tue, Aug 16, 2016 at 10:09:16PM +0200, Danny Milosavljevic wrote:
> Hi Leo,
> 
> On Tue, 16 Aug 2016 16:03:03 -0400
> Leo Famulari <leo@famulari.name> wrote:
> 
> > On Tue, Aug 16, 2016 at 08:01:04PM +0200, Danny Milosavljevic wrote:
> > > gnu: Move gtkglext from gnome to gtk.
> > > 
> > > * gnu/packages/gnome.scm (gtkglext): Moved from here...
> > > * gnu/packages/gtk.scm (gtkglext): ... to here  
> > 
> > Why? I see that the package relates to GTK+, but it's also GNOME
> > software.
> 
> Is it? Well its name and its dependencies say it should be gtk :)
> 
> > And, moving packages around like this does cause problems, because all
> > the referring packages have to update their module imports. Not to
> > mention the possibility of more conflicts when merging core-updates and
> > other updates branches.
> 
> I know what you mean and I usually don't move stuff around. This one
> is very well-mannered since we have only 3 clients for it (two in
> games.scm and one in engineering.scm - both modules already include
> gtk as well).

Okay. Do the games and engineering modules still need to import the
gnome module if we make this move?
Danny Milosavljevic Aug. 16, 2016, 8:40 p.m. UTC | #4
> Okay. Do the games and engineering modules still need to import the
> gnome module if we make this move?

Yes. 

The reasons that they still need gnome.scm are:

- engineering.scm references desktop-file-utils and shared-mime-info which are freedesktop things (i.e. common to all desktop environments) but are inside gnome.scm .

- games.scm references librsvg which is inside gnome.scm for some reason.

But I wanted to avoid the dependency in education.scm for celestia. 

Right now, gnome.scm includes gtk.scm and gtk.scm includes gnome.scm because of the above, among other things.

Disentangling all that seems to be a lot of work for little gain - however, I don't understand why there's gtk.scm and gnome.scm in the first place if we don't distinguish between them. It makes sense to distinguish since lxde, xfce, gnome etcetc all use gtk and freedesktop stuff.
Danny Milosavljevic Aug. 16, 2016, 11:12 p.m. UTC | #5
I've checked how bad it would be to move all the stuff:

* gnu/packages/gnome.scm (libcroco, json-glib, libxklavier): Move variables from here...
* gnu/packages/glib.scm (libcroco, json-glib, libxklavier): ... to here.

* gnu/packages/gnome.scm (desktop-file-utils, shared-mime-info, hicolor-icon-theme, upower): Move variables from here...
* gnu/packages/freedesktop.scm (desktop-file-utils, shared-mime-info, hicolor-icon-theme, upower): ... to here.

* gnu/packages/gnome.scm (librsvg, libglade, gtkglext, glade3, vala, libgsf, libnotify, libwnck, libwnck-2, vte, vte-0.36, vte/gtk+-2): Move variables from here...
* gnu/packages/gtk.scm (librsvg, libglade, gtkglext, glade3, vala, libgsf, libnotify, libwnck, libwnck-2, vte, vte-0.36, vte/gtk+-2): ... to here.

* gnu/packages/gtk.scm (guile-gnome): Move variables from here...
* gnu/packages/gnome.scm (guile-gnome): ... to here.

* gnu/packages/gnome.scm (libgudev): Move variables from here...
* gnu/packages/linux.scm (libgudev): ... to here.

* gnu/packages/engineering.scm: Remove gnome import, add freedesktop import.
* gnu/packages/games.scm: Remove gnome import.

* gnu/packages/fvwm.scm: Use gtk instead of gnome import.
* gnu/packages/game-development.scm: Use freedesktop instead of gnome import.
* gnu/packages/games.scm: Remove gnome import.
* gnu/packages/maths.scm: Add freedesktop import.
* gnu/packages/mail.scm: Add freedesktop import.
* gnu/packages/wv.scm: Use gtk instead of gnome import.
* gnu/packages/xfce.scm: Use freedesktop import instead of gnome import.
* gnu/packages/gnome.scm: Add freedesktop import.
* gnu/packages/freedesktop.scm (upower): Use gnu-build-system instead of glib-or-gtk-build-system.
* gnu/packages/freedesktop.scm: Add (gnu packages) import. Add (gnu packages libusb) import.
* gnu/packages/gnustep.scm: Add (gnu packages freedesktop) import.
* gnu/packages/gtk.scm: Add (gnu packages tls) import. Add (gnu packages ncurses) import.
* gnu/packages/gtk.scm: Add (gnu packages iso-codes) import.
* gnu/packages/wicd.scm: Add (gnu packages freedesktop) import. Remove gnome import.
* gnu/packages/linux.scm: Add (gnu packages iso-codes) import.
* gnu/packages/xfce.scm (xfce): Remove gnome-icon-theme.

I'll send a patch. We can think of what we want to do with it - but at least we can see the extent then.
Leo Famulari Aug. 16, 2016, 11:40 p.m. UTC | #6
On Wed, Aug 17, 2016 at 01:12:07AM +0200, Danny Milosavljevic wrote:
> I've checked how bad it would be to move all the stuff:
> 
> * gnu/packages/gnome.scm (libcroco, json-glib, libxklavier): Move variables from here...
> * gnu/packages/glib.scm (libcroco, json-glib, libxklavier): ... to here.
> 
> * gnu/packages/gnome.scm (desktop-file-utils, shared-mime-info, hicolor-icon-theme, upower): Move variables from here...
> * gnu/packages/freedesktop.scm (desktop-file-utils, shared-mime-info, hicolor-icon-theme, upower): ... to here.
> 
> * gnu/packages/gnome.scm (librsvg, libglade, gtkglext, glade3, vala, libgsf, libnotify, libwnck, libwnck-2, vte, vte-0.36, vte/gtk+-2): Move variables from here...
> * gnu/packages/gtk.scm (librsvg, libglade, gtkglext, glade3, vala, libgsf, libnotify, libwnck, libwnck-2, vte, vte-0.36, vte/gtk+-2): ... to here.
> 
> * gnu/packages/gtk.scm (guile-gnome): Move variables from here...
> * gnu/packages/gnome.scm (guile-gnome): ... to here.
> 
> * gnu/packages/gnome.scm (libgudev): Move variables from here...
> * gnu/packages/linux.scm (libgudev): ... to here.
> 
> * gnu/packages/engineering.scm: Remove gnome import, add freedesktop import.
> * gnu/packages/games.scm: Remove gnome import.
> 
> * gnu/packages/fvwm.scm: Use gtk instead of gnome import.
> * gnu/packages/game-development.scm: Use freedesktop instead of gnome import.
> * gnu/packages/games.scm: Remove gnome import.
> * gnu/packages/maths.scm: Add freedesktop import.
> * gnu/packages/mail.scm: Add freedesktop import.
> * gnu/packages/wv.scm: Use gtk instead of gnome import.
> * gnu/packages/xfce.scm: Use freedesktop import instead of gnome import.
> * gnu/packages/gnome.scm: Add freedesktop import.
> * gnu/packages/freedesktop.scm (upower): Use gnu-build-system instead of glib-or-gtk-build-system.
> * gnu/packages/freedesktop.scm: Add (gnu packages) import. Add (gnu packages libusb) import.
> * gnu/packages/gnustep.scm: Add (gnu packages freedesktop) import.
> * gnu/packages/gtk.scm: Add (gnu packages tls) import. Add (gnu packages ncurses) import.
> * gnu/packages/gtk.scm: Add (gnu packages iso-codes) import.
> * gnu/packages/wicd.scm: Add (gnu packages freedesktop) import. Remove gnome import.
> * gnu/packages/linux.scm: Add (gnu packages iso-codes) import.
> * gnu/packages/xfce.scm (xfce): Remove gnome-icon-theme.
> 
> I'll send a patch. We can think of what we want to do with it - but at least we can see the extent then.

I would wait for some comments before writing the patch.
Leo Famulari Aug. 16, 2016, 11:42 p.m. UTC | #7
On Wed, Aug 17, 2016 at 01:12:07AM +0200, Danny Milosavljevic wrote:
> I'll send a patch. We can think of what we want to do with it - but at least we can see the extent then.

Oh, I see you already sent it. You'd also need to be sure to move the
copyright authorship lines around properly. I don't think it's worth all
the noise, to be honest.
Ricardo Wurmus Aug. 17, 2016, 6:53 a.m. UTC | #8
Leo Famulari <leo@famulari.name> writes:

> On Wed, Aug 17, 2016 at 01:12:07AM +0200, Danny Milosavljevic wrote:
>> I'll send a patch. We can think of what we want to do with it - but at least we can see the extent then.
>
> Oh, I see you already sent it. You'd also need to be sure to move the
> copyright authorship lines around properly. I don't think it's worth all
> the noise, to be honest.

I agree that this seems like a lot of noise for little gain (and in some
cases I think the new location isn’t actually an improvement).

~~ Ricardo
Efraim Flashner Aug. 20, 2016, 8:53 a.m. UTC | #9
On Wed, Aug 17, 2016 at 08:53:14AM +0200, Ricardo Wurmus wrote:
> 
> Leo Famulari <leo@famulari.name> writes:
> 
> > On Wed, Aug 17, 2016 at 01:12:07AM +0200, Danny Milosavljevic wrote:
> >> I'll send a patch. We can think of what we want to do with it - but at least we can see the extent then.
> >
> > Oh, I see you already sent it. You'd also need to be sure to move the
> > copyright authorship lines around properly. I don't think it's worth all
> > the noise, to be honest.
> 
> I agree that this seems like a lot of noise for little gain (and in some
> cases I think the new location isn’t actually an improvement).
> 
> ~~ Ricardo
> 

I like the freedesktop, glib and linux ones, not as sure about the
gnome/gtk switchings.
non such Aug. 22, 2016, 8:56 a.m. UTC | #10
Leo Famulari <leo@famulari.name> writes:

> On Wed, Aug 17, 2016 at 01:12:07AM +0200, Danny Milosavljevic wrote:
>> I'll send a patch. We can think of what we want to do with it - but at least we can see the extent then.
>
> Oh, I see you already sent it. You'd also need to be sure to move the
> copyright authorship lines around properly. I don't think it's worth all
> the noise, to be honest.

This keeps happening for so long already, I begin to think that we need
an item in Documentation > Contributing section about it.

What do you think?
diff mbox

Patch

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4a0be01..ee10b5f 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -784,34 +784,6 @@  demand (lazy) programming language support for C, Python and JS; simplicity of
 the API.")
     (license license:lgpl2.0+)))
 
-(define-public gtkglext
-  (package
-    (name "gtkglext")
-    (version "1.2.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://sourceforge/gtkglext/gtkglext/"
-                                  version "/gtkglext-" version ".tar.gz"))
-              (sha256
-               (base32 "1ya4d2j2aacr9ii5zj4ac95fjpdvlm2rg79mgnk7yvl1dcy3y1z5"))
-              (patches (search-patches
-                        "gtkglext-disable-disable-deprecated.patch"))))
-    (build-system gnu-build-system)
-    (inputs `(("gtk+" ,gtk+-2)
-              ("mesa" ,mesa)
-              ("glu" ,glu)
-              ("libx11" ,libx11)
-              ("libxt" ,libxt)))
-    (native-inputs `(("pkg-config" ,pkg-config)
-                     ("glib" ,glib "bin")))
-    (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
-additional GDK objects which support OpenGL rendering in GTK+ and GtkWidget
-API add-ons to make GTK+ widgets OpenGL-capable.")
-    (license license:lgpl2.1+)))
-
 (define-public glade3
   (package
     (name "glade")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 8feac11..9b01f2e 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1331,3 +1331,31 @@  glass artworks done by Venicians glass blowers.")
      "GtkSpell provides word-processor-style highlighting and replacement of
 misspelled words in a GtkTextView widget.")
     (license license:gpl2+)))
+
+(define-public gtkglext
+  (package
+    (name "gtkglext")
+    (version "1.2.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://sourceforge/gtkglext/gtkglext/"
+                                  version "/gtkglext-" version ".tar.gz"))
+              (sha256
+               (base32 "1ya4d2j2aacr9ii5zj4ac95fjpdvlm2rg79mgnk7yvl1dcy3y1z5"))
+              (patches (search-patches
+                        "gtkglext-disable-disable-deprecated.patch"))))
+    (build-system gnu-build-system)
+    (inputs `(("gtk+" ,gtk+-2)
+              ("mesa" ,mesa)
+              ("glu" ,glu)
+              ("libx11" ,libx11)
+              ("libxt" ,libxt)))
+    (native-inputs `(("pkg-config" ,pkg-config)
+                     ("glib" ,glib "bin")))
+    (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
+additional GDK objects which support OpenGL rendering in GTK+ and GtkWidget
+API add-ons to make GTK+ widgets OpenGL-capable.")
+    (license license:lgpl2.1+)))