Unverified Commit 5223d409 authored by rewine's avatar rewine Committed by GitHub
Browse files

deepin desktop environment: remove packages I no longer maintain (#374427)

parents 352779d1 3021e6d6
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@
  pkg-config,

  # for passthru.tests
  deepin,
  freeimage,
  hdrmerge,
  imagemagick,
@@ -43,7 +42,6 @@ stdenv.mkDerivation rec {

  passthru.tests = {
    inherit imagemagick hdrmerge freeimage;
    inherit (deepin) deepin-image-viewer;
    inherit (python3.pkgs) rawkit;
  };

+0 −62
Original line number Diff line number Diff line
{
  stdenv,
  lib,
  fetchFromGitHub,
  cmake,
  pkg-config,
  libsForQt5,
  dtkwidget,
  dtkdeclarative,
  qt5integration,
  qt5platform-plugins,
  udisks2-qt5,
  gio-qt,
  freeimage,
  ffmpeg_6,
  ffmpegthumbnailer,
}:

stdenv.mkDerivation rec {
  pname = "deepin-album";
  version = "6.0.4";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
    hash = "sha256-kTcVmROsqLH8GwJzAf3zMq/wGYWNvhFBiHODaROt7Do=";
  };

  nativeBuildInputs = [
    cmake
    pkg-config
    libsForQt5.qttools
    libsForQt5.wrapQtAppsHook
  ];

  buildInputs = [
    dtkwidget
    dtkdeclarative
    qt5integration
    qt5platform-plugins
    libsForQt5.qtbase
    libsForQt5.qtsvg
    udisks2-qt5
    gio-qt
    freeimage
    ffmpeg_6
    ffmpegthumbnailer
  ];

  strictDeps = true;

  cmakeFlags = [ "-DVERSION=${version}" ];

  meta = with lib; {
    description = "Fashion photo manager for viewing and organizing pictures";
    homepage = "https://github.com/linuxdeepin/deepin-album";
    license = licenses.gpl3Plus;
    platforms = platforms.linux;
    maintainers = teams.deepin.members;
  };
}
+0 −111
Original line number Diff line number Diff line
{
  stdenv,
  lib,
  fetchFromGitHub,
  cmake,
  pkg-config,
  libsForQt5,
  dtkwidget,
  wayland,
  dwayland,
  qt5integration,
  qt5platform-plugins,
  image-editor,
  ffmpeg_6,
  ffmpegthumbnailer,
  libusb1,
  libpciaccess,
  portaudio,
  libv4l,
  gst_all_1,
  systemd,
}:

stdenv.mkDerivation rec {
  pname = "deepin-camera";
  version = "6.0.5";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
    hash = "sha256-3q8yV8GpCPKW780YpCn+xLeFBGJFoAMmKSFCAH9OXoE=";
  };

  # QLibrary and dlopen work with LD_LIBRARY_PATH
  patches = [ ./dont_use_libPath.diff ];

  postPatch = ''
    substituteInPlace src/CMakeLists.txt \
      --replace "/usr/share/libimagevisualresult" "${image-editor}/share/libimagevisualresult" \
      --replace "/usr/include/libusb-1.0" "${lib.getDev libusb1}/include/libusb-1.0"
    substituteInPlace src/com.deepin.Camera.service \
      --replace "/usr/bin/qdbus" "${lib.getBin libsForQt5.qttools}/bin/qdbus" \
      --replace "/usr/share" "$out/share"
  '';

  nativeBuildInputs = [
    cmake
    pkg-config
    libsForQt5.qttools
    libsForQt5.wrapQtAppsHook
  ];

  buildInputs =
    [
      dtkwidget
      wayland
      dwayland
      qt5integration
      qt5platform-plugins
      image-editor
      libsForQt5.qtbase
      libsForQt5.qtmultimedia
      ffmpeg_6
      ffmpegthumbnailer
      libusb1
      libpciaccess
      portaudio
      libv4l
    ]
    ++ (with gst_all_1; [
      gstreamer
      gst-plugins-base
    ]);

  cmakeFlags = [ "-DVERSION=${version}" ];

  strictDeps = true;

  env.NIX_CFLAGS_COMPILE = toString [
    "-I${gst_all_1.gstreamer.dev}/include/gstreamer-1.0"
    "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"
  ];

  qtWrapperArgs = [
    "--prefix LD_LIBRARY_PATH : ${
      lib.makeLibraryPath [
        ffmpeg_6
        ffmpegthumbnailer
        gst_all_1.gstreamer
        gst_all_1.gst-plugins-base
        libusb1
        libv4l
        portaudio
        systemd
      ]
    }"
  ];

  preFixup = ''
    qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
  '';

  meta = {
    description = "Tool to view camera, take photo and video";
    homepage = "https://github.com/linuxdeepin/deepin-camera";
    license = lib.licenses.gpl3Plus;
    platforms = lib.platforms.linux;
    maintainers = lib.teams.deepin.members;
  };
}
+0 −24
Original line number Diff line number Diff line
diff --git a/src/src/gstvideowriter.cpp b/src/src/gstvideowriter.cpp
index c96c8b0..fcc11da 100644
--- a/src/src/gstvideowriter.cpp
+++ b/src/src/gstvideowriter.cpp
@@ -282,6 +282,7 @@ void GstVideoWriter::loadAppSrcCaps()
 
 QString GstVideoWriter::libPath(const QString &strlib)
 {
+    return strlib;
     QDir  dir;
     QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
     dir.setPath(path);
diff --git a/src/src/mainwindow.cpp b/src/src/mainwindow.cpp
index d3c6c24..6d313a6 100644
--- a/src/src/mainwindow.cpp
+++ b/src/src/mainwindow.cpp
@@ -784,6 +784,7 @@ void CMainWindow::slotPopupSettingsDialog()
 
 QString CMainWindow::libPath(const QString &strlib)
 {
+    return strlib;
     QDir  dir;
     QString path  = QLibraryInfo::location(QLibraryInfo::LibrariesPath);
     dir.setPath(path);
+0 −63
Original line number Diff line number Diff line
{
  stdenv,
  lib,
  fetchFromGitHub,
  fetchpatch,
  cmake,
  pkg-config,
  libsForQt5,
  qt5platform-plugins,
  dtkwidget,
  dtkdeclarative,
  deepin-ocr-plugin-manager,
  libraw,
  freeimage,
}:

stdenv.mkDerivation rec {
  pname = "deepin-image-viewer";
  version = "6.0.2";

  src = fetchFromGitHub {
    owner = "linuxdeepin";
    repo = pname;
    rev = version;
    hash = "sha256-YT3wK+ELXjgtsXbkiCjQF0zczQi89tF1kyIQtl9/mMA=";
  };

  patches = [
    (fetchpatch {
      name = "fix-build-with-libraw-0_21.patch";
      url = "https://raw.githubusercontent.com/archlinux/svntogit-community/2ff11979704dd7156a7e7c3bae9b30f08894063d/trunk/libraw-0.21.patch";
      hash = "sha256-I/w4uiANT8Z8ud/F9WCd3iRHOfplu3fpqnu8ZIs4C+w=";
    })
  ];

  nativeBuildInputs = [
    cmake
    pkg-config
    libsForQt5.qttools
    libsForQt5.wrapQtAppsHook
  ];

  buildInputs = [
    qt5platform-plugins
    dtkwidget
    dtkdeclarative
    deepin-ocr-plugin-manager
    libraw
    freeimage
  ];

  strictDeps = true;

  cmakeFlags = [ "-DVERSION=${version}" ];

  meta = with lib; {
    description = "Image viewing tool with fashion interface and smooth performance";
    homepage = "https://github.com/linuxdeepin/deepin-image-viewer";
    license = licenses.gpl3Plus;
    platforms = platforms.linux;
    maintainers = teams.deepin.members;
  };
}
Loading