Backport to Jammy.

debian/changelog

@@ -1,45 +1,8 @@
-pcmanfm-qt (1.3.0-0ubuntu1~ppa1) jammy; urgency=medium
+pcmanfm-qt (1.2.0-0ubuntu1~ppa1) jammy; urgency=medium
 
   * Backport to Jammy.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 13:03:33 -0500
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 18 Nov 2022 18:56:34 -0600
-
-pcmanfm-qt (1.3.0-0ubuntu1) mantic; urgency=medium
-
-  * New upstream release.
-  * Bump build dependencies.
-
- -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 11 Aug 2023 09:52:17 -0500
-
-pcmanfm-qt (1.2.1-0ubuntu3) lunar; urgency=medium
-
-  * Made the General tab in Desktop Preferences the default tab again.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Tue, 07 Mar 2023 12:35:39 -0600
-
-pcmanfm-qt (1.2.1-0ubuntu2) lunar; urgency=medium
-
-  * Put the Lubuntu Manual checkbox where it belongs in the Desktop
-    Preferences window. (LP: #1998528)
-  * Make the Lubuntu Manual checkbox behave correctly (if the shortcut is
-    present, it should be checked, if the shortcut is missing, it should be
-    unchecked).
-  * Make the context menu of the Lubuntu Manual shortcut on the desktop behave
-    like the other special shortcuts (Home, Trash, Computer, Network).
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Thu, 02 Mar 2023 17:41:45 -0600
-
-pcmanfm-qt (1.2.1-0ubuntu1) lunar; urgency=medium
-
-  * New upstream release.
-  * Updated copyright file.
-  * Bumped Standards-Version to 4.6.2, no changes necessary.
-  * Bumped build dependency for libfm-qt.
-  * Removed obsolete '-Wl,--as-needed' linker flag.
-  * Added 'Rules-Requires-Root: no' to debian/control.
-  * Removed trailing whitespace from changelog.
-
- -- Aaron Rainbolt <arraybolt3@ubuntu.com>  Fri, 27 Jan 2023 15:55:12 -0600
 
 pcmanfm-qt (1.2.0-0ubuntu1) lunar; urgency=medium
 
@@ -595,3 +558,4 @@ pcmanfm-qt (0.9.0+20150816-1) unstable; urgency=medium
   * Warpped lines in copyright.
 
  -- Andrew Lee (李健秋) <ajqlee@debian.org>  Mon, 17 Aug 2015 21:04:54 +0800
+

debian/control

@@ -10,26 +10,25 @@ Section: x11
 Priority: optional
 Build-Depends: debhelper-compat (= 13),
                libexif-dev,
-               libfm-qt-dev (>= 1.3.0),
+               libfm-qt-dev (>= 1.2.0),
                libkf5windowsystem-dev,
                libmenu-cache-dev,
                libqt5svg5-dev,
                libqt5x11extras5-dev,
                libx11-dev,
-               lxqt-build-tools (>= 0.13.0)
+               lxqt-build-tools (>= 0.12.0)
-Standards-Version: 4.6.2
+Standards-Version: 4.6.1
 Vcs-Browser: https://git.lubuntu.me/Lubuntu/pcmanfm-qt-packaging
 Vcs-Git: https://git.lubuntu.me/Lubuntu/pcmanfm-qt-packaging.git
 XS-Debian-Vcs-Browser: https://salsa.debian.org/lxqt-team/pcmanfm-qt
 XS-Debian-Vcs-Git: https://salsa.debian.org/lxqt-team/pcmanfm-qt.git
 Homepage: https://github.com/lxqt/pcmanfm-qt
-Rules-Requires-Root: no
 
 Package: pcmanfm-qt
 Architecture: any
 Depends: default-dbus-session-bus | dbus-session-bus | dbus-x11,
          desktop-file-utils,
-         libfm-qt13,
+         libfm-qt12 (>= 1.2.0),
          lxqt-sudo,
          ${misc:Depends},
          ${shlibs:Depends}

debian/copyright

@@ -4,14 +4,14 @@ Source: https://github.com/lxqt/pcmanfm-qt
 
 Files: *
 Copyright: 2017,     Pedram Pourang (Tsu Jan) <tsujan2000@gmail.com>
-           2013-2023 LXQt team
+           2013-2022 LXQt team
            2009-2018 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
            2012-2013 Andriy Grytsenko (LStranger) <andrej@rep.kiev.ua>
            2014      Kuzma Shapran <kuzma.shapran@gmail.com>
 License: GPL-2.0+
 
 Files: debian/*
-Copyright: 2021-2023 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
+Copyright: 2021-2022 Lubuntu Developers <lubuntu-devel@lists.ubuntu.com>
            2014-2015 Wen Liao <wen.cf83@gmail.com>
            2014-2016 ChangZhuo Chen (陳昌倬) <czchen@debian.org>
            2013-2018 Alf Gaida <agaida@siduction.org>

debian/patches/add-manual.patch

@@ -3,143 +3,14 @@ Forwarded: eventually
 Author: Simon Quigley <tsimonq2@lubuntu.me>
 Last-Update: 2022-06-16
 ---
+diff --git a/pcmanfm/desktop-preferences.ui b/pcmanfm/desktop-preferences.ui
+index d73e731..459926a 100644
 --- a/pcmanfm/desktop-preferences.ui
 +++ b/pcmanfm/desktop-preferences.ui
-@@ -6,8 +6,8 @@
+@@ -573,6 +573,17 @@ are left clicked, even when it is not the default file manager.</string>
-    <rect>
-     <x>0</x>
-     <y>0</y>
--    <width>534</width>
--    <height>434</height>
-+    <width>609</width>
-+    <height>720</height>
-    </rect>
-   </property>
-   <property name="windowTitle">
-@@ -485,27 +485,17 @@ are left clicked, even when it is not th
-           <bool>false</bool>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_4">
--          <item row="0" column="0" colspan="7">
--           <widget class="QLabel" name="label_10">
--            <property name="text">
--             <string>Wallpaper image folder:</string>
-+          <item row="1" column="0" colspan="6">
-+           <widget class="QLineEdit" name="imageFolder">
-+            <property name="placeholderText">
-+             <string>Wallpaper folder</string>
              </property>
             </widget>
            </item>
--          <item row="1" column="6">
--           <widget class="QPushButton" name="folderBrowse">
-+          <item row="3" column="0" colspan="6">
-+           <widget class="QCheckBox" name="randomize">
-             <property name="text">
--             <string>Browse</string>
--            </property>
--           </widget>
--          </item>
--          <item row="2" column="2">
--           <widget class="QSpinBox" name="hours">
--            <property name="suffix">
--             <string> hour(s)</string>
--            </property>
--            <property name="maximum">
--             <number>24</number>
-+             <string>Randomize the slide show</string>
-             </property>
-            </widget>
-           </item>
-@@ -522,6 +512,20 @@ are left clicked, even when it is not th
-             </property>
-            </widget>
-           </item>
-+          <item row="0" column="0" colspan="7">
-+           <widget class="QLabel" name="label_10">
-+            <property name="text">
-+             <string>Wallpaper image folder:</string>
-+            </property>
-+           </widget>
-+          </item>
-+          <item row="1" column="6">
-+           <widget class="QPushButton" name="folderBrowse">
-+            <property name="text">
-+             <string>Browse</string>
-+            </property>
-+           </widget>
-+          </item>
-           <item row="2" column="0">
-            <widget class="QLabel" name="label_11">
-             <property name="toolTip">
-@@ -545,46 +549,42 @@ are left clicked, even when it is not th
-             </property>
-            </widget>
-           </item>
--          <item row="2" column="5">
--           <spacer name="horizontalSpacer_2">
-+          <item row="2" column="1">
-+           <spacer name="horizontalSpacer_3">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
-+            <property name="sizeType">
-+             <enum>QSizePolicy::Minimum</enum>
-+            </property>
-             <property name="sizeHint" stdset="0">
-              <size>
--              <width>10</width>
-+              <width>5</width>
-               <height>5</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
--          <item row="1" column="0" colspan="6">
--           <widget class="QLineEdit" name="imageFolder">
--            <property name="placeholderText">
--             <string>Wallpaper folder</string>
--            </property>
--           </widget>
--          </item>
--          <item row="2" column="1">
--           <spacer name="horizontalSpacer_3">
-+          <item row="2" column="5">
-+           <spacer name="horizontalSpacer_2">
-             <property name="orientation">
-              <enum>Qt::Horizontal</enum>
-             </property>
--            <property name="sizeType">
--             <enum>QSizePolicy::Minimum</enum>
--            </property>
-             <property name="sizeHint" stdset="0">
-              <size>
--              <width>5</width>
-+              <width>10</width>
-               <height>5</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
--          <item row="3" column="0" colspan="6">
--           <widget class="QCheckBox" name="randomize">
--            <property name="text">
--             <string>Randomize the slide show</string>
-+          <item row="2" column="2">
-+           <widget class="QSpinBox" name="hours">
-+            <property name="suffix">
-+             <string> hour(s)</string>
-+            </property>
-+            <property name="maximum">
-+             <number>24</number>
-             </property>
-            </widget>
-           </item>
-@@ -663,6 +663,17 @@ are left clicked, even when it is not th
-               <normaloff>.</normaloff>.</iconset>
-             </property>
-            </widget>
-+          </item>
 +          <item>
 +           <widget class="QCheckBox" name="lubuntuManualBox">
 +            <property name="text">
@@ -150,20 +21,15 @@ Last-Update: 2022-06-16
 +              <normaloff>.</normaloff>.</iconset>
 +            </property>
 +           </widget>
-           </item>
++          </item>
           </layout>
          </widget>
+        </item>
+diff --git a/pcmanfm/desktoppreferencesdialog.cpp b/pcmanfm/desktoppreferencesdialog.cpp
+index 87fcfc2..a691d0c 100644
 --- a/pcmanfm/desktoppreferencesdialog.cpp
 +++ b/pcmanfm/desktoppreferencesdialog.cpp
-@@ -120,6 +120,7 @@ DesktopPreferencesDialog::DesktopPrefere
+@@ -204,6 +204,9 @@ void DesktopPreferencesDialog::applySettings()
-   ui.trashBox->setChecked(ds.contains(QLatin1String("Trash")));
-   ui.computerBox->setChecked(ds.contains(QLatin1String("Computer")));
-   ui.networkBox->setChecked(ds.contains(QLatin1String("Network")));
-+  ui.lubuntuManualBox->setChecked(ds.contains(QLatin1String("Lubuntu Manual")));
- 
-   connect(ui.buttonBox->button(QDialogButtonBox::Apply), &QPushButton::clicked,
-           this, &DesktopPreferencesDialog::onApplyClicked);
-@@ -208,6 +209,9 @@ void DesktopPreferencesDialog::applySett
    if(ui.networkBox->isChecked()) {
        ds << QLatin1String("Network");
    }
@@ -173,9 +39,11 @@ Last-Update: 2022-06-16
    settings.setDesktopShortcuts(ds);
  
    settings.setDesktopCellMargins(QSize(ui.hMargin->value(), ui.vMargin->value()));
+diff --git a/pcmanfm/desktopwindow.cpp b/pcmanfm/desktopwindow.cpp
+index 78e8d2f..3edb7f0 100644
 --- a/pcmanfm/desktopwindow.cpp
 +++ b/pcmanfm/desktopwindow.cpp
-@@ -277,6 +277,16 @@ void DesktopWindow::updateShortcutsFromS
+@@ -276,6 +276,16 @@ void DesktopWindow::updateShortcutsFromSettings(Settings& settings) {
              paths.push_back(Fm::FilePath::fromLocalPath(network.toStdString().c_str()));
          }
      }
@@ -192,7 +60,7 @@ Last-Update: 2022-06-16
  
      // WARNING: QFile::remove() is not compatible with libfm-qt and should not be used.
      if(!paths.empty()) {
-@@ -362,6 +372,20 @@ void DesktopWindow::createNetworkShortcu
+@@ -361,6 +371,20 @@ void DesktopWindow::createNetworkShortcut() {
      g_key_file_free(kf);
  }
  
@@ -213,17 +81,7 @@ Last-Update: 2022-06-16
  void DesktopWindow::createTrash() {
      if(trashMonitor_) {
          return;
-@@ -987,7 +1011,8 @@ void DesktopWindow::onFileClicked(int ty
+@@ -1260,7 +1284,8 @@ void DesktopWindow::trustOurDesktopShortcut(std::shared_ptr<const Fm::FileInfo>
-                 if((fileName == QLatin1String("trash-can.desktop") && ds.contains(QLatin1String("Trash")))
-                    || (fileName == QLatin1String("user-home.desktop") && ds.contains(QLatin1String("Home")))
-                    || (fileName == QLatin1String("computer.desktop") && ds.contains(QLatin1String("Computer")))
--                   || (fileName == QLatin1String("network.desktop") && ds.contains(QLatin1String("Network")))) {
-+                   || (fileName == QLatin1String("network.desktop") && ds.contains(QLatin1String("Network")))
-+                   || (fileName == QLatin1String("lubuntu-manual.desktop") && ds.contains(QLatin1String("Lubuntu Manual")))) {
-                     QMenu* menu = new QMenu(this);
-                     // "Open" action for all
-                     QAction* action = menu->addAction(tr("Open"));
-@@ -1297,7 +1322,8 @@ void DesktopWindow::trustOurDesktopShort
      const char* execStr = isHome ? homeExec.get() :
                            fileName == QLatin1String("trash-can.desktop") && ds.contains(QLatin1String("Trash")) ? "pcmanfm-qt trash:///" :
                            fileName == QLatin1String("computer.desktop") && ds.contains(QLatin1String("Computer")) ? "pcmanfm-qt computer:///" :
@@ -233,9 +91,11 @@ Last-Update: 2022-06-16
      if(execStr) {
          GKeyFile* kf = g_key_file_new();
          if(g_key_file_load_from_file(kf, file->path().toString().get(), G_KEY_FILE_NONE, nullptr)) {
+diff --git a/pcmanfm/desktopwindow.h b/pcmanfm/desktopwindow.h
+index 742d964..4a90cb4 100644
 --- a/pcmanfm/desktopwindow.h
 +++ b/pcmanfm/desktopwindow.h
-@@ -158,6 +158,7 @@ private:
+@@ -155,6 +155,7 @@ private:
      void createHomeShortcut();
      void createComputerShortcut();
      void createNetworkShortcut();

debian/rules

@@ -2,6 +2,7 @@
 # export DH_VERBOSE=1
 
 export LC_ALL=C.UTF-8
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %: