Merge pull request #119577 from romildo/upd.lxqt

This commit is contained in:
Sandro 2021-04-22 11:37:38 +02:00 committed by GitHub
commit e39242130f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 68 additions and 56 deletions

View File

@ -16,13 +16,13 @@
mkDerivation rec { mkDerivation rec {
pname = "libfm-qt"; pname = "libfm-qt";
version = "0.16.0"; version = "0.17.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = "libfm-qt"; repo = "libfm-qt";
rev = version; rev = version;
sha256 = "0b52bczqvw4brxv5fszjrl1375yid6xzjm49ns9rx1jw71422w0p"; sha256 = "0jdsqvwp81y4ylabrqdc673x80fp41rpp5w7c1v9zmk9k8z4s5ll";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec { mkDerivation rec {
pname = "liblxqt"; pname = "liblxqt";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1rp26g1ygzzy1cm7md326sv99zjz4y12pa402nlf2vrf2lzbwfmk"; sha256 = "0n0pjz5wihchfcji8qal0lw8kzvv3im50v1lbwww4ymrgacz9h4l";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -10,13 +10,13 @@
mkDerivation rec { mkDerivation rec {
pname = "libqtxdg"; pname = "libqtxdg";
version = "3.6.0"; version = "3.7.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0wiannhaydnbqd8ni3nflx2s4036grxs8aklcb95j88v3cgr2gck"; sha256 = "1x806hdics3d49ys0a2vkln9znidj82qscjnpcqxclxn26xqzd91";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,13 +9,13 @@
mkDerivation rec { mkDerivation rec {
pname = "libsysstat"; pname = "libsysstat";
version = "0.4.4"; version = "0.4.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1pbshhg8pjkzkka5f2rxfxal7rb4fjccpgj07kxvgcnqlah27ydk"; sha256 = "14q55iayygmjh63zgsb9qa4af766gj9b0jsrmfn85fdiqb8p8yfz";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -16,13 +16,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lximage-qt"; pname = "lximage-qt";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1z2lvfrw9shpvwxva0vf0rk74nj3mmjgxznsgq8r65645fnj5imb"; sha256 = "1xajsblk2954crvligvrgwp7q1pj7124xdfnlq9k9q0ya2xc36lx";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -14,13 +14,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-about"; pname = "lxqt-about";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0m7gan31byy80k9jqfqxx4drvfx0d9savj4shnrabsb3z3fj9h8h"; sha256 = "011jcab47iif741azfgvf52my118nwkny5m0pa7nsqyv8ad1fsiw";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-admin"; pname = "lxqt-admin";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0mi119ji0260idi14980nhmylx3krnfmkj9r81nmbbrg02h158nz"; sha256 = "1xi169gz1sarv7584kg33ymckqlx9ddci7r9m0dlm4a7mw7fm0lf";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -40,8 +40,11 @@ mkDerivation rec {
]; ];
postPatch = '' postPatch = ''
sed "s|\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}|''${out}/share/polkit-1/actions|" \ for f in lxqt-admin-{time,user}/CMakeLists.txt; do
-i lxqt-admin-user/CMakeLists.txt substituteInPlace $f --replace \
"\''${POLKITQT-1_POLICY_FILES_INSTALL_DIR}" \
"$out/share/polkit-1/actions"
done
''; '';
passthru.updateScript = lxqtUpdateScript { inherit pname version src; }; passthru.updateScript = lxqtUpdateScript { inherit pname version src; };

View File

@ -14,13 +14,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-archiver"; pname = "lxqt-archiver";
version = "0.3.0"; version = "0.4.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = "lxqt-archiver"; repo = "lxqt-archiver";
rev = version; rev = version;
sha256 = "0f4nj598w6qhcrhbab15cpfmrda02jcflxhb15vyv7gnplalkya6"; sha256 = "0wpayzcyqcnvzk95bqql7p07l8p7mwdgdj7zlbcsdn0wis4yhjm6";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -6,18 +6,19 @@
, pcre , pcre
, qtbase , qtbase
, glib , glib
, perl
, lxqtUpdateScript , lxqtUpdateScript
}: }:
mkDerivation rec { mkDerivation rec {
pname = "lxqt-build-tools"; pname = "lxqt-build-tools";
version = "0.8.0"; version = "0.9.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1wf6mhcfgk64isy7bk018szlm18xa3hjjnmhpcy2whnnjfq0jal6"; sha256 = "0zhcv6cbdn9fr5lpglz26gzssbxkpi824sgc0g7w3hh1z6nqqf8l";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -32,6 +33,10 @@ mkDerivation rec {
pcre pcre
]; ];
propagatedBuildInputs = [
perl # needed by LXQtTranslateDesktop.cmake
];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
# We're dependent on this macro doing add_definitions in most places # We're dependent on this macro doing add_definitions in most places

View File

@ -18,13 +18,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-config"; pname = "lxqt-config";
version = "0.16.1"; version = "0.17.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1ppkkz7rg5ddlyk1ikh2s3g7nbb0wnpl0lldg9j68l76d61sfm8z"; sha256 = "0b9jihmsqgdfdsisz15j3p53fgf1w30s8irj9zjh52fsj58p924p";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-globalkeys"; pname = "lxqt-globalkeys";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "00n02mci0wry9l2prc98liiamshacnj8pvmra5wkmygm581q2r19"; sha256 = "135292l8w9sngg437n1zigkap15apifyqd9847ln84bxsmcj8lay";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-notificationd"; pname = "lxqt-notificationd";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0ahvjf5102a0pz5bfznjvkg55xix6k9bw381gzv6jqw5553snanc"; sha256 = "1r2cmxcjkm9lvb2ilq2winyqndnamsd9x2ynmfiqidby2pcr9i3a";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-openssh-askpass"; pname = "lxqt-openssh-askpass";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "163mshrwfwp31bjis66l50krsyp184idw9gyp7pdh047psca5129"; sha256 = "18pn7kw9aw7859jnwvjnjcvr50pqsi8gqcxsbx9rvsjrybw2qcgc";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -30,13 +30,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-panel"; pname = "lxqt-panel";
version = "0.16.1"; version = "0.17.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1mm23fys5npm5fi47y3h2mzvlhlcaz7k1p4wwmc012f0hqcrvqik"; sha256 = "1wmm4sml7par5z9xcs5qx2y2pdbnnh66zs37jhx9f9ihcmh1sqlw";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -19,13 +19,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-policykit"; pname = "lxqt-policykit";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "05qi550cjyjzhlma4zxnp1pn8i5cgak2k2mwwh2a5gpicp5axavn"; sha256 = "15f0hnif8zs38qgckif63dds9zgpp3dmg9pg3ppgh664lkbxx7n7";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -18,13 +18,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-powermanagement"; pname = "lxqt-powermanagement";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1pf3z8hymddk1cm5j5lqgah967xsdl37j66gz5bs3dw7871gbdhy"; sha256 = "1ikkksg5k7jwph7060h8wyk7bdsywvhl47zp23j5gcig0nk62ggf";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-qtplugin"; pname = "lxqt-qtplugin";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "14k5icxjkl5znp59y44791brsmwy54jkwr4vn3kg4ggqjdp3vbh9"; sha256 = "168ii015j57hkccdh27h2fdh8yzs8nzy8nw20wnx6fbcg5401666";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -20,13 +20,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-runner"; pname = "lxqt-runner";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0bmx5y4l443j8vrzw8967kw5i150braq0pfj8xk0nyz6zz62rrf1"; sha256 = "167gzn6aqk7akzbmrnm7nmcpkl0nphr8axbfgwnw552dnk6v8gn0";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -11,6 +11,7 @@
, kwindowsystem , kwindowsystem
, liblxqt , liblxqt
, libqtxdg , libqtxdg
, procps
, xorg , xorg
, xdg-user-dirs , xdg-user-dirs
, lxqtUpdateScript , lxqtUpdateScript
@ -18,13 +19,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-session"; pname = "lxqt-session";
version = "0.16.0"; version = "0.17.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1lmj0cx4crdjl2qih3scm2gvsx3qna0nb6mjjrcx0f2k7h744pik"; sha256 = "1nhw3y3dm4crawc1905l6drn0i79fs1dzs8iak0vmmplbiv3fvgg";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -41,6 +42,7 @@ mkDerivation rec {
kwindowsystem kwindowsystem
liblxqt liblxqt
libqtxdg libqtxdg
procps
xorg.libpthreadstubs xorg.libpthreadstubs
xorg.libXdmcp xorg.libXdmcp
xdg-user-dirs xdg-user-dirs

View File

@ -16,13 +16,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-sudo"; pname = "lxqt-sudo";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0al64v12ddi6bgrr2z86jh21c02wg5l0mxjcmk9xlsvdx0d94cdx"; sha256 = "10s8k83mkqiakh18mh1l7idjp95cy49rg8dh14cy159dk8mchcd0";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -8,13 +8,13 @@
mkDerivation rec { mkDerivation rec {
pname = "lxqt-themes"; pname = "lxqt-themes";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "12pbba7a2rk0kjn3hl2lvn90di58w0s5psbq51kz39ah3rlp9dzz"; sha256 = "13zh5yrq0f96cn5m6i7zdvgb9iw656fad5ps0s2zx6x8mj2mv64f";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -13,13 +13,13 @@
mkDerivation rec { mkDerivation rec {
pname = "pavucontrol-qt"; pname = "pavucontrol-qt";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "1d3kp2y3crrmbqak4mn9d6cfbhi5l5xhchhjh44ng8gpww22k5h0"; sha256 = "0syc4bc2k7961la2c77787akhcljspq3s2nyqvb7mq7ddq1xn0wx";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -15,13 +15,13 @@
mkDerivation rec { mkDerivation rec {
pname = "pcmanfm-qt"; pname = "pcmanfm-qt";
version = "0.16.0"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "09mlv5qkwzpfz5l41pcz0k01kgsikzkghhfkl84hwyjdm4i2vapj"; sha256 = "1awyncpypygsrg7d2nc6xh1l4xaln3ypdliy4xmq8bf94sh9rf0y";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -14,13 +14,13 @@
mkDerivation rec { mkDerivation rec {
pname = "qps"; pname = "qps";
version = "2.2.0"; version = "2.3.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0gfw7iz7jzyfl9hiq3aivbgkkl61fz319cfg57fgn2kldlcljhwa"; sha256 = "0fihhnb7vp6x072spg1fnxaip4sq9mbvhrfqdwnzph5dlyvs54nj";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -12,13 +12,13 @@
mkDerivation rec { mkDerivation rec {
pname = "qterminal"; pname = "qterminal";
version = "0.16.1"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0l1jhkyx7ihv3nvqm1gfvzhrhl4l8yvqxly0c9zgl6mzrd39cj3d"; sha256 = "0mdcz45faj9ysw725qzg572968kf5sh6zfw7iiksi26s8kiyhbbp";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -10,13 +10,13 @@
mkDerivation rec { mkDerivation rec {
pname = "qtermwidget"; pname = "qtermwidget";
version = "0.16.1"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0kpg4b60h6dads8ncwlk0zj1c8y7xpb0kz28j0v9fqjbmxja7x6w"; sha256 = "0pmkk2mba8z6cgfsd8sy4vhf5d9fn9hvxszzyycyy1ndygjrc1v8";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View File

@ -9,6 +9,7 @@
, qtsvg , qtsvg
, kwindowsystem , kwindowsystem
, libqtxdg , libqtxdg
, perl
, xorg , xorg
, autoPatchelfHook , autoPatchelfHook
, lxqtUpdateScript , lxqtUpdateScript
@ -16,18 +17,19 @@
mkDerivation rec { mkDerivation rec {
pname = "screengrab"; pname = "screengrab";
version = "2.1.0"; version = "2.2.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lxqt"; owner = "lxqt";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "0jy2izgl3jg6mnykpw7ji1fjv7dsivdfi6k6i6glrpa0z1p51gic"; sha256 = "16dycq40lbvk6jvpj7zp85m23cgvh8nj38fz99gxjfzn2nz1gy4a";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
cmake cmake
pkg-config pkg-config
perl # needed by LXQtTranslateDesktop.cmake
autoPatchelfHook # fix libuploader.so and libextedit.so not found autoPatchelfHook # fix libuploader.so and libextedit.so not found
]; ];