diff options
48 files changed, 479 insertions, 156 deletions
diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog index 2bd53b5..4b1a593 100644 --- a/freefilesync/debian/changelog +++ b/freefilesync/debian/changelog @@ -1,3 +1,28 @@ +freefilesync (11.0-1+devuan) obs; urgency=medium + + * Revised file layout on main grid + * Skip download/upload when copying Google Drive files inside account + * Support moving Google Drive files between shared drives and My Drive + * Support copying Google Drive shortcuts between accounts + * Support copying Google Docs, Sheets, Slides, etc. within account + * Fixed parsing uninitialized Google Drive modification time + * Fixed Google Drive file already existing check running too late + * Ignore slash/backslash differences during manual search + * Avoid creating orphan database entry if one DB file fails to load + * Limit modification time error count for log file warning message + * Support copying WSL symlinks + * Avoid duplicate MTP/Google Drive item creation from multiple threads + * Fixed TMPDIR not found during startup (macOS) + * Added sync variant icons + * Avoid redundant icon format conversions + * Buffer high-DPI image scaling results + * Improved MTP thumbnail scaling performance + * Avoid race condition during parallel file icon rendering (Linux) + * Allow creating folder name with leading/trailing spaces + * Start supporting GTK3 (Linux) + + -- Ben Stack <bgstack15@gmail.com> Wed, 22 Jul 2020 12:55:46 -0400 + freefilesync (10.25-2+devuan) obs; urgency=medium * gtk2 build (stable) diff --git a/freefilesync/debian/control b/freefilesync/debian/control index 92c55ca..17ed18d 100644 --- a/freefilesync/debian/control +++ b/freefilesync/debian/control @@ -5,20 +5,17 @@ Maintainer: B Stack <bgstack15@gmail.com> Build-Depends: debhelper (>=12~), imagemagick, g++-10, + libbrotli-dev, libcurl4-openssl-dev (>=7.68.0), libssh2-1-dev, libssl-dev, wx3.0-headers, unzip, -# gtk2 version, now possible only with local devuan-archive, and these must be removed for gtk3 build -# install with sudo apt-get install libwxbase3.0-0v5=3.0.4+dfsg-14 libwxbase3.0-dev=3.0.4+dfsg-14 libwxgtk3.0-0v5=3.0.4+dfsg-14 libwxgtk3.0-dev=3.0.4+dfsg-14 wx3.0-headers=3.0.4+dfsg-14 libgtk2.0-dev - libgtk2.0-dev, - libwxgtk3.0-dev (=3.0.4+dfsg-14), # gtk3 version, and these must be removed for gtk2 build # install with sudo apt-get install libwxbase3.0-dev=3.0.4+dfsg-15 libwxbase3.0-0v5=3.0.4+dfsg-15 wx3.0-headers=3.0.4+dfsg-15 libgtk-3-dev libwxgtk3.0-gtk3-dev # which will remove libwxbase3.0-dev=3.0.4+dfsg-14 -# libgtk-3-dev, -# libwxgtk3.0-gtk3-dev, + libgtk-3-dev, + libwxgtk3.0-gtk3-dev, Standards-Version: 4.1.4 Homepage: https://freefilesync.org/ diff --git a/freefilesync/debian/patches/ffs_devuan_gtk2.patch b/freefilesync/debian/patches/ffs_devuan_gtk2.patch deleted file mode 100644 index 49a7c24..0000000 --- a/freefilesync/debian/patches/ffs_devuan_gtk2.patch +++ /dev/null @@ -1,31 +0,0 @@ -Author: B Stack -Source: Original research -Date: 2019-11-21 -Message: Patches to use gtk2. Depends on ffs_devuan.patch -diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/Makefile 10.18-1/FreeFileSync/Source/Makefile ---- 10.11-0/FreeFileSync/Source/Makefile 2019-04-12 08:05:57.000000000 -0400 -+++ 10.18-2/FreeFileSync/Source/Makefile 2019-11-21 09:42:57.408243242 -0500 -@@ -16,9 +16,10 @@ - cxxFlags += `pkg-config --cflags libssh2` - linkFlags += `pkg-config --libs libssh2` - --cxxFlags += `pkg-config --cflags gtk+-2.0` -+cxxFlags += `pkg-config --cflags gtk+-2.0` -+linkFlags += `pkg-config --libs gtk+-2.0` - #treat as system headers so that warnings are hidden: --cxxFlags += -isystem/usr/include/gtk-2.0 -+cxxFlags += -isystem/usr/include/gtk-2.0 - - #support for SELinux (optional) - SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) -diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/RealTimeSync/Makefile 10.18-1/FreeFileSync/Source/RealTimeSync/Makefile ---- 10.20-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 11:45:58.241515736 -0500 -+++ 10.20-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-02-15 15:43:32.852203730 -0500 -@@ -8,6 +8,7 @@ - - #Gtk - support "no button border" - cxxFlags += `pkg-config --cflags gtk+-2.0` -+linkFlags += `pkg-config --libs gtk+-2.0` - #treat as system headers so that warnings are hidden: - cxxFlags += -isystem/usr/include/gtk-2.0 - diff --git a/freefilesync/debian/patches/ffs_devuan_gtk3.patch b/freefilesync/debian/patches/ffs_devuan_gtk3.patch index 3559261..16268d1 100644 --- a/freefilesync/debian/patches/ffs_devuan_gtk3.patch +++ b/freefilesync/debian/patches/ffs_devuan_gtk3.patch @@ -47,15 +47,3 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/wx+/dc.h 10.18-1 //GTK2 doesn't properly support high DPI: https://freefilesync.org/forum/viewtopic.php?t=6114 //=> requires general fix at wxWidgets-level assert(wxTheApp); //only call after wxWidgets was initalized! -diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.18-0/FreeFileSync/Source/base/icon_loader.cpp 10.18-1/FreeFileSync/Source/base/icon_loader.cpp ---- 10.18-0/FreeFileSync/Source/base/icon_loader.cpp 2019-11-21 08:24:23.955769262 -0500 -+++ 10.18-1/FreeFileSync/Source/base/icon_loader.cpp 2019-11-21 09:42:15.439813730 -0500 -@@ -18,7 +18,7 @@ - - namespace - { --static_assert(GTK_MAJOR_VERSION == 2, "FreeFileSync does NOT (currently) support GTK3! The GTK calls below will lead to crashes due to not being thread-safe on GTK3."); -+static_assert(GTK_MAJOR_VERSION == 3, "FreeFileSync does NOT (currently) support GTK3! The GTK calls below will lead to crashes due to not being thread-safe on GTK3."); - //gdk_threads_enter(); + ZEN_ON_SCOPE_EXIT(::gdk_threads_leave); is NOT enough; e.g. GTK3 + openSuse still crashes with: - // Gtk:ERROR:gtkicontheme.c:4026:proxy_pixbuf_destroy: assertion failed: (icon_info->proxy_pixbuf != NULL) - //GTK icon theme internals: https://github.com/GNOME/gtk/blob/master/gtk/gtkicontheme.c diff --git a/freefilesync/debian/patches/ffs_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch index 1ef4148..62f4e7e 100644 --- a/freefilesync/debian/patches/ffs_no_check_updates.patch +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -1,7 +1,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-1/FreeFileSync/Source/ui/main_dlg.cpp --- 10.9-0/FreeFileSync/Source/ui/main_dlg.cpp 2019-02-10 22:01:42.029158919 -0500 -+++ 10.14-1/FreeFileSync/Source/ui/main_dlg.cpp 2019-07-16 10:56:40.213575535 -0400 -@@ -5298,7 +5298,7 @@ ++++ 11.0-1/FreeFileSync/Source/ui/main_dlg.cpp 2020-07-22 11:49:13.747407290 -0400 +@@ -5538,7 +5538,7 @@ globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value! m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck)); @@ -10,15 +10,15 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14- if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) { flashStatusInformation(_("Searching for program updates...")); -@@ -5306,6 +5306,7 @@ +@@ -5546,6 +5546,7 @@ automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion, - automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get()); + automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get()); } + */ } -@@ -5313,7 +5314,7 @@ +@@ -5553,7 +5554,7 @@ { //execute just once per startup! Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this); @@ -27,7 +27,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14- if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) { flashStatusInformation(_("Searching for program updates...")); -@@ -5327,6 +5328,7 @@ +@@ -5567,6 +5568,7 @@ resultAsync.get()); //run on main thread: }); } @@ -37,7 +37,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14- diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 10.14-1/FreeFileSync/Source/ui/version_check.cpp --- 10.9-0/FreeFileSync/Source/ui/version_check.cpp 2019-02-10 22:01:42.126160041 -0500 -+++ 10.18-1/FreeFileSync/Source/ui/version_check.cpp 2019-11-20 09:19:50.936975067 -0500 ++++ 11.0-1/FreeFileSync/Source/ui/version_check.cpp 2020-07-22 11:43:36.895201090 -0400 @@ -69,6 +69,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) @@ -47,7 +47,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1 if (lastUpdateCheck == getVersionCheckInactiveId()) return false; -@@ -156,8 +158,7 @@ +@@ -159,8 +161,7 @@ { try { @@ -57,7 +57,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1 updateDetailsMsg = utfTo<std::wstring>(buf); } catch (const zen::SysError& e) { throw FileError(_("Failed to retrieve update information."), e.toString()); } -@@ -182,8 +183,7 @@ +@@ -189,8 +190,7 @@ std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError { @@ -67,21 +67,22 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1 return trimCpy(response); } -@@ -235,13 +235,13 @@ - const std::string onlineVersion = getOnlineVersion(geHttpPostParameters()); //throw SysError +@@ -237,13 +237,13 @@ + const std::string onlineVersion = getOnlineVersion(geHttpPostParameters(parent)); //throw SysError lastOnlineVersion = onlineVersion; - if (haveNewerVersionOnline(onlineVersion)) -- showUpdateAvailableDialog(parent, onlineVersion); +- showUpdateAvailableDialog(&parent, onlineVersion); - else + //if (haveNewerVersionOnline(onlineVersion)) -+ // showUpdateAvailableDialog(parent, onlineVersion); ++ // showUpdateAvailableDialog(&parent, onlineVersion); + //else - showNotificationDialog(parent, DialogInfoType::info, PopupDialogCfg(). - setIcon(getResourceImage("update_check")). + showNotificationDialog(&parent, DialogInfoType::info, PopupDialogCfg(). + setIcon(loadImage("update_check")). setTitle(_("Check for Program Updates")). - setMainInstructions(_("FreeFileSync is up to date."))); + setMainInstructions(_("Use your package manager for any updates to FreeFileSync."))); } catch (const zen::SysError& e) { + diff --git a/freefilesync/debian/patches/ffs_no_wx311.patch b/freefilesync/debian/patches/ffs_no_wx311.patch index 926f7b8..22d8260 100644 --- a/freefilesync/debian/patches/ffs_no_wx311.patch +++ b/freefilesync/debian/patches/ffs_no_wx311.patch @@ -1,7 +1,7 @@ 2019-08-15 just compile. diff -Naur 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp --- 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 2020-06-19 16:17:15.000000000 -0400 -+++ 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-06-20 14:23:47.488836409 -0400 ++++ 11.0-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-07-22 11:39:25.820068366 -0400 @@ -293,7 +293,8 @@ { showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); @@ -12,10 +12,10 @@ diff -Naur 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.25-1/FreeFileSync/So //set default values for Google Drive: use first item of m_listBoxGdriveUsers if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase)) -@@ -1663,7 +1664,7 @@ +@@ -1682,7 +1683,7 @@ //setMainInstructionFont(*m_staticTextMain); - m_bitmapActivation->SetBitmap(getResourceImage("internet")); + m_bitmapActivation->SetBitmap(loadImage("internet")); - m_textCtrlOfflineActivationKey->ForceUpper(); + //m_textCtrlOfflineActivationKey->ForceUpper(); diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series index ba71e47..7ce7a97 100644 --- a/freefilesync/debian/patches/series +++ b/freefilesync/debian/patches/series @@ -1,7 +1,6 @@ ffs_allow_parallel_ops.patch ffs_devuan.patch -# gtk3 for obs, gtk2 for albion -ffs_devuan_gtk2.patch +ffs_devuan_gtk3.patch ffs_no_check_updates.patch ffs_no_wx311.patch ffs_sftp.patch diff --git a/freefilesync/debian/rules b/freefilesync/debian/rules index 405ffd3..a359bd9 100755 --- a/freefilesync/debian/rules +++ b/freefilesync/debian/rules @@ -15,6 +15,8 @@ export buildroot="${debuilddir}/${appname}" export _datadir="/usr/share" export _bindir="/usr/bin" +export TMPDIR=/tmp + %: dh $@ diff --git a/freefilesync/ffs_el.patch b/freefilesync/ffs_el.patch index 4611e5e..c8b0fcc 100644 --- a/freefilesync/ffs_el.patch +++ b/freefilesync/ffs_el.patch @@ -1,3 +1,4 @@ +# 2020-07-22 starting at FreeFileSync 10.25 in 2020-06, we need g++-10 to compile but all EL targets (6, 7, and 8) do not have gcc 10 so this patch is not usable as is. But it should get the gtk3 fix if any CentOS targets get gcc-10. The cstddef discovery is from https://stackoverflow.com/questions/52567517/freefilesync-c-error-byte-is-not-a-member-of-std Some changes just make the application work better in an installed setting (e.g., the hard-coded resouce path). Tricking the wxWidgets ABI version comes from https://stackoverflow.com/questions/45123664/wxwidgets-runtime-error-mismatch-version/47822976#47822976 diff --git a/freefilesync/ffs_fedora.patch b/freefilesync/ffs_fedora.patch index 82787ea..f804660 100644 --- a/freefilesync/ffs_fedora.patch +++ b/freefilesync/ffs_fedora.patch @@ -1,3 +1,4 @@ +ffs_fedora 2020-07-22 now uses gtk3 diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source/ffs_paths.cpp --- 10.13-0/FreeFileSync/Source/ffs_paths.cpp 2019-06-14 20:23:07.615661499 -0400 +++ 10.13-1/FreeFileSync/Source/ffs_paths.cpp 2019-06-14 20:36:28.178274292 -0400 @@ -11,9 +12,9 @@ diff -Naur 10.13-0/FreeFileSync/Source/ffs_paths.cpp 10.13-1/FreeFileSync/Source } -diff -Naur 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Makefile ---- 10.11-0/FreeFileSync/Source/Makefile 2019-04-12 07:59:45.042147902 -0400 -+++ 10.11-1/FreeFileSync/Source/Makefile 2019-04-12 08:27:42.062542410 -0400 +diff -x '*.orig' -x '*.git' -x '*.rej' -x '*.swp' -Naur 11.0-0/FreeFileSync/Source/Makefile 11.0-1/FreeFileSync/Source/Makefile +--- 11.0-0/FreeFileSync/Source/Makefile 2020-07-22 11:36:55.000000000 -0400 ++++ 11.0-1/FreeFileSync/Source/Makefile 2020-07-22 13:36:27.193345688 -0400 @@ -1,10 +1,10 @@ -exeName = FreeFileSync_$(shell arch) +exeName = FreeFileSync @@ -27,18 +28,23 @@ diff -Naur 10.11-0/FreeFileSync/Source/Makefile 10.11-1/FreeFileSync/Source/Make cxxFlags += `pkg-config --cflags openssl` -@@ -17,6 +17,7 @@ cxxFlags += `pkg-config --cflags libssh2` +@@ -16,9 +16,10 @@ + cxxFlags += `pkg-config --cflags libssh2` linkFlags += `pkg-config --libs libssh2` - - cxxFlags += `pkg-config --cflags gtk+-2.0` -+linkFlags += `pkg-config --libs gtk+-2.0` + +-cxxFlags += `pkg-config --cflags gtk+-2.0` ++cxxFlags += `pkg-config --cflags gtk+-3.0` ++linkFlags += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: - cxxFlags += -isystem/usr/include/gtk-2.0 - -diff -Naur 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSync/Source/RealTimeSync/Makefile ---- 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 2019-04-12 07:59:45.008146336 -0400 -+++ 10.15-1/FreeFileSync/Source/RealTimeSync/Makefile 2019-08-15 13:59:53.934551753 -0400 -@@ -1,13 +1,14 @@ +-cxxFlags += -isystem/usr/include/gtk-2.0 ++cxxFlags += -isystem/usr/include/gtk-3.0 + + #support for SELinux (optional) + SELINUX_EXISTING=$(shell pkg-config --exists libselinux && echo YES) +diff -x '*.orig' -x '*.git' -x '*.rej' -x '*.swp' -Naur 11.0-0/FreeFileSync/Source/RealTimeSync/Makefile 11.0-1/FreeFileSync/Source/RealTimeSync/Makefile +--- 11.0-0/FreeFileSync/Source/RealTimeSync/Makefile 2020-07-22 11:36:55.000000000 -0400 ++++ 11.0-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-07-22 13:36:32.262394424 -0400 +@@ -1,15 +1,16 @@ -exeName = RealTimeSync_$(shell arch) +exeName = RealTimeSync @@ -50,12 +56,16 @@ diff -Naur 10.11-0/FreeFileSync/Source/RealTimeSync/Makefile 10.11-1/FreeFileSyn +linkFlags = -s -no-pie `wx-config --libs std, aui --debug=no` -lz -pthread #Gtk - support "no button border" - cxxFlags += `pkg-config --cflags gtk+-2.0` -+linkFlags += `pkg-config --libs gtk+-2.0` +-cxxFlags += `pkg-config --cflags gtk+-2.0` ++cxxFlags += `pkg-config --cflags gtk+-3.0` ++linkFlags += `pkg-config --libs gtk+-3.0` #treat as system headers so that warnings are hidden: - cxxFlags += -isystem/usr/include/gtk-2.0 +-cxxFlags += -isystem/usr/include/gtk-2.0 ++cxxFlags += -isystem/usr/include/gtk-3.0 -diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp + cppFiles= + cppFiles+=application.cpp +iff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp --- 10.22-0/FreeFileSync/Source/ui/small_dlgs.cpp 2020-03-18 15:49:57.837901137 -0400 +++ 10.22-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-03-18 15:51:50.381251257 -0400 @@ -97,6 +97,8 @@ @@ -67,3 +77,15 @@ diff -x '*.swp' -x '.git*' -x '*.orig' -x '*.rej' -Naur 10.19-0/FreeFileSync/Sou build += SPACED_BULLET; build += utfTo<wxString>(formatTime(formatDateTag, getCompileTime())); +diff -x '*.orig' -x '*.git' -x '*.rej' -x '*.swp' -Naur 11.0-0/wx+/dc.h 11.0-1/wx+/dc.h +--- 11.0-0/wx+/dc.h 2020-07-22 11:36:55.000000000 -0400 ++++ 11.0-1/wx+/dc.h 2020-07-22 13:37:49.535137357 -0400 +@@ -55,7 +55,7 @@ + #ifdef wxHAVE_DPI_INDEPENDENT_PIXELS //pulled from wx/window.h: https://github.com/wxWidgets/wxWidgets/blob/master/include/wx/window.h#L2029 + return d; //e.g. macOS, GTK3 + #else //https://github.com/wxWidgets/wxWidgets/blob/master/src/common/wincmn.cpp#L2865 +- static_assert(GTK_MAJOR_VERSION == 2); ++ static_assert(GTK_MAJOR_VERSION == 3); + //GTK2 doesn't properly support high DPI: https://freefilesync.org/forum/viewtopic.php?t=6114 + //=> requires general fix at wxWidgets-level + assert(wxTheApp); //only call after wxWidgets was initalized! diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch index 1ef4148..62f4e7e 100644 --- a/freefilesync/ffs_no_check_updates.patch +++ b/freefilesync/ffs_no_check_updates.patch @@ -1,7 +1,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14-1/FreeFileSync/Source/ui/main_dlg.cpp --- 10.9-0/FreeFileSync/Source/ui/main_dlg.cpp 2019-02-10 22:01:42.029158919 -0500 -+++ 10.14-1/FreeFileSync/Source/ui/main_dlg.cpp 2019-07-16 10:56:40.213575535 -0400 -@@ -5298,7 +5298,7 @@ ++++ 11.0-1/FreeFileSync/Source/ui/main_dlg.cpp 2020-07-22 11:49:13.747407290 -0400 +@@ -5538,7 +5538,7 @@ globalCfg_.gui.lastUpdateCheck = 0; //reset to GlobalSettings.xml default value! m_menuItemCheckVersionAuto->Check(updateCheckActive(globalCfg_.gui.lastUpdateCheck)); @@ -10,15 +10,15 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14- if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) { flashStatusInformation(_("Searching for program updates...")); -@@ -5306,6 +5306,7 @@ +@@ -5546,6 +5546,7 @@ automaticUpdateCheckEval(this, globalCfg_.gui.lastUpdateCheck, globalCfg_.gui.lastOnlineVersion, - automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare().get()).get()); + automaticUpdateCheckRunAsync(automaticUpdateCheckPrepare(*this).get()).get()); } + */ } -@@ -5313,7 +5314,7 @@ +@@ -5553,7 +5554,7 @@ { //execute just once per startup! Disconnect(wxEVT_IDLE, wxIdleEventHandler(MainDialog::OnRegularUpdateCheck), nullptr, this); @@ -27,7 +27,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14- if (shouldRunAutomaticUpdateCheck(globalCfg_.gui.lastUpdateCheck)) { flashStatusInformation(_("Searching for program updates...")); -@@ -5327,6 +5328,7 @@ +@@ -5567,6 +5568,7 @@ resultAsync.get()); //run on main thread: }); } @@ -37,7 +37,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/main_dlg.cpp 10.14- diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 10.14-1/FreeFileSync/Source/ui/version_check.cpp --- 10.9-0/FreeFileSync/Source/ui/version_check.cpp 2019-02-10 22:01:42.126160041 -0500 -+++ 10.18-1/FreeFileSync/Source/ui/version_check.cpp 2019-11-20 09:19:50.936975067 -0500 ++++ 11.0-1/FreeFileSync/Source/ui/version_check.cpp 2020-07-22 11:43:36.895201090 -0400 @@ -69,6 +69,8 @@ bool fff::shouldRunAutomaticUpdateCheck(time_t lastUpdateCheck) @@ -47,7 +47,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1 if (lastUpdateCheck == getVersionCheckInactiveId()) return false; -@@ -156,8 +158,7 @@ +@@ -159,8 +161,7 @@ { try { @@ -57,7 +57,7 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1 updateDetailsMsg = utfTo<std::wstring>(buf); } catch (const zen::SysError& e) { throw FileError(_("Failed to retrieve update information."), e.toString()); } -@@ -182,8 +183,7 @@ +@@ -189,8 +190,7 @@ std::string getOnlineVersion(const std::vector<std::pair<std::string, std::string>>& postParams) //throw SysError { @@ -67,21 +67,22 @@ diff --exclude '*.orig' -Naur 10.14-0/FreeFileSync/Source/ui/version_check.cpp 1 return trimCpy(response); } -@@ -235,13 +235,13 @@ - const std::string onlineVersion = getOnlineVersion(geHttpPostParameters()); //throw SysError +@@ -237,13 +237,13 @@ + const std::string onlineVersion = getOnlineVersion(geHttpPostParameters(parent)); //throw SysError lastOnlineVersion = onlineVersion; - if (haveNewerVersionOnline(onlineVersion)) -- showUpdateAvailableDialog(parent, onlineVersion); +- showUpdateAvailableDialog(&parent, onlineVersion); - else + //if (haveNewerVersionOnline(onlineVersion)) -+ // showUpdateAvailableDialog(parent, onlineVersion); ++ // showUpdateAvailableDialog(&parent, onlineVersion); + //else - showNotificationDialog(parent, DialogInfoType::info, PopupDialogCfg(). - setIcon(getResourceImage("update_check")). + showNotificationDialog(&parent, DialogInfoType::info, PopupDialogCfg(). + setIcon(loadImage("update_check")). setTitle(_("Check for Program Updates")). - setMainInstructions(_("FreeFileSync is up to date."))); + setMainInstructions(_("Use your package manager for any updates to FreeFileSync."))); } catch (const zen::SysError& e) { + diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch index 926f7b8..22d8260 100644 --- a/freefilesync/ffs_no_wx311.patch +++ b/freefilesync/ffs_no_wx311.patch @@ -1,7 +1,7 @@ 2019-08-15 just compile. diff -Naur 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp --- 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 2020-06-19 16:17:15.000000000 -0400 -+++ 10.25-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-06-20 14:23:47.488836409 -0400 ++++ 11.0-1/FreeFileSync/Source/ui/small_dlgs.cpp 2020-07-22 11:39:25.820068366 -0400 @@ -293,7 +293,8 @@ { showNotificationDialog(this, DialogInfoType::error, PopupDialogCfg().setDetailInstructions(e.toString())); @@ -12,10 +12,10 @@ diff -Naur 10.25-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.25-1/FreeFileSync/So //set default values for Google Drive: use first item of m_listBoxGdriveUsers if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase)) -@@ -1663,7 +1664,7 @@ +@@ -1682,7 +1683,7 @@ //setMainInstructionFont(*m_staticTextMain); - m_bitmapActivation->SetBitmap(getResourceImage("internet")); + m_bitmapActivation->SetBitmap(loadImage("internet")); - m_textCtrlOfflineActivationKey->ForceUpper(); + //m_textCtrlOfflineActivationKey->ForceUpper(); diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index afc6c5f..030b863 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -19,7 +19,7 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 10.25 +Version: 11.0 Release: 1%{?dist} Summary: A file synchronization utility @@ -45,8 +45,8 @@ Patch9: ffs_no_eraseif.patch Patch10: revert_zenju_aggressive_upstreamisms.patch Packager: B Stack <bgstack15@gmail.com> -# WARNING: the build will FAIL if you have wxGTK3-devel installed. Only wxGTK2-devel should be on the build system. -BuildRequires: compat-wxGTK3-gtk2-devel +BuildRequires: brotli-devel +BuildRequires: wxGTK3-devel BuildRequires: desktop-file-utils BuildRequires: gcc-c++ BuildRequires: ImageMagick @@ -57,7 +57,6 @@ BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libselinux) BuildRequires: pkgconfig(zlib) %if 0%{?el6}%{?el7} -BuildRequires: wxGTK-devel BuildRequires: %{scl_buildreq} BuildRequires: openssl-%{name}-devel %{min_openssl} Requires: libcurl %{min_libcurl} @@ -112,6 +111,7 @@ find . ! -type d \( -name '*.c' -o -name '*.cpp' -o -name '*.h' \) \ -i %{pkgname}/Source/Makefile %{pkgname}/Source/%{prog2name}/Makefile %build +export TMPDIR=/tmp # necessary since 11.0 %if !%{dummy_package} %if "%{?scl_env}" != "" scl enable %{scl_env} /bin/bash << 'EOFSCL' @@ -124,6 +124,7 @@ EOFSCL %endif %install +export TMPDIR=/tmp # necessary since 11.0 %if !%{dummy_package} # removed by upstream! #%%make_install -C %%{pkgname}/Source @@ -205,6 +206,15 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Wed Jul 22 2020 B Stack <bgstack15@gmail.com> - 11.0-1 +- version bump +- use gtk3 +- el6,7,8 and fc31 packages are becoming stale + +* Sun Jun 21 2020 B Stack <bgstack15@gmail.com> - 10.25-1 +- version bump +- el6,7,8 and fc31 packages not built because upstream requires g++-10 + * Mon May 18 2020 B Stack <bgstack15@gmail.com> - 10.24-1 - version bump - add revert_zenju_aggressive_upstreamisms.patch diff --git a/irfanview/debian/bin/irfanview-common b/irfanview/debian/bin/irfanview-common index 9c32c98..9dcb4b0 100755 --- a/irfanview/debian/bin/irfanview-common +++ b/irfanview/debian/bin/irfanview-common @@ -12,6 +12,7 @@ # 2019-06-16 replace winepath call with wine $WINEPATH_BIN # 2019-06-16 split into package-arch-specific and common scripts # 2020-05-20 handle multiple filenames correctly now, including removing \r from winepath output +# 2020-07-14 use echo binary instead of shell builtin # Usage: # called from irfanview (which is symlink to irfanview32 or ifanview64) # Do not use this by itself. @@ -25,7 +26,8 @@ then false else -IV_VERSION="2020-05-20a" +IV_VERSION="2020-07-14a" +echobin="$( which echo )" # Define functions expandword() { @@ -33,7 +35,7 @@ expandword() { # if file, add it # if directory, expand it # if tarball, extract it and operate on the directory like normal - local _word="$( echo "${@}" | sed -e 'sF\/\/F\/Fg;' )" + local _word="$( ${echobin} "${@}" | sed -e 'sF\/\/F\/Fg;' )" if test -d "${_word}"; then # loop through all files in the directory @@ -48,22 +50,22 @@ expandword() { *.tgz|*.tar.gz) # extract it and expand the temporary directory _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}" - echo "tmpdir ${_tmpdir}" + ${echobin} "tmpdir ${_tmpdir}" tar -zx -C "${_tmpdir}" -f "${_word}" expandword "${_tmpdir}" ;; *.zip) _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}" - echo "tmpdir ${_tmpdir}" - echo "7za e -w${_tmpdir} ${_word}" + ${echobin} "tmpdir ${_tmpdir}" + ${echobin} "7za e -w${_tmpdir} ${_word}" ( cd "${_tmpdir}" ; 7za e "${_word}" ; ) expandword "${_tmpdir}" ;; *) # assume it is readable and add it to list of files to open - echo "File:1 ${_word}" + ${echobin} "File:1 ${_word}" thisfile="$( getwinepath "${_word}" )" - echo "File:2 ${thisfile}" + ${echobin} "File:2 ${thisfile}" irfanfiles="${irfanfiles} '${thisfile}'" ;; esac @@ -86,11 +88,11 @@ for word in "${@}"; do expandword "${word}" done -irfanfiles="$( echo "${irfanfiles## }" | sed -r -e 's/\r//g;' )" +irfanfiles="$( ${echobin} "${irfanfiles## }" | sed -r -e 's/\r//g;' )" # run wine cd $WINEPREFIX -echo wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} +${echobin} wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} eval wine \"${IV_EXEC_PATH}\" "${irfanargs}" "${irfanfiles}" & wait %1 diff --git a/irfanview/debian/changelog b/irfanview/debian/changelog index 8295178..29fede5 100644 --- a/irfanview/debian/changelog +++ b/irfanview/debian/changelog @@ -1,3 +1,9 @@ +irfanview (4.54-3+devuan) obs; urgency=low + + - Improve filename handling again + + -- B Stack <bgstack15@gmail.com> Tue, 14 Jul 2020 11:13:27 -0400 + irfanview (4.54-2+devuan) obs; urgency=low - Improve filename handling diff --git a/irfanview/debian/compat b/irfanview/debian/compat index b4de394..48082f7 100644 --- a/irfanview/debian/compat +++ b/irfanview/debian/compat @@ -1 +1 @@ -11 +12 diff --git a/irfanview/irfanview-common b/irfanview/irfanview-common index 9c32c98..9dcb4b0 100755 --- a/irfanview/irfanview-common +++ b/irfanview/irfanview-common @@ -12,6 +12,7 @@ # 2019-06-16 replace winepath call with wine $WINEPATH_BIN # 2019-06-16 split into package-arch-specific and common scripts # 2020-05-20 handle multiple filenames correctly now, including removing \r from winepath output +# 2020-07-14 use echo binary instead of shell builtin # Usage: # called from irfanview (which is symlink to irfanview32 or ifanview64) # Do not use this by itself. @@ -25,7 +26,8 @@ then false else -IV_VERSION="2020-05-20a" +IV_VERSION="2020-07-14a" +echobin="$( which echo )" # Define functions expandword() { @@ -33,7 +35,7 @@ expandword() { # if file, add it # if directory, expand it # if tarball, extract it and operate on the directory like normal - local _word="$( echo "${@}" | sed -e 'sF\/\/F\/Fg;' )" + local _word="$( ${echobin} "${@}" | sed -e 'sF\/\/F\/Fg;' )" if test -d "${_word}"; then # loop through all files in the directory @@ -48,22 +50,22 @@ expandword() { *.tgz|*.tar.gz) # extract it and expand the temporary directory _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}" - echo "tmpdir ${_tmpdir}" + ${echobin} "tmpdir ${_tmpdir}" tar -zx -C "${_tmpdir}" -f "${_word}" expandword "${_tmpdir}" ;; *.zip) _tmpdir="$( mktemp -d )"; alltempdirs="${alltempdirs} ${_tmpdir}" - echo "tmpdir ${_tmpdir}" - echo "7za e -w${_tmpdir} ${_word}" + ${echobin} "tmpdir ${_tmpdir}" + ${echobin} "7za e -w${_tmpdir} ${_word}" ( cd "${_tmpdir}" ; 7za e "${_word}" ; ) expandword "${_tmpdir}" ;; *) # assume it is readable and add it to list of files to open - echo "File:1 ${_word}" + ${echobin} "File:1 ${_word}" thisfile="$( getwinepath "${_word}" )" - echo "File:2 ${thisfile}" + ${echobin} "File:2 ${thisfile}" irfanfiles="${irfanfiles} '${thisfile}'" ;; esac @@ -86,11 +88,11 @@ for word in "${@}"; do expandword "${word}" done -irfanfiles="$( echo "${irfanfiles## }" | sed -r -e 's/\r//g;' )" +irfanfiles="$( ${echobin} "${irfanfiles## }" | sed -r -e 's/\r//g;' )" # run wine cd $WINEPREFIX -echo wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} +${echobin} wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} eval wine \"${IV_EXEC_PATH}\" "${irfanargs}" "${irfanfiles}" & wait %1 diff --git a/irfanview/irfanview.spec b/irfanview/irfanview.spec index b5dc65d..85c2cdf 100644 --- a/irfanview/irfanview.spec +++ b/irfanview/irfanview.spec @@ -6,7 +6,7 @@ Name: irfanview Version: 4.54 -Release: 2 +Release: 3 Summary: irfanview is a graphics viewer %define version_num %( echo %version | tr -d '\.' ) @@ -204,7 +204,10 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %{_datadir}/%{name}64 %changelog -* Thur Jun 18 2020 B Stack <bgstack15@gmail.com> - 4.54-2 +* Tue Jul 14 2020 B Stack <bgstack15@gmail.com> - 4.54-3 +- Improve filename handling again + +* Thu Jun 18 2020 B Stack <bgstack15@gmail.com> - 4.54-2 - Improve filename handling * Wed Dec 18 2019 B Stack <bgstack15@gmail.com> - 4.54-1 diff --git a/libreoffice-tango-iconset/README.md b/libreoffice-tango-iconset/README.md new file mode 100644 index 0000000..0c655f5 --- /dev/null +++ b/libreoffice-tango-iconset/README.md @@ -0,0 +1,32 @@ +# Readme for libreoffice-tango-iconset + +## libreoffice-tango-iconset upstream +https://extensions.libreoffice.org/en/extensions/show/tango-icon-theme-for-libreoffice + +## Alternatives +Use LibreOffice < 7.0.0. + +## Reason for being in stackrpms +LibreOffice 7.0.0 removed the Tango icon set from its defaults. The icon set is still available as an extension, so this package does a system-wide deployment of the extension so users can choose "Tango" icon set in the settings dialog. + +## Reverse dependency matrix +Distro | LibreOffice version | libreoffice-tango-iconset version +---------- | ------------------- | --------------------------------- +All dpkg | >7.0.0 | 1.0 + +## References +Starting with LibreOffice 7.0.0 [1], the tango icon set is now absent from +LibreOffice. The icons themselves are still available as an extension +[2] that a user or admin can install [3]. A user then needs to change the +view settings for icon theme to "tango." + +This package was adapted from debian sources including [4] and [5]. + +1. https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/-/blob/master/changelog +2. https://extensions.libreoffice.org/en/extensions/show/tango-icon-theme-for-libreoffice +3. https://wiki.documentfoundation.org/Documentation/HowTo/install_extension +4. https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/-/blob/libreoffice_6.4.5-1/control +5. https://snapshot.debian.org/archive/debian/20200627T204538Z/pool/main/libr/libreoffice/libreoffice-style-tango_6.4.5%7Erc1-2%7Ebpo10%2B1_all.deb + +## Differences from upstream +Upstream is just the .oxt file which is a zip file of the extension's contents. So the entire packaging instructions were adapted from Debian's old package `libreoffice-style-tango`. diff --git a/libreoffice-tango-iconset/build-orig-tarball.sh b/libreoffice-tango-iconset/build-orig-tarball.sh new file mode 100755 index 0000000..c2f0054 --- /dev/null +++ b/libreoffice-tango-iconset/build-orig-tarball.sh @@ -0,0 +1,70 @@ +#!/bin/sh +# Package: libreoffice-tango-iconset +# Startdate: 2020-08-01 23:36 +# References: notepadpp/build-orig-tarball.sh +# Dependencies: +# sudo apt-get install wget curl + +currdir="${PWD}" +tmpfile1="$( mktemp )" +frontpageurl="https://extensions.libreoffice.org/en/extensions/show/tango-icon-theme-for-libreoffice" +domain="$( echo "${frontpageurl}" | awk -F'/' 'BEGIN{OFS="/"} {print $1,$2,$3}' )" +package_name="libreoffice-tango-iconset" + +# FUNCTIONS +ferror() { + printf "%s\n" "$@" 1>&2 +} + +get() { + # get "https://example.com/example.zip" + # get "https://example.com/example.zip" "outputname.zip" + ___get_url="${1}" + ___get_outfile="${2}" + ___wget_options="" + test -n "${___get_outfile}" && ___wget_options="-o ${___get_outfile}" + + test -n "${DEBUG}" && ferror "wget --quiet --content-disposition \"${___get_url}\" ${___wget_options}" + test -z "${DRYRUN}" && wget --quiet --content-disposition "${___get_url}" ${___wget_options} +} + +to_filename() { + # call: to_filename "https://example.com/filename.ext" + # returns: "filename.ext" + printf "${1##*/}" +} + +### Flow + +# check dependencies +#which jq 1>/dev/null 2>&1 || { echo "Please install jq! Aborted." ; exit 1; } + +## 1. learn latest version file +url_contents="$( curl -s "${frontpageurl}" )" +latest_file="$( echo "${url_contents}" | awk -F'[=>]' '/class="btn".*>Download</{print $4}' | sed -r -e 's/^"//g;' -e 's/"$//g;' | head -n1 )" +latest_version="$( echo "${url_contents}" | grep -A1 'class="releaseRow"' | grep -E '<span>[0-9\.]+</span>' | sed -r -e 's/\s*<\/?span>\s*//g;' )" +### add domain as needed to filename +if ! echo "${latest_file}" | grep -q "^(ht|f)tps?:\/\/" ; +then + latest_file="${domain}/${latest_file}" +fi + +## 2. dl it +# WORKHERE +get "${latest_file}" + +## 5. assemble orig tarball +test -n "${DEBUG}" && ferror "mkdir -p \"${package_name}-${latest_version}\"" +test -z "${DRYRUN}" && { mkdir -p "${package_name}-${latest_version}" ; cd "${package_name}-${latest_version}" ; } + +test -n "${DEBUG}" && ferror "mv ../\"$( basename "${latest_file}" )\" ." +test -z "${DRYRUN}" && mv ../"$( basename "${latest_file}" )" . + +test -n "${DEBUG}" && ferror "cd .." +test -z "${DRYRUN}" && cd .. + +test -n "${DEBUG}" && ferror "tar -zcf \"${package_name}_${latest_version}.orig.tar.gz\" \"${package_name}-${latest_version}\"" +test -z "${DRYRUN}" && tar -zcf "${package_name}_${latest_version}.orig.tar.gz" "${package_name}-${latest_version}" + +# CLEAN UP +rm -rf "${package_name}-${latest_version}/" diff --git a/libreoffice-tango-iconset/debian/README.Debian b/libreoffice-tango-iconset/debian/README.Debian new file mode 100644 index 0000000..d72dbf8 --- /dev/null +++ b/libreoffice-tango-iconset/debian/README.Debian @@ -0,0 +1,16 @@ +libreoffice-tango-iconset for Devuan + +Starting with LibreOffice 7.0.0 [1], the tango icon set is now absent from +LibreOffice. The icons themselves are still available as an extension +[2] that a user or admin can install [3]. A user then needs to change the +view settings for icon theme to "tango." + +This package was adapted from debian sources including [4] and [5]. + +[1] https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/-/blob/master/changelog +[2] https://extensions.libreoffice.org/en/extensions/show/tango-icon-theme-for-libreoffice +[3] https://wiki.documentfoundation.org/Documentation/HowTo/install_extension +[4] https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/-/blob/libreoffice_6.4.5-1/control +[5] https://snapshot.debian.org/archive/debian/20200627T204538Z/pool/main/libr/libreoffice/libreoffice-style-tango_6.4.5%7Erc1-2%7Ebpo10%2B1_all.deb + + -- Ben Stack <bgstack15@gmail.com> Sun, 02 Aug 2020 08:13:21 -0400 diff --git a/libreoffice-tango-iconset/debian/changelog b/libreoffice-tango-iconset/debian/changelog new file mode 100644 index 0000000..6ce554e --- /dev/null +++ b/libreoffice-tango-iconset/debian/changelog @@ -0,0 +1,5 @@ +libreoffice-tango-iconset (1.0-1+devuan) obs; urgency=low + + * Initial release. Closes: packages-want#22 + + -- Ben Stack <bgstack15@gmail.com> Sun, 02 Aug 2020 08:13:21 -0400 diff --git a/libreoffice-tango-iconset/debian/control b/libreoffice-tango-iconset/debian/control new file mode 100644 index 0000000..c70daba --- /dev/null +++ b/libreoffice-tango-iconset/debian/control @@ -0,0 +1,21 @@ +Source: libreoffice-tango-iconset +Section: x11 +Priority: optional +Maintainer: Ben Stack <bgstack15@gmail.com> +Build-Depends: debhelper-compat (= 12), + p7zip-full +Standards-Version: 4.5.0 +Homepage: https://extensions.libreoffice.org/en/extensions/show/tango-icon-theme-for-libreoffice + +Package: libreoffice-tango-iconset +Architecture: all +Pre-Depends: ${misc:Pre-Depends} +Depends: ${misc:Depends} +Replaces: libreoffice-style-tango (<< 1:7.0.0) +Description: office productivity suite -- Tango symbol style + LibreOffice is a full-featured office productivity suite that provides + a near drop-in replacement for Microsoft(R) Office. + . + This package is a custom re-build of the plugin release of the "tango" + symbol style that was removed as a built-in component of upstream + LibreOffice. diff --git a/libreoffice-tango-iconset/debian/copyright b/libreoffice-tango-iconset/debian/copyright new file mode 100644 index 0000000..5a7aa9b --- /dev/null +++ b/libreoffice-tango-iconset/debian/copyright @@ -0,0 +1,14 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: libreoffice-tango-iconset +Upstream-Contact: <preferred name and address to reach the upstream project> +Source: <url://example.com> +# +# Please double check copyright with the licensecheck(1) command. + +#---------------------------------------------------------------------------- +# huge files (skipped): +# tango-iconset.oxt + +#---------------------------------------------------------------------------- +# Files marked as NO_LICENSE_TEXT_FOUND may be covered by the following +# license/copyright files. diff --git a/libreoffice-tango-iconset/debian/libreoffice-tango-iconset+devuan.dsc b/libreoffice-tango-iconset/debian/libreoffice-tango-iconset+devuan.dsc new file mode 100644 index 0000000..cf4d247 --- /dev/null +++ b/libreoffice-tango-iconset/debian/libreoffice-tango-iconset+devuan.dsc @@ -0,0 +1,14 @@ +Format: 3.0 (quilt) +Source: libreoffice-tango-iconset +Binary: libreoffice-tango-iconset +Architecture: all +Version: 1.0-1+devuan +Maintainer: Ben Stack <bgstack15@gmail.com> +Homepage: https://extensions.libreoffice.org/en/extensions/show/tango-icon-theme-for-libreoffice +Standards-Version: 4.5.0 +Build-Depends: debhelper-compat (= 12), p7zip-full +Package-List: + libreoffice-tango-iconset deb x11 optional arch=all +Files: + 00000000000000000000000000000000 1 libreoffice-tango-iconset.orig.tar.gz + 00000000000000000000000000000000 1 libreoffice-tango-iconset.debian.tar.xz diff --git a/libreoffice-tango-iconset/debian/libreoffice-tango-iconset.install b/libreoffice-tango-iconset/debian/libreoffice-tango-iconset.install new file mode 100644 index 0000000..1174dc6 --- /dev/null +++ b/libreoffice-tango-iconset/debian/libreoffice-tango-iconset.install @@ -0,0 +1,7 @@ +config.xcu /usr/lib/libreoffice/share/extensions/tango-iconset +description.xml /usr/lib/libreoffice/share/extensions/tango-iconset +icons /usr/lib/libreoffice/share/extensions/tango-iconset +iconsets /usr/lib/libreoffice/share/extensions/tango-iconset +META-INF /usr/lib/libreoffice/share/extensions/tango-iconset +pkg-desc /usr/lib/libreoffice/share/extensions/tango-iconset +registration /usr/lib/libreoffice/share/extensions/tango-iconset diff --git a/libreoffice-tango-iconset/debian/patches/series b/libreoffice-tango-iconset/debian/patches/series new file mode 100644 index 0000000..4a97dfa --- /dev/null +++ b/libreoffice-tango-iconset/debian/patches/series @@ -0,0 +1 @@ +# You must remove unused comment lines for the released package. diff --git a/libreoffice-tango-iconset/debian/rules b/libreoffice-tango-iconset/debian/rules new file mode 100755 index 0000000..d2bb725 --- /dev/null +++ b/libreoffice-tango-iconset/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f +# You must remove unused comment lines for the released package. +#export DH_VERBOSE = 1 +#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic +#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed + +%: + dh $@ + +override_dh_auto_install: + dh_auto_install + 7z -aoa x tango-iconset.oxt + +override_dh_auto_clean: + dh_auto_clean + rm -rf $$( 7z l tango-iconset.oxt | awk 'NF==6 && $$1 ~/[0-9]{4}(-[0-9]{2}){2}/{print $$NF}' ) diff --git a/libreoffice-tango-iconset/debian/source/format b/libreoffice-tango-iconset/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/libreoffice-tango-iconset/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/libreoffice-tango-iconset/debian/source/local-options b/libreoffice-tango-iconset/debian/source/local-options new file mode 100644 index 0000000..00131ee --- /dev/null +++ b/libreoffice-tango-iconset/debian/source/local-options @@ -0,0 +1,2 @@ +#abort-on-upstream-changes +#unapply-patches diff --git a/libreoffice-tango-iconset/debian/watch b/libreoffice-tango-iconset/debian/watch new file mode 100644 index 0000000..76575dc --- /dev/null +++ b/libreoffice-tango-iconset/debian/watch @@ -0,0 +1,2 @@ +# You must remove unused comment lines for the released package. +version=3 diff --git a/makemkv-bin/debian/changelog b/makemkv-bin/debian/changelog index 4a36dab..4634094 100644 --- a/makemkv-bin/debian/changelog +++ b/makemkv-bin/debian/changelog @@ -1,3 +1,13 @@ +makemkv-bin (1.15.2-1+devuan) obs; urgency=medium + + * Massive internal rewrite, some improvements and small bugfixes + * Muxer updated to the latest matroska specification + * Advanced usage changes: + - Sdftool included as standalone executable + - Drive speed control option + + -- Ben Stack <bgstack15@gmail.com> Wed, 22 Jul 2020 21:49:46 -0400 + makemkv-bin (1.15.1-1+devuan) obs; urgency=medium * Added support for AACS v76 (for those poor souls without LibreDrive) diff --git a/makemkv-bin/debian/makemkv-bin+devuan.dsc b/makemkv-bin/debian/makemkv-bin+devuan.dsc index 1079f3f..3b43c14 100644 --- a/makemkv-bin/debian/makemkv-bin+devuan.dsc +++ b/makemkv-bin/debian/makemkv-bin+devuan.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: makemkv-bin Binary: makemkv-bin Architecture: any -Version: 1.15.1-1+devuan +Version: 1.15.2-1+devuan Maintainer: B Stack <bgstack15@gmail.com> Homepage: https://www.makemkv.com Standards-Version: 4.1.4 diff --git a/makemkv-bin/debian/settings.conf.example b/makemkv-bin/debian/settings.conf.example index 2a991e7..daa0535 100644 --- a/makemkv-bin/debian/settings.conf.example +++ b/makemkv-bin/debian/settings.conf.example @@ -1,11 +1,12 @@ # # MakeMKV settings file, written by MakeMKV v1.15.1 linux(x64-release) -# suitable for version 1.15.1, expires 2020-04-16 +# suitable for version 1.15.2, expires 2020-08-31 +# However, I think now as of 1.15.2, the application will work without this app_Key value; if app_Key is left undefined the application should work. app_DestinationDir = "" app_InterfaceLanguage = "eng" app_Java = "" -app_Key = "T-UWwbYn781f1gjZcH5NOsJkGgWHnUkQsr2IduoSJ8sssNXOqclsWhowNWTclkBjHIMH" +app_Key = "T-pkCvTehL1cTwOH5BBwO2xs8kNUrpGUIEKolUqMgSr9pDasz0NCGOEsFbaFVK2V6Ux3" app_PreferredLanguage = "eng" app_ccextractor = "" diff --git a/makemkv-oss/debian/changelog b/makemkv-oss/debian/changelog index d476c39..356cd02 100644 --- a/makemkv-oss/debian/changelog +++ b/makemkv-oss/debian/changelog @@ -1,3 +1,13 @@ +makemkv-oss (1.15.2-1+devuan) obs; urgency=medium + + * Massive internal rewrite, some improvements and small bugfixes + * Muxer updated to the latest matroska specification + * Advanced usage changes: + - Sdftool included as standalone executable + - Drive speed control option + + -- Ben Stack <bgstack15@gmail.com> Wed, 22 Jul 2020 21:49:46 -0400 + makemkv-oss (1.15.1-1+devuan) obs; urgency=medium * Added support for AACS v76 (for those poor souls without LibreDrive) diff --git a/makemkv-oss/debian/makemkv-oss+devuan.dsc b/makemkv-oss/debian/makemkv-oss+devuan.dsc index 2e00a29..857af3f 100644 --- a/makemkv-oss/debian/makemkv-oss+devuan.dsc +++ b/makemkv-oss/debian/makemkv-oss+devuan.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: makemkv-oss Binary: makemkv-oss Architecture: any -Version: 1.15.1-1+devuan +Version: 1.15.2-1+devuan Maintainer: B Stack <bgstack15@gmail.com> Homepage: https://www.makemkv.com Standards-Version: 4.1.4 diff --git a/makemkv/makemkv.spec b/makemkv/makemkv.spec index 62a0568..5256ceb 100644 --- a/makemkv/makemkv.spec +++ b/makemkv/makemkv.spec @@ -13,7 +13,7 @@ Summary: DVD and Blu-ray to MKV converter and network streamer Name: makemkv -Version: 1.15.1 +Version: 1.15.2 Release: 10%{?dist} License: GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+ URL: http://www.%{name}.com/ @@ -151,6 +151,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libmmbd.so.0 %changelog +* Thu Jul 23 2020 B Stack <bgstack15@gmail.com> - 1.15.2-10 +- Update + * Thu Apr 16 2020 B Stack <bgstack15@gmail.com> - 1.15.1-10 - Update diff --git a/makemkv/settings.conf.example b/makemkv/settings.conf.example index 2a991e7..daa0535 100644 --- a/makemkv/settings.conf.example +++ b/makemkv/settings.conf.example @@ -1,11 +1,12 @@ # # MakeMKV settings file, written by MakeMKV v1.15.1 linux(x64-release) -# suitable for version 1.15.1, expires 2020-04-16 +# suitable for version 1.15.2, expires 2020-08-31 +# However, I think now as of 1.15.2, the application will work without this app_Key value; if app_Key is left undefined the application should work. app_DestinationDir = "" app_InterfaceLanguage = "eng" app_Java = "" -app_Key = "T-UWwbYn781f1gjZcH5NOsJkGgWHnUkQsr2IduoSJ8sssNXOqclsWhowNWTclkBjHIMH" +app_Key = "T-pkCvTehL1cTwOH5BBwO2xs8kNUrpGUIEKolUqMgSr9pDasz0NCGOEsFbaFVK2V6Ux3" app_PreferredLanguage = "eng" app_ccextractor = "" diff --git a/notepadpp/debian/changelog b/notepadpp/debian/changelog index 61d8857..bf93c6a 100644 --- a/notepadpp/debian/changelog +++ b/notepadpp/debian/changelog @@ -1,3 +1,36 @@ +notepadpp (7.8.9-1+devuan) obs; urgency=medium + + - Bug-fixes + * Fix Line operations (join lines, split lines, remove duplicate lines and sort lines) doing one too many lines issue. + * Fix the regression of jump line failure via command line (-n). + * Fix URL Hovered colour disappears after modifying any Clickable Link Settings regression. + * Fix URL is not clickable in certain stuation while wrapped is enabled. + * Fix "Save" not working in Windows dialog. + * Fix Flickering cursor after double clicking a found line in find results. + * Fix Found line may not be centered by double clicking in find results, if word wrap is on. + * Fix wrong horizontal scroll bar position after restoring Window position. + * Fix Find result window output TAB-width incoherent issue. + + -- Ben Stack <bgstack15@gmail.com> Thu, 23 Jul 2020 18:23:11 -0400 + +notepadpp (7.8.8-1+devuan) UNRELEASED; urgency=medium + + - Enhancements and bug-fixes + * Fix accented characters in ANSI files not found in "find in files" and "replace in files" commands issues. + * Add an option to improve rendering special Unicode characters by using Scintilla's DirectWrite technology. + * Fix URL invisible issue in dark themes. + * Fix the focus not on the opening new file issue. + * Fix Workspace (Project panel), Folder As Workspace and function list keep focus issue after double clicking an item. + * Add Ctrl+Backspace ability to delete word for comboboxes in Find/Replace dialog. + * Add ability to find-all in selected text. + * Fix wrong treatment of backslashes as escape sequences in autocompletion. + * Enhance "Remove Empty Lines" command: Allow scope to be limited by an active selection. + * Fix loading of project & session files by drag & drop not working issue. + * Fix block selection cursor wrong positions after typing TAB. + * Add confirmation prompt to "Replace all in all opened documents" command to avoid PBKAC. + + -- Ben Stack <bgstack15@gmail.com> Wed, 22 Jul 2020 00:00:00 -0400 + notepadpp (7.8.7-1+devuan) obs; urgency=medium - Enhancements and bug-fixes @@ -87,14 +120,14 @@ notepadpp (7.8.2-1+devuan) obs; urgency=low - Enhancements and bug-fixes * Add key shortcuts in Save or not dialog. * Add find in files filter excluding ability. - * Add “Open UDL folder” command. + * Add "Open UDL folder" command. * Fix issue of showing save dialog twice while cloned file is dirty. - * Enhance “Open Explorer” command in Folder as workspace with expected path. + * Enhance "Open Explorer" command in Folder as workspace with expected path. * Fix tab dragging issues. - * Enhance “Close all but This” and “Close all to the left/right” commands while files are dirty. - * Enhance “In Selection” option in Find dialog. + * Enhance "Close all but This" and "Close all to the left/right" commands while files are dirty. + * Enhance "In Selection" option in Find dialog. * Fix Notepad++ blocked in notification zone issue. * Make end-of-line conversion operations macroable. - * Fix “View Current File In” commands disabled problem in some situations. + * Fix "View Current File In" commands disabled problem in some situations. -- B Stack <bgstack15@gmail.com> Fri, 27 Dec 2019 13:49:15 -0500 diff --git a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec index e080163..55e0faf 100644 --- a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec +++ b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec @@ -4,7 +4,7 @@ #%%global app_id Name: %{app_name}-ublock-origin -Version: 1.16.4.22 +Version: 1.16.4.23 Release: 1 Summary: uBlock Origin installed to the system Pale Moon extensions directory @@ -51,6 +51,9 @@ rm -rf %{buildroot} %{moz_extensions}/*.xpi %changelog +* Wed Jul 22 2020 B Stack <bgstack15@gmail.com> - 1.16.4.23-1 +- Update + * Sat Jul 04 2020 B Stack <bgstack15@gmail.com> - 1.16.4.22-1 - Update diff --git a/palemoon-ublock-origin/debian/changelog b/palemoon-ublock-origin/debian/changelog index 60ef7e2..9f99ac5 100644 --- a/palemoon-ublock-origin/debian/changelog +++ b/palemoon-ublock-origin/debian/changelog @@ -1,3 +1,9 @@ +palemoon-ublock-origin (1.16.4.23-1+devuan) obs; urgency=medium + + * Update + + -- B Stack <bgstack15@gmail.com> Wed, 22 Jul 2020 21:08:22 -0400 + palemoon-ublock-origin (1.16.4.22-1+devuan) obs; urgency=medium * Update diff --git a/palemoon-ublock-origin/palemoon-ublock-origin.spec b/palemoon-ublock-origin/palemoon-ublock-origin.spec index 4d4d160..20002dd 100644 --- a/palemoon-ublock-origin/palemoon-ublock-origin.spec +++ b/palemoon-ublock-origin/palemoon-ublock-origin.spec @@ -4,7 +4,7 @@ #%%global app_id Name: %{app_name}-ublock-origin -Version: 1.16.4.22 +Version: 1.16.4.23 Release: 1 Summary: uBlock Origin installed to the system Pale Moon extensions directory @@ -51,6 +51,9 @@ rm -rf %{buildroot} %{moz_extensions}/*.xpi %changelog +* Wed Jul 22 2020 B Stack <bgstack15@gmail.com> - 1.16.4.23-1 +- Update + * Sat Jul 04 2020 B Stack <bgstack15@gmail.com> - 1.16.4.22-1 - Update diff --git a/scite-el/README.md b/scite-el/README.md index 6a22a2e..2d139e8 100644 --- a/scite-el/README.md +++ b/scite-el/README.md @@ -9,8 +9,8 @@ Distro | scite version ---------- | --------------- CentOS 6 | 3.7.6 CentOS 7 | 3.7.6 -CentOS 8 | 4.3.3 -Fedora 30 | 4.3.3 +CentOS 8 | 4.4.3 +Fedora 30 | 4.4.3 # Differences ## From upstream diff --git a/scite-el/scite.spec b/scite-el/scite.spec index a899b56..d2b86bb 100644 --- a/scite-el/scite.spec +++ b/scite-el/scite.spec @@ -98,6 +98,9 @@ desktop-file-install --delete-original \ %{_datadir}/applications/* %changelog +* Wed Jun 03 2020 B Stack <bgstack15@gmail.com> - 4.4.3-1/3.7.6-1 +- Update version + * Tue May 05 2020 B Stack <bgstack15@gmail.com> - 4.3.3-1/3.7.6-1 - Update version diff --git a/scite-fedora/README.md b/scite-fedora/README.md index 6a22a2e..2d139e8 100644 --- a/scite-fedora/README.md +++ b/scite-fedora/README.md @@ -9,8 +9,8 @@ Distro | scite version ---------- | --------------- CentOS 6 | 3.7.6 CentOS 7 | 3.7.6 -CentOS 8 | 4.3.3 -Fedora 30 | 4.3.3 +CentOS 8 | 4.4.3 +Fedora 30 | 4.4.3 # Differences ## From upstream diff --git a/scite-fedora/scite.spec b/scite-fedora/scite.spec index 43ee922..9c62f6a 100644 --- a/scite-fedora/scite.spec +++ b/scite-fedora/scite.spec @@ -1,5 +1,5 @@ # el is on 3.x, fc is on 4.x -%global pkgversion 4.3.3 +%global pkgversion 4.4.4 %define tarballversion %( echo %pkgversion | tr -d '.' ) %define scl_env %{nil} @@ -48,24 +48,28 @@ rm -rf scite/lua %if "%{?scl_env}" != "" scl enable %{scl_env} /bin/bash <<'EOFSCL' %endif - make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \ - CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 -C scintilla/gtk + make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags} -shared -dynamiclib" \ + CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 -C scintilla/gtk \ + libdir=%{_libdir} #Build without lua support make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \ - CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 NO_LUA=1 -C scite/gtk + CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" DEBUG=1 NO_LUA=1 -C scite/gtk \ + libdir=%{_libdir} %if "%{?scl_env}" != "" EOFSCL %endif %else - make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \ - CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 -C scintilla/gtk + make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags} -shared -dynamiclib" \ + CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 -C scintilla/gtk \ + libdir=%{_libdir} #Build without lua support make %{?_smp_mflags} LDFLAGS="%{?__global_ldflags}" \ - CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 NO_LUA=1 -C scite/gtk + CFLAGS="%{optflags}" CXXFLAGS="%{optflags}" GTK3=1 DEBUG=1 NO_LUA=1 -C scite/gtk \ + libdir=%{_libdir} %endif %install -make DESTDIR=%{buildroot} -C scite/gtk install +make DESTDIR=%{buildroot} -C scite/gtk install libdir=%{_libdir} ln -s SciTE %{buildroot}%{_bindir}/scite # include man-page @@ -96,8 +100,15 @@ desktop-file-install --delete-original \ %{_datadir}/scite/ %{_datadir}/pixmaps/* %{_datadir}/applications/* +%{_libdir}/* %changelog +* Thu Jul 23 2020 B Stack <bgstack15@gmail.com> - 4.4.4-1/3.7.6-1 +- Update version + +* Wed Jun 03 2020 B Stack <bgstack15@gmail.com> - 4.4.3-1/3.7.6-1 +- Update version + * Tue May 05 2020 B Stack <bgstack15@gmail.com> - 4.3.3-1/3.7.6-1 - Update version diff --git a/waterfox-ublock-origin/debian/changelog b/waterfox-ublock-origin/debian/changelog index bee1db3..2d43faf 100644 --- a/waterfox-ublock-origin/debian/changelog +++ b/waterfox-ublock-origin/debian/changelog @@ -1,3 +1,9 @@ +waterfox-ublock-origin (1.16.4.23-1+devuan) obs; urgency=medium + + * Update + + -- B Stack <bgstack15@gmail.com> Wed, 22 Jul 2020 21:08:22 -0400 + waterfox-ublock-origin (1.16.4.22-1+devuan) obs; urgency=medium * Update diff --git a/waterfox-ublock-origin/waterfox-ublock-origin.spec b/waterfox-ublock-origin/waterfox-ublock-origin.spec index b61b691..e0238a8 100644 --- a/waterfox-ublock-origin/waterfox-ublock-origin.spec +++ b/waterfox-ublock-origin/waterfox-ublock-origin.spec @@ -4,7 +4,7 @@ %global app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\} Name: %{app_name}-ublock-origin -Version: 1.16.4.22 +Version: 1.16.4.23 Release: 1 Summary: uBlock Origin installed to system Waterfox extensions directory @@ -52,6 +52,9 @@ rm -rf %{buildroot} %{moz_extensions}/*/*.xpi %changelog +* Wed Jul 22 2020 B Stack <bgstack15@gmail.com> - 1.16.4.23-1 +- Update + * Sat Jul 04 2020 B Stack <bgstack15@gmail.com> - 1.16.4.22-1 - Update |