Unverified Commit 3bf7592d authored by h7x4's avatar h7x4 Committed by GitHub
Browse files

gnome-pomodoro 0.24.1 -> 0.26.0 (#345165)

parents 303c750c 76fa4651

maintainers/maintainer-list.nix

+5 −0
Original line number Diff line number Diff line
@@ -8479,6 +8479,11 @@ 
    githubId = 15121114;

    name = "Tom Herbers";

  };

  herschenglime = {

    github = "Herschenglime";

    githubId = 69494718;

    name = "Herschenglime";

  };

  hexa = {

    email = "hexa@darmstadt.ccc.de";

    matrix = "@hexa:lossy.network";

pkgs/by-name/gn/gnome-pomodoro/fix-schema-path.patch

+9 −26
Original line number Diff line number Diff line 
diff --git a/data/meson.build b/data/meson.build

index 5e4ce69..982b3c9 100644

--- a/data/meson.build

+++ b/data/meson.build

@@ -31,7 +31,7 @@ i18n.merge_file(

 

 install_data(

   'org.gnome.pomodoro.gschema.xml',

-  install_dir: get_option('datadir') / 'glib-2.0' / 'schemas',

+  install_dir: gschema_dir,

 )

 

 subdir('icons')

diff --git a/meson-post-install.sh b/meson-post-install.sh

index bf4013a..c87fba4 100644

--- a/meson-post-install.sh

+++ b/meson-post-install.sh

@@ -7,7 +7,7 @@ datadir="${prefix}/$1"

 # want/need us to do the below

 if [ -z "${DESTDIR}" ]; then

     echo "Compiling GSchema..."

-    glib-compile-schemas "${datadir}/glib-2.0/schemas"

+    glib-compile-schemas "${datadir}/gsettings-schemas/@pname@-@version@/glib-2.0/schemas"

 

     echo "Updating icon cache..."

     gtk-update-icon-cache -f -t "${datadir}/icons/hicolor"

diff --git a/meson.build b/meson.build

index 09857a1..a07d27c 100644

--- a/meson.build
@@ -38,3 +12,12 @@ index 09857a1..a07d27c 100644 
 plugin_libdir = get_option('prefix') / get_option('libdir') / meson.project_name() / 'plugins'

 extension_dir = get_option('prefix') / get_option('datadir') / 'gnome-shell' / 'extensions' / 'pomodoro@arun.codito.in'

 

@@ -134,7 +135,7 @@

 subdir('tests')

 

 gnome.post_install(

-  glib_compile_schemas: true,

+  glib_compile_schemas: false,

   gtk_update_icon_cache: true,

   update_desktop_database: true,

 )

pkgs/by-name/gn/gnome-pomodoro/package.nix

+36 −26
Original line number Diff line number Diff line 
{ lib

, stdenv

, fetchFromGitHub

, substituteAll

, meson

, ninja

, pkg-config

, wrapGAppsHook3

, desktop-file-utils

, libcanberra

, gst_all_1

, vala

, gtk3

, gom

, sqlite

, libxml2

, glib

, gobject-introspection

, json-glib

, libpeas

, gsettings-desktop-schemas

, gettext

{

  lib,

  stdenv,

  fetchFromGitHub,

  substituteAll,

  meson,

  ninja,

  pkg-config,

  wrapGAppsHook3,

  desktop-file-utils,

  libcanberra,

  gst_all_1,

  vala,

  gtk3,

  gom,

  sqlite,

  libxml2,

  glib,

  gobject-introspection,

  json-glib,

  libpeas,

  gsettings-desktop-schemas,

  gettext,

}:



stdenv.mkDerivation rec {

  pname = "gnome-pomodoro";

  version = "0.24.1";

  version = "0.26.0";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = version;

    hash = "sha256-Ml3znMz1Q9593rMgfAST8k9QglxMG9ocFD7W8kaFWCw=";

    hash = "sha256-icyS/K6H90/DWYvqJ7f7XXTTuIwLea3k+vDDEBYil6o=";

  };



  patches = [
@@ -42,6 +42,13 @@ stdenv.mkDerivation rec { 
    })

  ];



  # Manually compile schemas for package since meson option

  # gnome.post_install(glib_compile_schemas) used by package tries to compile in

  # the wrong dir.

  preFixup = ''

    glib-compile-schemas ${glib.makeSchemaPath "$out" "${pname}-${version}"}

  '';



  nativeBuildInputs = [

    meson

    ninja
@@ -76,7 +83,10 @@ stdenv.mkDerivation rec { 
      This GNOME utility helps to manage time according to Pomodoro Technique.

      It intends to improve productivity and focus by taking short breaks.

    '';

    maintainers = with maintainers; [ aleksana ];

    maintainers = with maintainers; [

      aleksana

      herschenglime

    ];

    license = licenses.gpl3Plus;

    platforms = platforms.linux;

  };