nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

gnome2.libgnome: remove

Browse Source 
This has been long dead.
This commit is contained in:
Jan Tojnar 2024-06-27 11:23:13 +02:00
parent fd4cba375d
commit 9dcf8132c9
3 changed files with 1 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/desktops/gnome-2/default.nix
View File

@ -25,8 +25,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gnome_vfs = callPackage ./platform/gnome-vfs { };
libgnome = callPackage ./platform/libgnome { };
libbonobo = callPackage ./platform/libbonobo { };
libbonoboui = callPackage ./platform/libbonoboui { };
@ -70,6 +68,7 @@ lib.makeScope pkgs.newScope (self: with self; {
libgnomecups = throw "gnome2.libgnomecups has been removed"; # 2023-01-15
libgnomeprint = throw "gnome2.libgnomeprint has been removed"; # 2023-01-15
libgnomeprintui = throw "gnome2.libgnomeprintui has been removed"; # 2023-01-15
libgnome = throw "gnome2.libgnome has been removed"; # 2024-06-27
libgnomeui = throw "gnome2.libgnomeui has been removed"; # 2024-06-27
libgtkhtml = throw "gnome2.libgtkhtml has been removed"; # 2023-01-15
python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14

24
pkgs/desktops/gnome-2/platform/libgnome/default.nix
View File

@ -1,24 +0,0 @@
{ lib, stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2
, intltool, libbonobo, GConf, gnome_vfs, libtool, libogg
}:
stdenv.mkDerivation rec {
pname = "libgnome";
version = "2.32.1";
src = fetchurl {
url = "mirror://gnome/sources/libgnome/${lib.versions.majorMinor version}/libgnome-${version}.tar.bz2";
sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
};
patches = [ ./new-glib.patch ];
/* There's a comment containing an invalid utf-8 sequence, breaking glib-mkenums. */
postPatch = "sed '/returns the true filename/d' -i libgnome/gnome-config.h";
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config intltool ];
buildInputs = [ popt zlib GConf gnome_vfs libcanberra-gtk2 libtool ];
propagatedBuildInputs = [ glib libbonobo libogg ];
meta.mainProgram = "gnome-open";
}

65
pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch
View File

@ -1,65 +0,0 @@
Porting libgnome to newer glib:
* remove g_thread_init and g_thread_supported, which are longer needed
https://developer.gnome.org/glib/2.36/glib-Deprecated-Thread-APIs.html#g-thread-init
* replace GStaticRecMutex by GRecMutex
https://developer.gnome.org/glib/2.36/glib-Deprecated-Thread-APIs.html#GStaticRecMutex
diff --git a/libgnome/gnome-i18n.c b/libgnome/gnome-i18n.c
index 531c56c..f13d61e 100644
--- a/libgnome/gnome-i18n.c
+++ b/libgnome/gnome-i18n.c
@@ -55,12 +55,14 @@
const GList *
gnome_i18n_get_language_list (const gchar *ignored)
{
- static GStaticRecMutex lang_list_lock = G_STATIC_REC_MUTEX_INIT;
+ static GRecMutex lang_list_lock;
+ g_rec_mutex_init (&lang_list_lock);
+
static GList *list = NULL;
const char * const* langs;
int i;
- g_static_rec_mutex_lock (&lang_list_lock);
+ g_rec_mutex_lock (&lang_list_lock);
if (list == NULL) {
langs = g_get_language_names ();
@@ -71,7 +73,7 @@ gnome_i18n_get_language_list (const gchar *ignored)
list = g_list_reverse (list);
}
- g_static_rec_mutex_unlock (&lang_list_lock);
+ g_rec_mutex_unlock (&lang_list_lock);
return list;
}
diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
index fe3efd4..c6619af 100644
--- a/libgnome/gnome-init.c
+++ b/libgnome/gnome-init.c
@@ -115,9 +115,6 @@ gnome_bonobo_module_info_get (void)
static void
bonobo_activation_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
{
- if (!g_thread_supported ())
- g_thread_init (NULL);
-
if (!bonobo_activation_is_initialized ())
bonobo_activation_preinit (program, mod_info);
}
diff --git a/libgnome/gnome-program.c b/libgnome/gnome-program.c
index 739765e..cd14999 100644
--- a/libgnome/gnome-program.c
+++ b/libgnome/gnome-program.c
@@ -1878,10 +1878,6 @@ gnome_program_init (const char *app_id, const char *app_version,
GnomeProgram *program;
va_list args;
- /* g_thread_init() has to be the first GLib function called ever */
- if (!g_threads_got_initialized)
- g_thread_init (NULL);
-
g_type_init ();
va_start(args, first_property_name);