From dd61fdf45ca8f0d01e5b7e0aa3f05f56bf44499a Mon Sep 17 00:00:00 2001 From: volth Date: Mon, 20 May 2019 23:53:29 +0000 Subject: [PATCH] xfce4-13: 4.13.x -> 4.14pre1 --- pkgs/desktops/xfce4-13/exo/default.nix | 9 ++- pkgs/desktops/xfce4-13/garcon/12700.patch | 37 --------- pkgs/desktops/xfce4-13/garcon/13785.patch | 75 ------------------- pkgs/desktops/xfce4-13/garcon/default.nix | 10 +-- pkgs/desktops/xfce4-13/gigolo/default.nix | 9 ++- pkgs/desktops/xfce4-13/libxfce4ui/default.nix | 5 +- .../xfce4-13/libxfce4util/default.nix | 5 +- pkgs/desktops/xfce4-13/parole/default.nix | 4 +- pkgs/desktops/xfce4-13/ristretto/default.nix | 4 +- .../xfce4-13/thunar-volman/default.nix | 5 +- pkgs/desktops/xfce4-13/thunar/default.nix | 5 +- pkgs/desktops/xfce4-13/tumbler/default.nix | 5 +- .../xfce4-13/xfce4-appfinder/default.nix | 5 +- .../xfce4-13/xfce4-battery-plugin/default.nix | 4 +- .../xfce4-13/xfce4-clipman-plugin/default.nix | 4 +- .../xfce4-13/xfce4-cpufreq-plugin/default.nix | 4 +- pkgs/desktops/xfce4-13/xfce4-dict/default.nix | 4 +- .../xfce4-13/xfce4-notifyd/default.nix | 4 +- .../desktops/xfce4-13/xfce4-panel/default.nix | 5 +- .../xfce4-13/xfce4-power-manager/default.nix | 5 +- .../xfce4-13/xfce4-screenshooter/default.nix | 4 +- .../xfce4-13/xfce4-session/default.nix | 5 +- .../xfce4-13/xfce4-settings/default.nix | 5 +- .../xfce4-13/xfce4-taskmanager/default.nix | 16 ++-- .../xfce4-whiskermenu-plugin/default.nix | 4 +- pkgs/desktops/xfce4-13/xfconf/default.nix | 5 +- pkgs/desktops/xfce4-13/xfdesktop/default.nix | 5 +- pkgs/desktops/xfce4-13/xfwm4/default.nix | 15 ++-- 28 files changed, 82 insertions(+), 185 deletions(-) delete mode 100644 pkgs/desktops/xfce4-13/garcon/12700.patch delete mode 100644 pkgs/desktops/xfce4-13/garcon/13785.patch diff --git a/pkgs/desktops/xfce4-13/exo/default.nix b/pkgs/desktops/xfce4-13/exo/default.nix index 1096996ee6d5..fa66b5c08e78 100644 --- a/pkgs/desktops/xfce4-13/exo/default.nix +++ b/pkgs/desktops/xfce4-13/exo/default.nix @@ -1,15 +1,16 @@ -{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk2, gtk3 +{ mkXfceDerivation, docbook_xsl, libxslt, perlPackages, gtk3 , libxfce4ui, libxfce4util }: mkXfceDerivation rec { category = "xfce"; pname = "exo"; - version = "0.12.2"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "1b4hl9yxvf8b8akqf2zngq3m93yqnqcmxqqds1dwzm9vm5sqydgh"; + sha256 = "1gf9fb48nkafb4jj0hmm2s00mpl32dp5iqxfaxm5i1nc6884hipw"; nativeBuildInputs = [ libxslt perlPackages.URI ]; - buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ]; + buildInputs = [ gtk3 libxfce4ui libxfce4util ]; postPatch = '' substituteInPlace docs/reference/Makefile.am \ diff --git a/pkgs/desktops/xfce4-13/garcon/12700.patch b/pkgs/desktops/xfce4-13/garcon/12700.patch deleted file mode 100644 index fda36d696510..000000000000 --- a/pkgs/desktops/xfce4-13/garcon/12700.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Yegor Timoshenko -Date: Thu, 14 Dec 2017 21:13:02 +0000 -Subject: [PATCH] Decrement allocation counter on item unref (#12700) - -diff --git a/garcon/garcon-menu-item-pool.c b/garcon/garcon-menu-item-pool.c -index 2017180..355e520 100644 ---- a/garcon/garcon-menu-item-pool.c -+++ b/garcon/garcon-menu-item-pool.c -@@ -191,7 +191,12 @@ garcon_menu_item_pool_filter_exclude (const gchar *desktop_id, - g_return_val_if_fail (GARCON_IS_MENU_ITEM (item), FALSE); - g_return_val_if_fail (node != NULL, FALSE); - -- return garcon_menu_node_tree_rule_matches (node, item); -+ gboolean matches = garcon_menu_node_tree_rule_matches (node, item); -+ -+ if (matches) -+ garcon_menu_item_increment_allocated (item); -+ -+ return matches; - } - - -diff --git a/garcon/garcon-menu-item.c b/garcon/garcon-menu-item.c -index ca8cb63..b44acfe 100644 ---- a/garcon/garcon-menu-item.c -+++ b/garcon/garcon-menu-item.c -@@ -1908,6 +1908,8 @@ garcon_menu_item_unref (GarconMenuItem *item) - { - g_return_if_fail (GARCON_IS_MENU_ITEM (item)); - -+ garcon_menu_item_decrement_allocated (item); -+ - /* Decrement the reference counter */ - g_object_unref (G_OBJECT (item)); - } --- -2.15.1 diff --git a/pkgs/desktops/xfce4-13/garcon/13785.patch b/pkgs/desktops/xfce4-13/garcon/13785.patch deleted file mode 100644 index 1b723d21d60a..000000000000 --- a/pkgs/desktops/xfce4-13/garcon/13785.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 4387496fe332a50945e7db76bc2196b419656fe3 Mon Sep 17 00:00:00 2001 -From: Stefan Berzl -Date: Mon, 21 Aug 2017 18:39:07 +0300 -Subject: [PATCH] fix: some menu icons are too big (Bug #13785) - -Some packages only provide icons in sizes much bigger than the standard -GTK menu size of 16px. - -The clipboard manager qlipper for example provides the following icon: -/usr/share/icons/hicolor/128x128/apps/qlipper.png - -In GTK 3.22.18 the function gtk_image_new_from_icon_name when given -GTK_ICON_SIZE_MENU as second argument still returns an image with 128x128. - -The patch I have supplied uses existing code to scale such an image. - -Signed-off-by: Eric Koegel ---- - garcon-gtk/garcon-gtk-menu.c | 33 +++++++++++++++++++-------------- - 1 file changed, 19 insertions(+), 14 deletions(-) - -diff --git a/garcon-gtk/garcon-gtk-menu.c b/garcon-gtk/garcon-gtk-menu.c -index 41990f2..f31a1ed 100644 ---- a/garcon-gtk/garcon-gtk-menu.c -+++ b/garcon-gtk/garcon-gtk-menu.c -@@ -650,7 +650,11 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) - gtk_icon_size_lookup (GTK_ICON_SIZE_MENU, &w, &h); - size = MIN (w, h); - -- if (! gtk_icon_theme_has_icon (icon_theme, icon_name)) -+ if (gtk_icon_theme_has_icon (icon_theme, icon_name)) -+ { -+ pixbuf = gtk_icon_theme_load_icon (icon_theme, icon_name, size, 0, NULL);; -+ } -+ else - { - if (g_path_is_absolute (icon_name)) - { -@@ -684,22 +688,23 @@ garcon_gtk_menu_load_icon (const gchar *icon_name) - g_free (name); - } - } -+ } - -- /* Turn the pixbuf into a gtk_image */ -- if (G_LIKELY (pixbuf)) -- { -- /* scale the pixbuf down if it needs it */ -- GdkPixbuf *tmp = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); -- g_object_unref (pixbuf); -- pixbuf = tmp; -+ /* Turn the pixbuf into a gtk_image */ -+ if (G_LIKELY (pixbuf)) -+ { -+ /* scale the pixbuf down if it needs it */ -+ GdkPixbuf *pixbuf_scaled = gdk_pixbuf_scale_simple (pixbuf, w, h, GDK_INTERP_BILINEAR); -+ g_object_unref (G_OBJECT (pixbuf)); - -- image = gtk_image_new_from_pixbuf (pixbuf); -- g_object_unref (G_OBJECT (pixbuf)); -- } -+ image = gtk_image_new_from_pixbuf (pixbuf_scaled); -+ g_object_unref (G_OBJECT (pixbuf_scaled)); -+ } -+ else -+ { -+ /* display the placeholder at least */ -+ image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - } -- -- if (image == NULL) -- image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_MENU); - - return image; - } diff --git a/pkgs/desktops/xfce4-13/garcon/default.nix b/pkgs/desktops/xfce4-13/garcon/default.nix index a88d64702a1a..487e384358a9 100644 --- a/pkgs/desktops/xfce4-13/garcon/default.nix +++ b/pkgs/desktops/xfce4-13/garcon/default.nix @@ -1,12 +1,12 @@ -{ mkXfceDerivation, gtk2 ? null, gtk3, libxfce4ui, libxfce4util }: +{ mkXfceDerivation, gtk3, libxfce4ui, libxfce4util }: mkXfceDerivation rec { category = "xfce"; pname = "garcon"; - version = "0.6.1"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "19k8bwn29x7hkg882pxv5xxmrbfagdqgkxg166pwz2k0prab6hl8"; + sha256 = "0gmvi6m3iww7m3xxx5wiqd8vsi18igzhcpjfzknfc8z741vc38yj"; - patches = [ ./12700.patch ./13785.patch ]; - buildInputs = [ gtk2 gtk3 libxfce4ui libxfce4util ]; + buildInputs = [ gtk3 libxfce4ui libxfce4util ]; } diff --git a/pkgs/desktops/xfce4-13/gigolo/default.nix b/pkgs/desktops/xfce4-13/gigolo/default.nix index 0d7b2210b12c..46b659b11d03 100644 --- a/pkgs/desktops/xfce4-13/gigolo/default.nix +++ b/pkgs/desktops/xfce4-13/gigolo/default.nix @@ -1,11 +1,12 @@ -{ mkXfceDerivation, gtk2, libX11 }: +{ mkXfceDerivation, exo, gtk3 }: mkXfceDerivation rec { category = "apps"; pname = "gigolo"; - version = "0.4.2"; + version = "0.4.91"; - sha256 = "0qd2jkf3zsvfyd9jn8bfnljja1xfj3ph4wjh3fx10dcwcd791al1"; + sha256 = "1r075hw1jxbpv7jxzyqgfmd2rsw1lykd7snnx736gm55v84k15i7"; - buildInputs = [ gtk2 libX11 ]; + nativeBuildInputs = [ exo ]; + buildInputs = [ gtk3 ]; } diff --git a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix index f6997551262e..d760ed8bc710 100644 --- a/pkgs/desktops/xfce4-13/libxfce4ui/default.nix +++ b/pkgs/desktops/xfce4-13/libxfce4ui/default.nix @@ -4,9 +4,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "libxfce4ui"; - version = "4.13.4"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0m9h3kvkk2nx8pxxmsg9sjnyp6ajwjrz9djjxxvranjsdw3ilydy"; + sha256 = "0z4sadqwp71b3qmxlbms26d8vnxd9cks84mr2f1qaiww6rp7v69y"; buildInputs = [ gobject-introspection gtk2 gtk3 libstartup_notification xfconf ]; propagatedBuildInputs = [ libxfce4util libICE libSM ]; diff --git a/pkgs/desktops/xfce4-13/libxfce4util/default.nix b/pkgs/desktops/xfce4-13/libxfce4util/default.nix index 6a3b633cd09d..1539b3f88d7d 100644 --- a/pkgs/desktops/xfce4-13/libxfce4util/default.nix +++ b/pkgs/desktops/xfce4-13/libxfce4util/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "libxfce4util"; - version = "4.13.2"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0sb6pzhmh0qzfdhixj1ard56zi68318k86z3a1h3f2fhqy7gyf98"; + sha256 = "13cqv4b34rmr9h7nr9gmk3x2mi2y0v91xzwrwhikd1lmz9ir5lkf"; buildInputs = [ gobject-introspection ]; diff --git a/pkgs/desktops/xfce4-13/parole/default.nix b/pkgs/desktops/xfce4-13/parole/default.nix index e720791f1c47..f3a4561826e8 100644 --- a/pkgs/desktops/xfce4-13/parole/default.nix +++ b/pkgs/desktops/xfce4-13/parole/default.nix @@ -8,9 +8,9 @@ mkXfceDerivation rec { category = "apps"; pname = "parole"; - version = "1.0.1"; + version = "1.0.2"; - sha256 = "0zq1imbjqmwfk3yrsha2s7lclzbh8xgggz0rbksa51siqk73swbb"; + sha256 = "11i20pvbrcf1jbn77skb1cg72jdmdd0jvmf5khfn91slqky8gcbl"; postPatch = '' substituteInPlace src/plugins/mpris2/Makefile.am \ diff --git a/pkgs/desktops/xfce4-13/ristretto/default.nix b/pkgs/desktops/xfce4-13/ristretto/default.nix index b4b0778e9824..b2da81399301 100644 --- a/pkgs/desktops/xfce4-13/ristretto/default.nix +++ b/pkgs/desktops/xfce4-13/ristretto/default.nix @@ -4,7 +4,7 @@ mkXfceDerivation rec { category = "apps"; pname = "ristretto"; - version = "0.8.3"; + version = "0.8.4"; postPatch = '' automakeAddFlags src/Makefile.am ristretto_CFLAGS DBUS_GLIB_CFLAGS @@ -14,5 +14,5 @@ mkXfceDerivation rec { nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ dbus-glib gtk2 libexif libxfce4ui libxfce4util xfconf ]; - sha256 = "02i61ddzpv0qjwahkksnzla57zdmkywyg1qrqs57z4bzj6l4nmkx"; + sha256 = "0vnivwl0xwhzpflys9zwds6x9gqd3v069qn04afmakhi2m8qr6hf"; } diff --git a/pkgs/desktops/xfce4-13/thunar-volman/default.nix b/pkgs/desktops/xfce4-13/thunar-volman/default.nix index 0055d0d82179..47900f344b3f 100644 --- a/pkgs/desktops/xfce4-13/thunar-volman/default.nix +++ b/pkgs/desktops/xfce4-13/thunar-volman/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "thunar-volman"; - version = "0.9.0"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; buildInputs = [ exo gtk3 libgudev libxfce4ui libxfce4util xfconf ]; - sha256 = "08aqbp3i0z6frj7z3laz9nj641iakrcr7vh2dxb057ky24gj61i7"; + sha256 = "1g784yjhjacjnkhr8m62xyhnxlfbwk0fwb366p9kkz035k51idrv"; } diff --git a/pkgs/desktops/xfce4-13/thunar/default.nix b/pkgs/desktops/xfce4-13/thunar/default.nix index dbeb80ac9bd2..5dbea2146c5d 100644 --- a/pkgs/desktops/xfce4-13/thunar/default.nix +++ b/pkgs/desktops/xfce4-13/thunar/default.nix @@ -4,9 +4,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "thunar"; - version = "1.8.1"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "00n5iinhg3xgzj2rcy7zl6g9449i59x2l09cnlkhyrjzghb4k5ha"; + sha256 = "13l1nw526jz80p0ynhxqd3a8flp561z0321z7h4rvnidicvdr32n"; postPatch = '' substituteInPlace docs/Makefile.am \ diff --git a/pkgs/desktops/xfce4-13/tumbler/default.nix b/pkgs/desktops/xfce4-13/tumbler/default.nix index 05a4f4ecde3c..27f76fbcaaba 100644 --- a/pkgs/desktops/xfce4-13/tumbler/default.nix +++ b/pkgs/desktops/xfce4-13/tumbler/default.nix @@ -6,9 +6,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "tumbler"; - version = "0.2.3"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "1gb4dav6q9bn64c2ayi4896cr79lb8k63ja2sm3lwsjxgg1r4hw9"; + sha256 = "1bvcxqs3391dkf36gpfr0hbylsk84nqhv6kf3lf1hq6p7s9f9z3z"; buildInputs = [ gdk_pixbuf ffmpegthumbnailer libgsf poppler ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix index 65941fee4c4a..d511f76ec1bd 100644 --- a/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-appfinder/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-appfinder"; - version = "4.13.0"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "13xsshzw04gx5rhalx4r0khjb0dbq26fv6n20biyiai1ykznyryy"; + sha256 = "02ds3s7wbpxka7qnliq4c5p428ricdf0jwv01dkfg88gpgqgvswg"; nativeBuildInputs = [ exo ]; buildInputs = [ garcon gtk3 libxfce4ui libxfce4util xfconf ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix index b4b5ff7b7148..376551b09c0f 100644 --- a/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-battery-plugin/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-battery-plugin"; - version = "1.1.0"; + version = "1.1.2"; rev = version; - sha256 = "0mz0lj3wjrsj9n4wcqrvv08430g38nkjbdimxdy8316n6bqgngfn"; + sha256 = "0329miiclc8da6j0sz495p99hyrf9fjhvpmdl0556fphybz5agc0"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix index 28f63a6769d7..74628a325d41 100644 --- a/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-clipman-plugin/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-clipman-plugin"; - version = "1.4.2"; + version = "1.4.3"; rev = version; - sha256 = "1c2h1cs7pycf1rhpirmvb0l0dfvlacb7xgm31q9rxmhihnycd2na"; + sha256 = "1xk79xh1zk0x4r1z9m1dakp79pip0zh3naviybvl1dnpwwfc03gq"; buildInputs = [ exo gtk3 libXtst libxfce4ui libxfce4util xfce4-panel xfconf ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix index e17204c0cd55..84cb74276997 100644 --- a/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-cpufreq-plugin/default.nix @@ -3,8 +3,8 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-cpufreq-plugin"; - version = "1.2.0"; - sha256 = "0zhs7b7py1njczmpnib4532fwpnd3vnpqfhss2r136cfgy72kp6g"; + version = "1.2.1"; + sha256 = "1p7c4g3yfc19ksdckxpzq1q35jvplh5g55299cvv0afhdb5l8zhv"; buildInputs = [ gtk3 libxfce4ui libxfce4util xfce4-panel xfconf ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix index 1236b60175d0..603863264efc 100644 --- a/pkgs/desktops/xfce4-13/xfce4-dict/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-dict/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "apps"; pname = "xfce4-dict"; - version = "0.8.1"; + version = "0.8.2"; - sha256 = "0kxirzqmpp7qlr8220i8kipz4bgzkam7h1lpx7yzld5xf7wdzvaf"; + sha256 = "1zbb0k0984ny7wy4gbk6ymkh87rbfakpim54yq4r3h5ymslx7iv7"; patches = [ ./configure-gio.patch ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix index bac258785079..98ed6882a024 100644 --- a/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-notifyd/default.nix @@ -4,9 +4,9 @@ mkXfceDerivation rec { category = "apps"; pname = "xfce4-notifyd"; - version = "0.4.2"; + version = "0.4.4"; - sha256 = "1zxwzigrhms74crasbqpnzidmq2mnyxpmc9pqr4p4qj14yw4sam9"; + sha256 = "1lmm9h3ych8dz9jpjkxg91f9ln14xs527nxjxsryks00kmqk4kai"; buildInputs = [ dbus-glib exo gtk3 libnotify libxfce4ui libxfce4util xfce4-panel xfconf ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix index 27c8e1e58c71..c7551a7e6daf 100644 --- a/pkgs/desktops/xfce4-13/xfce4-panel/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-panel/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-panel"; - version = "4.13.4"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "13hnzh31d2b1331lnsbfaxg4fqhqa7hmdwkiqsl9hyr8pqimjb2g"; + sha256 = "03jyglimm4wgpmg5a128fshrygzwmpf5wdw26l9azqj8b6iz55al"; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ exo garcon gtk2 gtk3 libxfce4ui libxfce4util libwnck3 xfconf ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix index 5389af668820..0307738aee28 100644 --- a/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-power-manager/default.nix @@ -4,9 +4,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-power-manager"; - version = "1.6.1"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0b32m46v3dv1ln3xwlpqbnpflknm4gyfk2w6gn7xjx1k7igcjym3"; + sha256 = "1n9i62jh5ldf8g9n64mm6nh1182abbf96444j14dppb82r94q077"; nativeBuildInputs = [ automakeAddFlags exo ]; buildInputs = [ gtk3 libnotify libxfce4ui libxfce4util upower xfconf ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix index 0dfad21d07ba..95af146903b1 100644 --- a/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-screenshooter/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "apps"; pname = "xfce4-screenshooter"; - version = "1.9.2"; + version = "1.9.5"; - sha256 = "1zl16xcmgrb1s6rsrn37mpl5w522i1i9s7x167xf2d092x333yx2"; + sha256 = "1h14sywvk9l06p3z1cpb79911j8w2wqbk03ldknjkia2rfymjk06"; nativeBuildInputs = [ wrapGAppsHook ]; # fix "No GSettings schemas are installed on the system" buildInputs = [ exo gtk3 libsoup libxfce4ui libxfce4util xfce4-panel glib-networking ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-session/default.nix b/pkgs/desktops/xfce4-13/xfce4-session/default.nix index ecf1f6ac505e..6104f6324396 100644 --- a/pkgs/desktops/xfce4-13/xfce4-session/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-session/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-session"; - version = "4.13.0"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0d6h1kgqq6g084jrxx4jxw98h5g0vwsxqrvk0bmapyxh2sbrg07y"; + sha256 = "14bn3wn5qrciy2nbhbx634bz0d6lnxb135bx1qglcf35wn6f0hqk"; buildInputs = [ exo dbus-glib dbus gtk3 libxfce4ui libxfce4util libwnck3 xfconf polkit iceauth ]; diff --git a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix index 6eb917fd76fd..7e885c526d15 100644 --- a/pkgs/desktops/xfce4-13/xfce4-settings/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-settings/default.nix @@ -5,9 +5,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfce4-settings"; - version = "4.13.4"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0qnnpvcs2hpfq3n4byjwq343p95i9xw96rq7ym4md4mahnk176dy"; + sha256 = "0q6jh3fqw9n9agp018xiwidrld445irnli5jgwpszi9hc435dbpc"; postPatch = '' automakeAddFlags xfce4-settings-editor/Makefile.am xfce4_settings_editor_CFLAGS DBUS_GLIB_CFLAGS diff --git a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix index d9a5991598bc..776b3797f769 100644 --- a/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-taskmanager/default.nix @@ -1,18 +1,12 @@ -{ lib, mkXfceDerivation, exo, gtk2, gtk3 ? null, libwnck3 ? null, libXmu }: +{ lib, mkXfceDerivation, exo, gtk3, libwnck3, libXmu }: -let - inherit (lib) enableFeature; -in - -mkXfceDerivation rec { +mkXfceDerivation { category = "apps"; pname = "xfce4-taskmanager"; - version = "1.2.1"; + version = "1.2.2"; - sha256 = "1p0496r1fb5zqvn6c41kb6rjqwlqghqahgg6hkzw0gjy911im99w"; + sha256 = "03js0pmhrybxa7hrp3gx4rm7j061ansv0bp2dwhnbrdpmzjysysc"; nativeBuildInputs = [ exo ]; - buildInputs = [ gtk2 gtk3 libwnck3 libXmu ]; - - configureFlags = [ (enableFeature (gtk3 != null) "gtk3") ]; + buildInputs = [ gtk3 libwnck3 libXmu ]; } diff --git a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix b/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix index 41a1ef82932b..41cd491a7dc2 100644 --- a/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix +++ b/pkgs/desktops/xfce4-13/xfce4-whiskermenu-plugin/default.nix @@ -3,9 +3,9 @@ mkXfceDerivation rec { category = "panel-plugins"; pname = "xfce4-whiskermenu-plugin"; - version = "2.2.0"; + version = "2.3.2"; rev = "v${version}"; - sha256 = "1d35xxkdzw8pl3d5ps226mmrrjk0hqczsbvl5smh7l7jbwfambjm"; + sha256 = "0ha6c259d7a0wzpf87ynyzpj3y178iwhpcb87m9zxm66i513qmbs"; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/desktops/xfce4-13/xfconf/default.nix b/pkgs/desktops/xfce4-13/xfconf/default.nix index def60bcfe21c..691fc70644c9 100644 --- a/pkgs/desktops/xfce4-13/xfconf/default.nix +++ b/pkgs/desktops/xfce4-13/xfconf/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfconf"; - version = "4.13.5"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0xpnwb04yw5qdn0bj8b740a7rmiy316vhja5pp8p6sdiqm32yi8a"; + sha256 = "0n9cjiz3mj011p3w4jv0n2ifz38whmykdl888mczc26l1gflxnr3"; buildInputs = [ libxfce4util ]; } diff --git a/pkgs/desktops/xfce4-13/xfdesktop/default.nix b/pkgs/desktops/xfce4-13/xfdesktop/default.nix index 0209b7913602..2d87c6ac987b 100644 --- a/pkgs/desktops/xfce4-13/xfdesktop/default.nix +++ b/pkgs/desktops/xfce4-13/xfdesktop/default.nix @@ -3,9 +3,10 @@ mkXfceDerivation rec { category = "xfce"; pname = "xfdesktop"; - version = "4.13.2"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "0v6dlhraqh9v20qciyj03cbjmg3jb6gvmf0hqzavxqi2di3mv5fl"; + sha256 = "1mni8gzgglhwicaw093i2vpk8q2vilmgg5qbr3izbb8ighhr09jl"; buildInputs = [ exo diff --git a/pkgs/desktops/xfce4-13/xfwm4/default.nix b/pkgs/desktops/xfce4-13/xfwm4/default.nix index 97d414d66932..c8106c8ec174 100644 --- a/pkgs/desktops/xfce4-13/xfwm4/default.nix +++ b/pkgs/desktops/xfce4-13/xfwm4/default.nix @@ -1,25 +1,26 @@ -{ mkXfceDerivation, exo, dbus-glib, epoxy, gtk2, libXdamage -, libstartup_notification, libxfce4ui, libxfce4util, libwnck +{ mkXfceDerivation, exo, librsvg, dbus-glib, epoxy, gtk3, libXdamage +, libstartup_notification, libxfce4ui, libxfce4util, libwnck3 , libXpresent, xfconf }: mkXfceDerivation rec { category = "xfce"; pname = "xfwm4"; - version = "4.13.0"; + version = "4.14pre1"; + rev = "xfce-4.14pre1"; - sha256 = "19ikyls4xawsbz07qdz60g5yl2jbvpb90sfy5zql7ghypd69cgn9"; + sha256 = "0kdlkpb7phcrsqhyhnw82f03fzmd5xb4w9fdj94frfprfja0b468"; - nativeBuildInputs = [ exo ]; + nativeBuildInputs = [ exo librsvg ]; buildInputs = [ dbus-glib epoxy - gtk2 + gtk3 libXdamage libstartup_notification libxfce4ui libxfce4util - libwnck + libwnck3 libXpresent xfconf ];