Commit c9ccc888 authored by aleksana's avatar aleksana
Browse files

gcolor2: remove

parent 6ef6c33e
Loading
Loading
Loading
Loading
+0 −44
Original line number Diff line number Diff line
{lib, stdenv, fetchurl, fetchpatch, gtk2, perlPackages, pkg-config } :

let version = "0.4"; in
stdenv.mkDerivation {
  pname = "gcolor2";
  inherit version;
  arch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64" else "386";

  src = fetchurl {
    url = "mirror://sourceforge/project/gcolor2/gcolor2/${version}/gcolor2-${version}.tar.bz2";
    sha256 = "1siv54vwx9dbfcflklvf7pkp5lk6h3nn63flg6jzifz9wp0c84q6";
  };

  preConfigure = ''
    sed -i 's/\[:space:\]/[&]/g' configure
  '';

  # from https://github.com/PhantomX/slackbuilds/tree/master/gcolor2/patches
  patches = (if stdenv.hostPlatform.system == "x86_64-linux" then
        [ ./gcolor2-amd64.patch ] else
        [ ])
   ++ [
     # Pull patch pending upstream inclusion for -fno-common toolchains:
     #   https://sourceforge.net/p/gcolor2/patches/8/
     (fetchpatch {
       name = "fno-common.patch";
       url = "https://sourceforge.net/p/gcolor2/patches/8/attachment/0001-gcolor2-fix-build-on-gcc-10-fno-common.patch";
       sha256 = "0187zc8as9g3d6mpm3isg87jfpryj0hajb4inwvii8gxrzbi5l5f";
     })
  ];

  nativeBuildInputs = [ pkg-config ];
  buildInputs = [ gtk2 ]
    ++ (with perlPackages; [ perl XMLParser ]);

  meta = {
    description = "Simple GTK 2 color selector";
    homepage = "https://gcolor2.sourceforge.net/";
    license = lib.licenses.gpl2Plus;
    maintainers = with lib.maintainers; [ notthemessiah ];
    platforms = with lib.platforms; unix;
    mainProgram = "gcolor2";
  };
}
+0 −46
Original line number Diff line number Diff line
diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/callbacks.c gcolor2-0.4/src/callbacks.c
--- gcolor2-0.4.orig/src/callbacks.c	2005-07-12 14:06:12.000000000 -0400
+++ gcolor2-0.4/src/callbacks.c	2007-02-17 19:19:38.000000000 -0500
@@ -4,6 +4,9 @@
 
 #include <gtk/gtk.h>
 #include <stdio.h>
+#include <string.h>
+#include <glib.h>
+#include <glib/gprintf.h>
 
 #include "callbacks.h"
 #include "interface.h"
@@ -172,6 +175,9 @@ void on_copy_color_to_clipboard_activate
 	gtk_clipboard_set_text (cb, hex, strlen (hex));
 }
 
+void add_rgb_file (gchar *filename, gchar *type);
+gchar* get_system_file (void);
+
 void on_show_system_colors_activate (GtkMenuItem *menuitem, gpointer user_data)
 {
 	if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (menuitem)))
@@ -266,6 +272,8 @@ void on_save_button_clicked (GtkButton *
 	gtk_widget_destroy (savedialog);
 }
 
+void add_list_color (gchar *spec, gchar *name, gchar *type, gboolean is_new_color);
+
 void add_color_to_treeview ()
 {
 	GtkTreeView      *treeview;
diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN gcolor2-0.4.orig/src/main.c gcolor2-0.4/src/main.c
--- gcolor2-0.4.orig/src/main.c	2005-07-11 10:55:49.000000000 -0400
+++ gcolor2-0.4/src/main.c	2007-02-17 19:18:23.000000000 -0500
@@ -4,6 +4,10 @@
 
 #include <gtk/gtk.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include <glib/gprintf.h>
 
 #include "interface.h"
 #include "support.h"
+1 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ mapAliases {
  gcj = gcj6; # Added 2024-09-13
  gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
  gcl_2_6_13_pre = throw "'gcl_2_6_13_pre' has been removed in favor of 'gcl'"; # Added 2024-01-11
  gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
  geekbench4 = throw "'geekbench4' has been renamed to 'geekbench_4'"; # Added 2023-03-10
  geekbench5 = throw "'geekbench5' has been renamed to 'geekbench_5'"; # Added 2023-03-10
  gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
+0 −2
Original line number Diff line number Diff line
@@ -29839,8 +29839,6 @@ with pkgs;
  vcal = callPackage ../applications/misc/vcal { };
  gcolor2 = callPackage ../applications/graphics/gcolor2 { };
  gcolor3 = callPackage ../applications/graphics/gcolor3 { };
  get_iplayer = callPackage ../applications/misc/get_iplayer { };