mail-notification: init at 5.4

lib/maintainers.nix

@@ -141,6 +141,7 @@
   ehmry = "Emery Hemingway <emery@vfemail.net>";
   eikek = "Eike Kettner <eike.kettner@posteo.de>";
   elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>";
+  eleanor = "Dejan Lukan <dejan@proteansec.com>";
   elitak = "Eric Litak <elitak@gmail.com>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
   epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";

pkgs/desktops/gnome-2/desktop/mail-notification/default.nix

@@ -0,0 +1,87 @@
+{ stdenv, fetchurl, fetchFromGitHub, pkgconfig, glib, gnome2, dbus_glib, gmime, libnotify, libgnome_keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor_icon_theme, tango-icon-theme }:
+
+stdenv.mkDerivation rec {
+  rev = "9ae8768";
+  version = "5.4";
+  name = "mail-notification-${version}";
+
+  src = fetchFromGitHub {
+    inherit rev;
+    owner = "epienbroek";
+    repo = "mail-notification";
+    sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d";
+  };
+
+   buildInputs = [ pkgconfig glib dbus_glib gmime libnotify libgnome_keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus_glib gmime libnotify gnome2.gnome_keyring gnome2.scrollkeeper libxml2 gnome2.gnome_icon_theme hicolor_icon_theme tango-icon-theme ];
+
+  prePatch = ''
+    sed -i  -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c || die
+
+    # Ensure we never append -Werror
+    sed -i -e 's/ -Werror//' jb jbsrc/jb.c || die
+  '';
+
+  patches = [
+    ./patches/mail-notification-5.4-remove-ubuntu-special-case.patch
+  #  ./patches/mail-notification-aarch64.patch
+    ./patches/mail-notification-dont-link-against-bsd-compat.patch
+  #  ./patches/mail-notification-jb-gcc-format.patch
+  ];
+
+  patchFlags = "-p0";
+
+  configurePhase = ''
+    ./jb configure
+    runHook postConfigure
+  '';
+
+  postConfigure = ''
+    sed -i -e "/^prefix/c prefix|string|1|$out" \
+           -e 's/^pkgdatadir.*/pkgdatadir|string|0|$datadir/g' \
+           build/config
+
+    # currently disable the check for missing sheme until a better solution
+    # is found; needed, because otherwise the application doesn't even start
+    # and fails saying it unable to find gconf scheme values.
+    sed -i -e 's/(schema_missing)/(!schema_missing)/g' src/mn-conf.c
+  '';
+
+
+  buildPhase = ''
+    ./jb build
+  '';
+
+  # the "./jb install" tries to install directly to nix store, which is not
+  # writable, so we have to copy the files ourselves
+  installPhase = ''
+    #GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" ./jb install
+
+    # create directories
+    mkdir -p $out/{bin,lib,libexec,share,etc,var}
+
+    # copy executable
+    cp ./build/src/mail-notification $out/bin/
+
+    # copy icons
+    #mkdir -p $out/share/icons/hicolor
+    cp -r art/* $out/share/
+
+    # copy schemas
+    mkdir -p $out/etc/gconf/schemas/
+    #GCONF_CONFIG_SOURCE="xml:merged:${gnome2.GConf}/etc/gconf/gconf.xml.defaults" ${gnome2.GConf}/bin/gconftool-2 --makefile-install-rule data/mail-notification.schemas.in.in
+    cp data/mail-notification.schemas.in.in $out/etc/gconf/schemas/
+
+    # copy properties dialogs
+    cp ui/* $out/share/
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Tray status icon, which notifies us when new email arrives";
+    homepage = "http://www.nongnu.org/mailnotify/";
+    license = "GPL-3";
+    platforms = platforms.unix;
+    maintainers = [ maintainers.eleanor ];
+  };
+}

pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-5.4-remove-ubuntu-special-case.patch

@@ -0,0 +1,33 @@
+--- jbsrc/lib/src/core/jb-feature.c.~1~	2008-04-27 16:47:27.000000000 +0200
++++ jbsrc/lib/src/core/jb-feature.c	2008-07-22 11:40:50.856886210 +0200
+@@ -164,8 +164,6 @@
+ static void
+ gconf_configure (void)
+ {
+-  JBVariable *variable;
+-
+   jb_require_program("gconftool-2");
+ 
+   if (! strcmp(jb_variable_get_string("gconf-config-source"), "autodetect"))
+@@ -178,21 +176,6 @@
+       jb_variable_set_string("gconf-config-source", config_source);
+       g_free(config_source);
+     }
+-
+-  /* fix the default schemas dir on Ubuntu */
+-  variable = jb_variable_get_variable_or_error("gconf-schemas-dir");
+-  if (! variable->user_set)
+-    {
+-      static const char *ubuntu_dir = "$datadir/gconf/schemas";
+-      char *expanded;
+-
+-      expanded = jb_variable_expand(ubuntu_dir, NULL);
+-
+-      if (g_file_test(expanded, G_FILE_TEST_IS_DIR))
+-	jb_variable_set_string("gconf-schemas-dir", ubuntu_dir);
+-
+-      g_free(expanded);
+-    }
+ }
+ 
+ static void

pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-dont-link-against-bsd-compat.patch

@@ -0,0 +1,10 @@
+--- jbsrc/jb.c.orig	2014-01-19 20:06:48.525462981 +0100
++++ jbsrc/jb.c	2014-01-19 20:07:36.087934897 +0100
+@@ -425,7 +425,6 @@
+        */
+       jb_compile_options_add_cflags(object->compile_options, "-std=c99");
+       jb_compile_options_add_cppflags(object->compile_options, "-D_BSD_SOURCE -D_POSIX_C_SOURCE=199309L");
+-      jb_compile_options_add_libs(object->compile_options, "-lbsd-compat");
+     }
+ 
+   jb_compile_options_add_string_defines(object->compile_options,

pkgs/desktops/gnome-2/desktop/mail-notification/patches/mail-notification-jb-gcc-format.patch

@@ -0,0 +1,15 @@
+Index: epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c
+===================================================================
+--- epienbroek-mail-notification-eab5c13.orig/jbsrc/lib/src/core/jb-util.c
++++ epienbroek-mail-notification-eab5c13/jbsrc/lib/src/core/jb-util.c
+@@ -208,6 +208,10 @@ jb_message_result_string_format (const c
+   g_free(message);
+ }
+ 
++#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
++static void print_warning_or_error (const char *prefix, const char *format, va_list args) __attribute__ ((format(printf, 1, 0)));
++#endif
++
+ static void
+ print_warning_or_error (const char *prefix, const char *format, va_list args)
+ {

pkgs/top-level/all-packages.nix

@@ -13732,6 +13732,8 @@ in
 
   lyx = callPackage ../applications/misc/lyx { };
 
+  mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {};
+
   magnetophonDSP = {
     CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { };
     CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { };