Unverified Commit b488f65e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #299721 from wineee/deepin-compressor-6.0.1 

deepin.deepin-compressor: 5.12.24 -> 6.0.1
parents b1741ce9 bd98a8a7

pkgs/desktops/deepin/apps/deepin-compressor/0001-fix-build-on-new-dtk.diff

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
diff --git a/src/source/common/ddesktopservicesthread.h b/src/source/common/ddesktopservicesthread.h

index 49313744..456a5e96 100644

--- a/src/source/common/ddesktopservicesthread.h

+++ b/src/source/common/ddesktopservicesthread.h

@@ -8,10 +8,14 @@

 

 #include <QThread>

 

+#include <dtkwidget_global.h>

+#include <dtkgui_global.h>

 #include <DDesktopServices>

 #include <QDebug>

 #include <QFileInfo>

+

 DWIDGET_USE_NAMESPACE

+DGUI_USE_NAMESPACE

 

 // 文管打开文件目录线程

 class DDesktopServicesThread : public QThread

pkgs/desktops/deepin/apps/deepin-compressor/default.nix

+3 −7
Original line number Diff line number Diff line
@@ -20,22 +20,18 @@ 


stdenv.mkDerivation rec {

  pname = "deepin-compressor";

  version = "5.12.24";

  version = "6.0.1";



  src = fetchFromGitHub {

    owner = "linuxdeepin";

    repo = pname;

    rev = version;

    hash = "sha256-XNhG28VZifQrl3TZfx/OHnsAOo0eKrhGKDk+OjOYD8k=";

    hash = "sha256-DUpYb1xNmWpBcKo9kajeVm/+z4yj2OBE+qOyEkCHbUI=";

  };



  patches = [

    ./0001-fix-build-on-new-dtk.diff

  ];



  postPatch = ''

    substituteInPlace src/source/common/pluginmanager.cpp \

      --replace-fail "/usr/lib/" "$out/lib/"

      --replace-fail "/usr/lib" "$out/lib"

    substituteInPlace src/desktop/deepin-compressor.desktop \

      --replace-fail "/usr" "$out"

  '';