diff options
64 files changed, 828 insertions, 679 deletions
diff --git a/freefilesync/debian/README.Debian b/freefilesync/debian/README.Debian index 588db96..a5a1f01 100644 --- a/freefilesync/debian/README.Debian +++ b/freefilesync/debian/README.Debian @@ -1,3 +1,7 @@ +freefilesync (10.25-1+devuan) + +Now requires g++-10. Previously, the maintainer was reverting the logic only available to gcc-10, but this is becoming unmaintainable. + freefilesync (10.21-2+devuan) * gtk2 build for albion diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog index 0b9f910..4b1a593 100644 --- a/freefilesync/debian/changelog +++ b/freefilesync/debian/changelog @@ -1,3 +1,59 @@ +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) + + -- Ben Stack <bgstack15@gmail.com> Sat, 20 Jun 2020 16:46:22 -0400 + +freefilesync (10.25-1+devuan) obs; urgency=medium + + * gtk3 build (unstable) + * New file tree layout for main grid + * Support Google Drive Shared Drives + * Support Google Drive Shortcuts + * Prioritize item name rendering if lacking horizontal space + * Report "out of memory" during startup instead of crashing + * Fixed excess memory consumption when loading variable-size data blocks + * Fixed VERSION_ID missing on Arch Linux + * Fixed IWbemServices::ConnectServer error during auto-update + * Fixed row being skipped during main grid page up/down + * Fixed MSSearch files not found when using Volume Shadow Copy + * Allow creating folder names with trailing dot + * Improved sort by full path speed and folder ordering + * Report detailed error when failing to parse FTP MLSD + * Sort by path component names instead of relative path + * Support access to MEGAcmd FTP server + * Fixed Google Drive error when removing last parent of shared item + * Fixed Google Drive owned+shared files being unlinked instead of deleted + * Fixed Google Drive change notificaton evaluation for item without parents + * Support double-click/"Browse directory" for (S)FTP/Google Drive (Linux) + + -- Ben Stack <bgstack15@gmail.com> Fri, 19 Jun 2020 16:21:17 -0400 + freefilesync (10.24-2+devuan) albion; urgency=medium * gtk2 build (stable) diff --git a/freefilesync/debian/control b/freefilesync/debian/control index 00da1a0..17ed18d 100644 --- a/freefilesync/debian/control +++ b/freefilesync/debian/control @@ -4,20 +4,18 @@ Priority: optional 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/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc index eb4e5b1..2da40e8 100644 --- a/freefilesync/debian/freefilesync+devuan.dsc +++ b/freefilesync/debian/freefilesync+devuan.dsc @@ -2,11 +2,11 @@ Format: 3.0 (quilt) Source: freefilesync Binary: freefilesync Architecture: any -Version: 10.24-1+devuan +Version: 10.25-1+devuan Maintainer: B Stack <bgstack15@gmail.com> Homepage: https://freefilesync.org/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12~), imagemagick, libcurl4-openssl-dev, libssh2-1-dev, libssl-dev, wx3.0-headers, unzip, libgtk-3-dev, libwxgtk3.0-gtk3-dev, libfontconfig-dev +Build-Depends: debhelper (>= 12~), g++-10, imagemagick, libcurl4-openssl-dev, libssh2-1-dev, libssl-dev, wx3.0-headers, unzip, libgtk-3-dev, libwxgtk3.0-gtk3-dev, libfontconfig-dev Package-List: freefilesync deb utils optional arch=any Files: 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_gcc.patch b/freefilesync/debian/patches/ffs_gcc.patch new file mode 100644 index 0000000..ed007b5 --- /dev/null +++ b/freefilesync/debian/patches/ffs_gcc.patch @@ -0,0 +1,46 @@ +diff -Naur 10.25-1/FreeFileSync/Source/Makefile 10.25-2/FreeFileSync/Source/Makefile +--- 10.25-1/FreeFileSync/Source/Makefile 2020-06-20 13:36:08.495867672 -0400 ++++ 10.25-2/FreeFileSync/Source/Makefile 2020-06-20 13:31:36.180419862 -0400 +@@ -1,4 +1,5 @@ + exeName = FreeFileSync ++CXX=g++-10 + + cxxFlags += -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../.. -I../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \ +@@ -114,11 +115,11 @@ + + ../Build/Bin/$(exeName): $(objFiles) + mkdir -p $(dir $@) +- g++ -o $@ $^ $(linkFlags) ++ $(CXX) -o $@ $^ $(linkFlags) + + $(tmpPath)/ffs/src/%.o : % + mkdir -p $(dir $@) +- g++ $(cxxFlags) -c $< -o $@ ++ $(CXX) $(cxxFlags) -c $< -o $@ + + clean: + rm -rf $(tmpPath) +diff -Naur 10.25-1/FreeFileSync/Source/RealTimeSync/Makefile 10.25-2/FreeFileSync/Source/RealTimeSync/Makefile +--- 10.25-1/FreeFileSync/Source/RealTimeSync/Makefile 2020-06-20 13:36:08.499867723 -0400 ++++ 10.25-2/FreeFileSync/Source/RealTimeSync/Makefile 2020-06-20 13:31:48.844580205 -0400 +@@ -1,4 +1,5 @@ + exeName = RealTimeSync ++CXX=g++-10 + + cxxFlags += -std=c++2a -pipe -DWXINTL_NO_GETTEXT_MACRO -I../../.. -I../../../zenXml -include "zen/i18n.h" -include "zen/warn_static.h" \ + -Wall -Wfatal-errors -Wmissing-include-dirs -Wswitch-enum -Wcast-align -Wshadow -Wnon-virtual-dtor \ +@@ -52,11 +53,11 @@ + + ../../Build/Bin/$(exeName): $(objFiles) + mkdir -p $(dir $@) +- g++ -o $@ $^ $(linkFlags) ++ $(CXX) -o $@ $^ $(linkFlags) + + $(tmpPath)/ffs/src/rts/%.o : % + mkdir -p $(dir $@) +- g++ $(cxxFlags) -c $< -o $@ ++ $(CXX) $(cxxFlags) -c $< -o $@ + + clean: + rm -rf $(tmpPath) 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 932800d..22d8260 100644 --- a/freefilesync/debian/patches/ffs_no_wx311.patch +++ b/freefilesync/debian/patches/ffs_no_wx311.patch @@ -1,11 +1,21 @@ 2019-08-15 just compile. -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/FreeFileSync/Source/ui/small_dlgs.cpp 10.24-1/FreeFileSync/Source/ui/small_dlgs.cpp ---- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 07:56:06.714625467 -0500 -+++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 08:41:43.498308243 -0500 -@@ -1594,7 +1594,7 @@ +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 ++++ 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())); + } +- m_listBoxGdriveUsers->Append(gdriveAccounts); ++ for (const wxString& item : gdriveAccounts) // reverted to pre-wx 3.1.1 logic ++ m_listBoxGdriveUsers->Append(item); + + //set default values for Google Drive: use first item of m_listBoxGdriveUsers + if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase)) +@@ -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/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch index 0da4e06..8ca60c2 100644 --- a/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/debian/patches/revert_zenju_aggressive_upstreamisms.patch @@ -1,184 +1,3 @@ -Author: Ben Stack <bgstack15@gmail.com> -Date: 2020-05-17 14:11 -0400 -Message: Use the following command to get this old contents. Zenju must be using some newer definition of -std=c++2a than what Devuan Ceres provides as of 2020-05-17, and probably wxwidgets. This is the 10.23 code for these files. - - git checkout b4ecf755 zen/legacy_compiler.h zen/string_base.h wx+/choice_enum.h - -Unfortunately with the removal of the wxWidgets-gtk2 code from Debian, we are stuck using all available at approximately November 1, 2019 snapshot of Debian: https://snapshot.debian.org/archive/debian/20191101T211023Z/pool/main/w/wxwidgets3.0/ -libwxbase3.0-0v5_3.0.4+dfsg-14_amd64.deb -libwxbase3.0-0v5_3.0.4+dfsg-14_i386.deb -libwxbase3.0-dev_3.0.4+dfsg-14_amd64.deb -libwxbase3.0-dev_3.0.4+dfsg-14_i386.deb -libwxgtk3.0-0v5_3.0.4+dfsg-14_amd64.deb -libwxgtk3.0-0v5_3.0.4+dfsg-14_i386.deb -libwxgtk3.0-dev_3.0.4+dfsg-14_amd64.deb -libwxgtk3.0-dev_3.0.4+dfsg-14_i386.deb -wx3.0-headers_3.0.4+dfsg-14_all.deb -wx-common_3.0.4+dfsg-14_amd64.deb -wx-common_3.0.4+dfsg-14_i386.deb -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/zen/legacy_compiler.h 10.24-1/zen/legacy_compiler.h ---- 10.24-0/zen/legacy_compiler.h 2020-05-17 13:44:27.542140458 -0400 -+++ 10.24-1/zen/legacy_compiler.h 2020-05-17 14:07:49.115166339 -0400 -@@ -7,9 +7,6 @@ - #ifndef LEGACY_COMPILER_H_839567308565656789 - #define LEGACY_COMPILER_H_839567308565656789 - -- #include <numbers> //C++20 -- -- #include <span> //requires C++20 - - - -@@ -21,8 +18,53 @@ - - //--------------------------------------------------------------------------------- - -+#if __cpp_lib_span -+ #error get rid of workaround: -+#endif -+ -+template <class T> -+class span -+{ -+public: -+ template <class Iterator> -+ span(Iterator first, Iterator last) : size_(last - first), data_(first != last ? &*first : nullptr) {} -+ -+ template <class Container> -+ span(Container& cont) : span(cont.begin(), cont.end()) {} -+ -+ using iterator = T*; -+ using const_iterator = const T*; -+ -+ iterator begin() { return data_; } -+ iterator end () { return data_ + size_; } -+ -+ const_iterator begin() const { return data_; } -+ const_iterator end () const { return data_ + size_; } - -+ const_iterator cbegin() const { return begin(); } -+ const_iterator cend () const { return end (); } - -+ T* data() const { return data_; } -+ size_t size() const { return size_; } -+ bool empty() const { return size_ == 0; } -+ -+private: -+ const size_t size_; -+ T* const data_; -+}; -+ -+ -+#if __cpp_lib_math_constants -+ #error get rid of workaround: -+#endif -+ -+namespace numbers -+{ -+const double pi = 3.14159265358979323846; -+const double e = 2.71828182845904523536; -+const double sqrt2 = 1.41421356237309504880; -+const double ln2 = 0.693147180559945309417; -+} - } - - -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/zen/string_base.h 10.24-1/zen/string_base.h ---- 10.24-0/zen/string_base.h 2020-05-17 13:44:27.554140569 -0400 -+++ 10.24-1/zen/string_base.h 2020-05-17 14:09:44.164244361 -0400 -@@ -12,7 +12,9 @@ - #include <cstdint> - #include <atomic> - #include "string_tools.h" -+#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison - #include <compare> -+#endif - - - //Zbase - a policy based string class optimizing performance and flexibility -@@ -293,15 +295,29 @@ - }; - - -+#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison -+ #error implement! -+#endif -+ - - template <class Char, template <class> class SP> bool operator==(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs); - template <class Char, template <class> class SP> bool operator==(const Zbase<Char, SP>& lhs, const Char* rhs); - template <class Char, template <class> class SP> inline bool operator==(const Char* lhs, const Zbase<Char, SP>& rhs) { return operator==(rhs, lhs); } - -+#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison - template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs); - template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Char* rhs); - template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Char* lhs, const Zbase<Char, SP>& rhs); - -+#else -+template <class Char, template <class> class SP> inline bool operator!=(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) { return !operator==(lhs, rhs); } -+template <class Char, template <class> class SP> inline bool operator!=(const Zbase<Char, SP>& lhs, const Char* rhs) { return !operator==(lhs, rhs); } -+template <class Char, template <class> class SP> inline bool operator!=(const Char* lhs, const Zbase<Char, SP>& rhs) { return !operator==(lhs, rhs); } -+ -+template <class Char, template <class> class SP> bool operator<(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs); -+template <class Char, template <class> class SP> bool operator<(const Zbase<Char, SP>& lhs, const Char* rhs); -+template <class Char, template <class> class SP> bool operator<(const Char* lhs, const Zbase<Char, SP>& rhs); -+#endif - - template <class Char, template <class> class SP> inline Zbase<Char, SP> operator+(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) { return Zbase<Char, SP>(lhs) += rhs; } - template <class Char, template <class> class SP> inline Zbase<Char, SP> operator+(const Zbase<Char, SP>& lhs, const Char* rhs) { return Zbase<Char, SP>(lhs) += rhs; } -@@ -482,11 +498,12 @@ - } - - -+#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison - template <class Char, template <class> class SP> inline - std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) - { -- return std::lexicographical_compare_three_way(lhs.begin(), lhs.end(), //respect embedded 0 -- rhs.begin(), rhs.end()); // -+ return std::lexicographical_compare_three_way(lhs.begin(), lhs.end(), //respect embedded 0 -+ rhs.begin(), rhs.end()); - } - - -@@ -501,11 +518,35 @@ - template <class Char, template <class> class SP> inline - std::strong_ordering operator<=>(const Char* lhs, const Zbase<Char, SP>& rhs) - { -- return std::lexicographical_compare_three_way(lhs, lhs + strLength(lhs), -- rhs.begin(), rhs.end()); //respect embedded 0 -+ return std::lexicographical_compare_three_way(lhs, lhs + strLength(lhs), //respect embedded 0 -+ rhs.begin(), rhs.end()); -+} -+ -+#else -+template <class Char, template <class> class SP> inline -+bool operator<(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) -+{ -+ return std::lexicographical_compare(lhs.begin(), lhs.end(), //respect embedded 0 -+ rhs.begin(), rhs.end()); - } - - -+template <class Char, template <class> class SP> inline -+bool operator<(const Zbase<Char, SP>& lhs, const Char* rhs) -+{ -+ return std::lexicographical_compare(lhs.begin(), lhs.end(), //respect embedded 0 -+ rhs, rhs + strLength(rhs)); -+} -+ -+ -+template <class Char, template <class> class SP> inline -+bool operator<(const Char* lhs, const Zbase<Char, SP>& rhs) -+{ -+ return std::lexicographical_compare(lhs, lhs + strLength(lhs), //respect embedded 0 -+ rhs.begin(), rhs.end()); -+} -+#endif -+ - - template <class Char, template <class> class SP> inline - size_t Zbase<Char, SP>::length() const diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/wx+/choice_enum.h --- 10.24-0/wx+/choice_enum.h 2020-05-17 18:30:59.441499418 -0400 +++ 10.24-1/wx+/choice_enum.h 2020-05-17 18:53:59.893685507 -0400 diff --git a/freefilesync/debian/patches/series b/freefilesync/debian/patches/series index bd039a4..7ce7a97 100644 --- a/freefilesync/debian/patches/series +++ b/freefilesync/debian/patches/series @@ -1,10 +1,10 @@ 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 ffs_libssh2.patch ffs_curl.patch revert_zenju_aggressive_upstreamisms.patch +ffs_gcc.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_eraseif.patch b/freefilesync/ffs_no_eraseif.patch index f4a7b46..71239e4 100644 --- a/freefilesync/ffs_no_eraseif.patch +++ b/freefilesync/ffs_no_eraseif.patch @@ -11,28 +11,28 @@ diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source //get or create mutex std::weak_ptr<std::mutex>& weakPtr = pathLocks[nativePath]; -diff -x '*.swp' -x '*.git*' -x '*.orig' -x '*.rej' -Naur 10.24-0/FreeFileSync/Source/afs/gdrive.cpp 10.24-1/FreeFileSync/Source/afs/gdrive.cpp ---- 10.18-0/FreeFileSync/Source/afs/gdrive.cpp 2019-11-20 16:15:55.828668123 -0500 -+++ 10.24-1/FreeFileSync/Source/afs/gdrive.cpp 2020-05-18 10:30:32.420537123 -0400 -@@ -1578,7 +1578,7 @@ +diff -Naur 10.25-0/FreeFileSync/Source/afs/gdrive.cpp 10.25-1/FreeFileSync/Source/afs/gdrive.cpp +--- 10.25-0/FreeFileSync/Source/afs/gdrive.cpp 2020-06-19 16:17:15.000000000 -0400 ++++ 10.25-1/FreeFileSync/Source/afs/gdrive.cpp 2020-06-20 20:54:52.438669026 -0400 +@@ -1930,7 +1930,7 @@ if (auto it = itemDetails_.find(itemId); it != itemDetails_.end()) { - GoogleItemDetails detailsNew = it->second; + GdriveItemDetails detailsNew = it->second; - std::erase_if(detailsNew.parentIds, [&](const std::string& id) { return id == parentIdOld; }); + eraseIf(detailsNew.parentIds, [&](const std::string& id) { return id == parentIdOld; }); - notifyItemUpdate(stateDelta, itemId, detailsNew); + notifyItemUpdated(stateDelta, itemId, &detailsNew); } else //conflict!!! -@@ -1592,7 +1592,7 @@ - GoogleItemDetails detailsNew = it->second; - detailsNew.itemName = utfTo<std::string>(newName); +@@ -1944,7 +1944,7 @@ + GdriveItemDetails detailsNew = it->second; + detailsNew.itemName = newName; - std::erase_if(detailsNew.parentIds, [&](const std::string& id) { return id == parentIdFrom || id == parentIdTo; }); // + eraseIf(detailsNew.parentIds, [&](const std::string& id) { return id == parentIdFrom || id == parentIdTo; }); // detailsNew.parentIds.push_back(parentIdTo); //not a duplicate - notifyItemUpdate(stateDelta, itemId, detailsNew); -@@ -1701,7 +1701,7 @@ + notifyItemUpdated(stateDelta, itemId, &detailsNew); +@@ -2095,7 +2095,7 @@ return; //=> avoid misleading changeLog_ entries after Google Drive sync!!! //update change logs (and clean up obsolete entries) @@ -41,7 +41,7 @@ diff -x '*.swp' -x '*.git*' -x '*.orig' -x '*.rej' -Naur 10.24-0/FreeFileSync/So { if (std::shared_ptr<ItemIdDelta> iid = weakPtr.lock()) { -@@ -1722,15 +1722,15 @@ +@@ -2116,15 +2116,15 @@ std::vector<std::string> parentIdsNew = details->parentIds; std::vector<std::string> parentIdsRemoved = it->second.parentIds; @@ -58,9 +58,9 @@ diff -x '*.swp' -x '*.git*' -x '*.orig' -x '*.rej' -Naur 10.24-0/FreeFileSync/So - std::erase_if(itP->second.childItems, [&](auto itChild) { return itChild == it; }); + eraseIf(itP->second.childItems, [&](auto itChild) { return itChild == it; }); //if all parents are removed, Google Drive will (recursively) delete the item => don't prematurely do this now: wait for change notifications! + //OR: item without parents located in "Shared with me", but referenced via Shortcut => don't remove!!! - it->second = *details; -@@ -1749,7 +1749,7 @@ +@@ -2144,7 +2144,7 @@ { for (const std::string& parentId : it->second.parentIds) //1. delete from parent folders if (auto itP = folderContents_.find(parentId); itP != folderContents_.end()) @@ -69,8 +69,8 @@ diff -x '*.swp' -x '*.git*' -x '*.orig' -x '*.rej' -Naur 10.24-0/FreeFileSync/So itemDetails_.erase(it); } -@@ -1757,7 +1757,7 @@ - if (auto itP = folderContents_.find(itemId); itP != folderContents_.end()) +@@ -2153,7 +2153,7 @@ + itP != folderContents_.end()) { for (auto itChild : itP->second.childItems) //2. delete as parent from child items (don't wait for change notifications of children) - std::erase_if(itChild->second.parentIds, [&](const std::string& id) { return id == itemId; }); @@ -242,18 +242,18 @@ diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source SetString(pos, wxString()); //in contrast to Delete(), this one does not kill the drop-down list and gives a nice visual feedback! //Delete(pos); -diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source/ui/file_view.cpp 10.18-2/FreeFileSync/Source/ui/file_view.cpp ---- 10.18-1/FreeFileSync/Source/ui/file_view.cpp 2019-11-20 16:15:55.849668360 -0500 -+++ 10.18-2/FreeFileSync/Source/ui/file_view.cpp 2019-11-20 17:57:30.562558429 -0500 -@@ -253,7 +253,7 @@ - rowPositionsFirstChild_.clear(); - +diff -Naur 10.25-0/FreeFileSync/Source/ui/file_view.cpp 10.25-1/FreeFileSync/Source/ui/file_view.cpp +--- 10.25-0/FreeFileSync/Source/ui/file_view.cpp 2020-06-19 16:17:15.000000000 -0400 ++++ 10.25-1/FreeFileSync/Source/ui/file_view.cpp 2020-06-20 20:55:25.978009894 -0400 +@@ -321,7 +321,7 @@ + void FileView::removeInvalidRows() + { //remove rows that have been deleted meanwhile -- std::erase_if(sortedRef_, [&](const RefIndex& refIdx) { return !FileSystemObject::retrieve(refIdx.objId); }); -+ eraseIf(sortedRef_, [&](const RefIndex& refIdx) { return !FileSystemObject::retrieve(refIdx.objId); }); - } - +- std::erase_if(sortedRef_, [&](const FileSystemObject::ObjectId& objId) { return !FileSystemObject::retrieve(objId); }); ++ eraseIf(sortedRef_, [&](const FileSystemObject::ObjectId& objId) { return !FileSystemObject::retrieve(objId); }); + viewRef_ .clear(); + rowPositions_ .clear(); diff -x '*.swp' -x .git -x '*.orig' -x '*.rej' -Naur 10.18-1/FreeFileSync/Source/ui/folder_history_box.h 10.18-2/FreeFileSync/Source/ui/folder_history_box.h --- 10.18-1/FreeFileSync/Source/ui/folder_history_box.h 2019-11-20 16:15:55.849668360 -0500 +++ 10.18-2/FreeFileSync/Source/ui/folder_history_box.h 2019-11-20 17:57:30.562558429 -0500 diff --git a/freefilesync/ffs_no_wx311.patch b/freefilesync/ffs_no_wx311.patch index f617122..22d8260 100644 --- a/freefilesync/ffs_no_wx311.patch +++ b/freefilesync/ffs_no_wx311.patch @@ -1,11 +1,21 @@ 2019-08-15 just compile. -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 ---- 10.3-0/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 07:56:06.714625467 -0500 -+++ 10.19-1/FreeFileSync/Source/ui/small_dlgs.cpp 2019-12-27 08:41:43.498308243 -0500 -@@ -1546,7 +1546,7 @@ +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 ++++ 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())); + } +- m_listBoxGdriveUsers->Append(gdriveAccounts); ++ for (const wxString& item : gdriveAccounts) // reverted to pre-wx 3.1.1 logic ++ m_listBoxGdriveUsers->Append(item); + + //set default values for Google Drive: use first item of m_listBoxGdriveUsers + if (!gdriveAccounts.empty() && !acceptsItemPathPhraseGdrive(folderPathPhrase)) +@@ -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 914c333..030b863 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -19,7 +19,7 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 10.24 +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/freefilesync/revert_zenju_aggressive_upstreamisms.patch b/freefilesync/revert_zenju_aggressive_upstreamisms.patch index 0da4e06..522080d 100644 --- a/freefilesync/revert_zenju_aggressive_upstreamisms.patch +++ b/freefilesync/revert_zenju_aggressive_upstreamisms.patch @@ -1,8 +1,8 @@ Author: Ben Stack <bgstack15@gmail.com> -Date: 2020-05-17 14:11 -0400 +Date: 2020-06-21 16:45 -0400 Message: Use the following command to get this old contents. Zenju must be using some newer definition of -std=c++2a than what Devuan Ceres provides as of 2020-05-17, and probably wxwidgets. This is the 10.23 code for these files. - git checkout b4ecf755 zen/legacy_compiler.h zen/string_base.h wx+/choice_enum.h + git checkout b4ecf755 wx+/choice_enum.h Unfortunately with the removal of the wxWidgets-gtk2 code from Debian, we are stuck using all available at approximately November 1, 2019 snapshot of Debian: https://snapshot.debian.org/archive/debian/20191101T211023Z/pool/main/w/wxwidgets3.0/ libwxbase3.0-0v5_3.0.4+dfsg-14_amd64.deb @@ -16,169 +16,6 @@ libwxgtk3.0-dev_3.0.4+dfsg-14_i386.deb wx3.0-headers_3.0.4+dfsg-14_all.deb wx-common_3.0.4+dfsg-14_amd64.deb wx-common_3.0.4+dfsg-14_i386.deb -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/zen/legacy_compiler.h 10.24-1/zen/legacy_compiler.h ---- 10.24-0/zen/legacy_compiler.h 2020-05-17 13:44:27.542140458 -0400 -+++ 10.24-1/zen/legacy_compiler.h 2020-05-17 14:07:49.115166339 -0400 -@@ -7,9 +7,6 @@ - #ifndef LEGACY_COMPILER_H_839567308565656789 - #define LEGACY_COMPILER_H_839567308565656789 - -- #include <numbers> //C++20 -- -- #include <span> //requires C++20 - - - -@@ -21,8 +18,53 @@ - - //--------------------------------------------------------------------------------- - -+#if __cpp_lib_span -+ #error get rid of workaround: -+#endif -+ -+template <class T> -+class span -+{ -+public: -+ template <class Iterator> -+ span(Iterator first, Iterator last) : size_(last - first), data_(first != last ? &*first : nullptr) {} -+ -+ template <class Container> -+ span(Container& cont) : span(cont.begin(), cont.end()) {} -+ -+ using iterator = T*; -+ using const_iterator = const T*; -+ -+ iterator begin() { return data_; } -+ iterator end () { return data_ + size_; } -+ -+ const_iterator begin() const { return data_; } -+ const_iterator end () const { return data_ + size_; } - -+ const_iterator cbegin() const { return begin(); } -+ const_iterator cend () const { return end (); } - -+ T* data() const { return data_; } -+ size_t size() const { return size_; } -+ bool empty() const { return size_ == 0; } -+ -+private: -+ const size_t size_; -+ T* const data_; -+}; -+ -+ -+#if __cpp_lib_math_constants -+ #error get rid of workaround: -+#endif -+ -+namespace numbers -+{ -+const double pi = 3.14159265358979323846; -+const double e = 2.71828182845904523536; -+const double sqrt2 = 1.41421356237309504880; -+const double ln2 = 0.693147180559945309417; -+} - } - - -diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/zen/string_base.h 10.24-1/zen/string_base.h ---- 10.24-0/zen/string_base.h 2020-05-17 13:44:27.554140569 -0400 -+++ 10.24-1/zen/string_base.h 2020-05-17 14:09:44.164244361 -0400 -@@ -12,7 +12,9 @@ - #include <cstdint> - #include <atomic> - #include "string_tools.h" -+#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison - #include <compare> -+#endif - - - //Zbase - a policy based string class optimizing performance and flexibility -@@ -293,15 +295,29 @@ - }; - - -+#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison -+ #error implement! -+#endif -+ - - template <class Char, template <class> class SP> bool operator==(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs); - template <class Char, template <class> class SP> bool operator==(const Zbase<Char, SP>& lhs, const Char* rhs); - template <class Char, template <class> class SP> inline bool operator==(const Char* lhs, const Zbase<Char, SP>& rhs) { return operator==(rhs, lhs); } - -+#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison - template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs); - template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Char* rhs); - template <class Char, template <class> class SP> std::strong_ordering operator<=>(const Char* lhs, const Zbase<Char, SP>& rhs); - -+#else -+template <class Char, template <class> class SP> inline bool operator!=(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) { return !operator==(lhs, rhs); } -+template <class Char, template <class> class SP> inline bool operator!=(const Zbase<Char, SP>& lhs, const Char* rhs) { return !operator==(lhs, rhs); } -+template <class Char, template <class> class SP> inline bool operator!=(const Char* lhs, const Zbase<Char, SP>& rhs) { return !operator==(lhs, rhs); } -+ -+template <class Char, template <class> class SP> bool operator<(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs); -+template <class Char, template <class> class SP> bool operator<(const Zbase<Char, SP>& lhs, const Char* rhs); -+template <class Char, template <class> class SP> bool operator<(const Char* lhs, const Zbase<Char, SP>& rhs); -+#endif - - template <class Char, template <class> class SP> inline Zbase<Char, SP> operator+(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) { return Zbase<Char, SP>(lhs) += rhs; } - template <class Char, template <class> class SP> inline Zbase<Char, SP> operator+(const Zbase<Char, SP>& lhs, const Char* rhs) { return Zbase<Char, SP>(lhs) += rhs; } -@@ -482,11 +498,12 @@ - } - - -+#if __cpp_impl_three_way_comparison && __cpp_lib_three_way_comparison - template <class Char, template <class> class SP> inline - std::strong_ordering operator<=>(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) - { -- return std::lexicographical_compare_three_way(lhs.begin(), lhs.end(), //respect embedded 0 -- rhs.begin(), rhs.end()); // -+ return std::lexicographical_compare_three_way(lhs.begin(), lhs.end(), //respect embedded 0 -+ rhs.begin(), rhs.end()); - } - - -@@ -501,11 +518,35 @@ - template <class Char, template <class> class SP> inline - std::strong_ordering operator<=>(const Char* lhs, const Zbase<Char, SP>& rhs) - { -- return std::lexicographical_compare_three_way(lhs, lhs + strLength(lhs), -- rhs.begin(), rhs.end()); //respect embedded 0 -+ return std::lexicographical_compare_three_way(lhs, lhs + strLength(lhs), //respect embedded 0 -+ rhs.begin(), rhs.end()); -+} -+ -+#else -+template <class Char, template <class> class SP> inline -+bool operator<(const Zbase<Char, SP>& lhs, const Zbase<Char, SP>& rhs) -+{ -+ return std::lexicographical_compare(lhs.begin(), lhs.end(), //respect embedded 0 -+ rhs.begin(), rhs.end()); - } - - -+template <class Char, template <class> class SP> inline -+bool operator<(const Zbase<Char, SP>& lhs, const Char* rhs) -+{ -+ return std::lexicographical_compare(lhs.begin(), lhs.end(), //respect embedded 0 -+ rhs, rhs + strLength(rhs)); -+} -+ -+ -+template <class Char, template <class> class SP> inline -+bool operator<(const Char* lhs, const Zbase<Char, SP>& rhs) -+{ -+ return std::lexicographical_compare(lhs, lhs + strLength(lhs), //respect embedded 0 -+ rhs.begin(), rhs.end()); -+} -+#endif -+ - - template <class Char, template <class> class SP> inline - size_t Zbase<Char, SP>::length() const diff -x '*.rej' -x '*.orig' -x '*.git*' -Naur 10.24-0/wx+/choice_enum.h 10.24-1/wx+/choice_enum.h --- 10.24-0/wx+/choice_enum.h 2020-05-17 18:30:59.441499418 -0400 +++ 10.24-1/wx+/choice_enum.h 2020-05-17 18:53:59.893685507 -0400 diff --git a/irfanview/debian/bin/irfanview-common b/irfanview/debian/bin/irfanview-common index 6c178fc..9dcb4b0 100755 --- a/irfanview/debian/bin/irfanview-common +++ b/irfanview/debian/bin/irfanview-common @@ -11,6 +11,8 @@ # 2019-06-16 remove DEVTTY in favor of just showing on current tty # 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. @@ -24,7 +26,8 @@ then false else -IV_VERSION="2019-06-16b" +IV_VERSION="2020-07-14a" +echobin="$( which echo )" # Define functions expandword() { @@ -32,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 @@ -47,22 +50,23 @@ 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 ${_word}" + ${echobin} "File:1 ${_word}" thisfile="$( getwinepath "${_word}" )" - irfanfiles="${irfanfiles} ${thisfile}" + ${echobin} "File:2 ${thisfile}" + irfanfiles="${irfanfiles} '${thisfile}'" ;; esac fi @@ -84,12 +88,12 @@ for word in "${@}"; do expandword "${word}" done -irfanfiles="${irfanfiles## }" +irfanfiles="$( ${echobin} "${irfanfiles## }" | sed -r -e 's/\r//g;' )" # run wine cd $WINEPREFIX -printf wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} -wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} & +${echobin} wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} +eval wine \"${IV_EXEC_PATH}\" "${irfanargs}" "${irfanfiles}" & wait %1 for thistempdir in ${alltempdirs}; diff --git a/irfanview/debian/changelog b/irfanview/debian/changelog index 5c0c4a8..29fede5 100644 --- a/irfanview/debian/changelog +++ b/irfanview/debian/changelog @@ -1,3 +1,15 @@ +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 + + -- B Stack <bgstack15@gmail.com> Thu, 18 Jun 2020 08:40:27 -0400 + irfanview (4.54-1+devuan) obs; urgency=medium - Version 4.54 Release date: 2019-12-12 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/debian/control b/irfanview/debian/control index 0070ef4..5b8950c 100644 --- a/irfanview/debian/control +++ b/irfanview/debian/control @@ -2,9 +2,12 @@ Source: irfanview Section: graphics Priority: optional Maintainer: B Stack <bgstack15@gmail.com> -Build-Depends: debhelper (>=11~), +Build-Depends: debhelper (>=12~), +# bgscripts for txtman-wrapper + bgscripts-core (>=1.5.0), imagemagick, - librsvg2-bin + librsvg2-bin, + txt2man Standards-Version: 4.1.4 Homepage: https://irfanview.info/ @@ -33,6 +36,7 @@ Multi-Arch: foreign Depends: ${misc:Depends}, ${shlibs:Depends}, wine64 | wine-staging | winehq | winehq-staging | wine-stable, irfanview-common +Suggests: xchm Provides: irfanview, x-graphics-viewer Description: graphics viewer from a non-free OS The 64-bit release diff --git a/irfanview/debian/irfanview-bin32.lintian-overrides b/irfanview/debian/irfanview-bin32.lintian-overrides new file mode 100644 index 0000000..62aa1bd --- /dev/null +++ b/irfanview/debian/irfanview-bin32.lintian-overrides @@ -0,0 +1,4 @@ +copyright-has-url-from-dh_make-boilerplate +copyright-without-copyright-notice +file-in-usr-marked-as-conffile usr/share/irfanview32/i_view32.ini +non-standard-file-perm usr/share/irfanview32/i_view32.ini * diff --git a/irfanview/debian/irfanview-bin32.manpages b/irfanview/debian/irfanview-bin32.manpages new file mode 100644 index 0000000..fd31f1b --- /dev/null +++ b/irfanview/debian/irfanview-bin32.manpages @@ -0,0 +1 @@ +debian/irfanview-bin32/usr/share/man/man1/* diff --git a/irfanview/debian/irfanview-bin64.lintian-overrides b/irfanview/debian/irfanview-bin64.lintian-overrides new file mode 100644 index 0000000..0bae588 --- /dev/null +++ b/irfanview/debian/irfanview-bin64.lintian-overrides @@ -0,0 +1,4 @@ +copyright-has-url-from-dh_make-boilerplate +copyright-without-copyright-notice +file-in-usr-marked-as-conffile usr/share/irfanview64/i_view64.ini +non-standard-file-perm usr/share/irfanview64/i_view64.ini * diff --git a/irfanview/debian/irfanview-bin64.manpages b/irfanview/debian/irfanview-bin64.manpages new file mode 100644 index 0000000..ba0ebda --- /dev/null +++ b/irfanview/debian/irfanview-bin64.manpages @@ -0,0 +1 @@ +debian/irfanview-bin64/usr/share/man/man1/* diff --git a/irfanview/debian/irfanview-common.lintian-overrides b/irfanview/debian/irfanview-common.lintian-overrides new file mode 100644 index 0000000..d5a5720 --- /dev/null +++ b/irfanview/debian/irfanview-common.lintian-overrides @@ -0,0 +1,4 @@ +binary-without-manpage +copyright-has-url-from-dh_make-boilerplate +copyright-without-copyright-notice +desktop-command-not-in-package diff --git a/irfanview/debian/irfanview32.1.txt b/irfanview/debian/irfanview32.1.txt new file mode 100644 index 0000000..f2193da --- /dev/null +++ b/irfanview/debian/irfanview32.1.txt @@ -0,0 +1,23 @@ +title irfanview-bin32 +section 1 +project irfanview +volume General Commands Manual +date June 2020 +===== +NAME + irfanview-bin32 - graphics viewer that runs via wine, 32-bit version +SYNOPSIS + irfanview [FILE1 [FILE2...]] +DESCRIPTION + Run a graphics viewer from a non-free operating system. +ENVIRONMENT +* IV_WINEPREFIX = ~/.wine +* IV_EXEC_PATH = /usr/share/irfanview32/i_view32.exe +AUTHOR + bgstack15@gmail.com +COPYRIGHT + CC-BY-SA 4.0 +BUGS + The invocation of i_view32.exe with filenames can get messed up, usually due to spaces. +SEE ALSO + `/usr/share/irfanview32/i_view32.chm` diff --git a/irfanview/debian/irfanview64.1.txt b/irfanview/debian/irfanview64.1.txt new file mode 100644 index 0000000..6d93e63 --- /dev/null +++ b/irfanview/debian/irfanview64.1.txt @@ -0,0 +1,23 @@ +title irfanview-bin64 +section 1 +project irfanview +volume General Commands Manual +date June 2020 +===== +NAME + irfanview-bin64 - graphics viewer that runs via wine, 64-bit version +SYNOPSIS + irfanview [FILE1 [FILE2...]] +DESCRIPTION + Run a graphics viewer from a non-free operating system. +ENVIRONMENT +* IV_WINEPREFIX = ~/.wine +* IV_EXEC_PATH = /usr/share/irfanview64/i_view64.exe +AUTHOR + bgstack15@gmail.com +COPYRIGHT + CC-BY-SA 4.0 +BUGS + The invocation of i_view64.exe with filenames can get messed up, usually due to spaces. +SEE ALSO + `/usr/share/irfanview64/i_view32.chm` diff --git a/irfanview/debian/rules b/irfanview/debian/rules index c05c160..32f82d8 100755 --- a/irfanview/debian/rules +++ b/irfanview/debian/rules @@ -7,6 +7,7 @@ export _prefix=/usr export _datadir="${_prefix}/share" +export _mandir="${_datadir}/man" export appname=irfanview export appname_32=irfanview-bin32 export appname_64=irfanview-bin64 @@ -53,6 +54,11 @@ override_dh_auto_install: cp -p irfanview-circle.svg ${buildroot_common}${_datadir}/icons/hicolor/scalable/apps/${appname}.svg rm -f ./irfanview-circle.svg || : + @# man pages + mkdir -p ${buildroot_32}/${_mandir}/man1 ${buildroot_64}/${_mandir}/man1 + txt2man-wrapper - < ${debuilddir}/irfanview32.1.txt | gzip > ${buildroot_32}/${_mandir}/man1/irfanview32.1.gz + txt2man-wrapper - < ${debuilddir}/irfanview64.1.txt | gzip > ${buildroot_64}/${_mandir}/man1/irfanview64.1.gz + override_dh_auto_clean: dh_auto_clean rm -rf ./irfanview-circle.svg || : diff --git a/irfanview/debian/source/lintian-overrides b/irfanview/debian/source/lintian-overrides new file mode 100644 index 0000000..999c2a5 --- /dev/null +++ b/irfanview/debian/source/lintian-overrides @@ -0,0 +1,5 @@ +file-without-copyright-information +maintainer-script-lacks-debhelper-token +missing-license-paragraph-in-dep5-copyright +source-contains-prebuilt-ms-help-file +source-contains-prebuilt-windows-binary diff --git a/irfanview/irfanview-common b/irfanview/irfanview-common index 6c178fc..9dcb4b0 100755 --- a/irfanview/irfanview-common +++ b/irfanview/irfanview-common @@ -11,6 +11,8 @@ # 2019-06-16 remove DEVTTY in favor of just showing on current tty # 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. @@ -24,7 +26,8 @@ then false else -IV_VERSION="2019-06-16b" +IV_VERSION="2020-07-14a" +echobin="$( which echo )" # Define functions expandword() { @@ -32,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 @@ -47,22 +50,23 @@ 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 ${_word}" + ${echobin} "File:1 ${_word}" thisfile="$( getwinepath "${_word}" )" - irfanfiles="${irfanfiles} ${thisfile}" + ${echobin} "File:2 ${thisfile}" + irfanfiles="${irfanfiles} '${thisfile}'" ;; esac fi @@ -84,12 +88,12 @@ for word in "${@}"; do expandword "${word}" done -irfanfiles="${irfanfiles## }" +irfanfiles="$( ${echobin} "${irfanfiles## }" | sed -r -e 's/\r//g;' )" # run wine cd $WINEPREFIX -printf wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} -wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} & +${echobin} wine "${IV_EXEC_PATH}" ${irfanargs} ${irfanfiles} +eval wine \"${IV_EXEC_PATH}\" "${irfanargs}" "${irfanfiles}" & wait %1 for thistempdir in ${alltempdirs}; diff --git a/irfanview/irfanview.spec b/irfanview/irfanview.spec index 74b44e3..85c2cdf 100644 --- a/irfanview/irfanview.spec +++ b/irfanview/irfanview.spec @@ -6,7 +6,7 @@ Name: irfanview Version: 4.54 -Release: 1 +Release: 3 Summary: irfanview is a graphics viewer %define version_num %( echo %version | tr -d '\.' ) @@ -204,6 +204,12 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %{_datadir}/%{name}64 %changelog +* 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 - version bump 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 ea0ad1b..61d8857 100644 --- a/notepadpp/debian/changelog +++ b/notepadpp/debian/changelog @@ -1,7 +1,31 @@ +notepadpp (7.8.7-1+devuan) obs; urgency=medium + + - Enhancements and bug-fixes + * Fix new style save dialog by selecting right file filter and adding extension automatically. + * Add right-click context menu to bookmark margin. + * Add sub-menu bullets for cascaded Encoding and Language menus. + * Display file name as root of workspace instead of "Workspace". + * Add file extension automatically for session files and workspace files while saving in new style dialog. + * Fix file reading failure (network problem) not detected issue. + * Improve Document Map precision. + * Fix clickable links break syntax highlighting issue. + * Fix current range detached from Document Map issue. + * Disallow backward regex searches due to sometimes surprising results ([an non-UI option is available to enable it](https://npp-user-manual.org/docs/preferences/#preferences-for-advanced-users)). + * Fix wrong project panel at start by opening a project via command line. + * Allow user to skip *.* when adding only excluding Filters for Find/Replace In Files. + * Fix Doc switcher icon state update issue for cloned documents. + * Assign CTRL-M as default shortcut for invoking mark dialog. + * Fix also a folding visual glitch in Find result. + * Add count of files searched to "Find result" output. + * Fix Find/Replace history lost issue. + * Fix bug of Mark clearing in selection mode. + * Fix auto-completion suggest the same word while the word being modified. + + -- Ben Stack <bgstack15@gmail.com> Wed, 17 Jun 2020 13:28:48 -0400 + notepadpp (7.8.6-1+devuan) obs; urgency=medium - Bug-fixes and enhancements - * Add multi-column marker (multi-line edge) feature. * Add dynamical sorting feature for Folder as Workspace. * Make MRU tab activate instead of rightmost tab while tab closure (if MRU enabled). diff --git a/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec b/palemoon-stackrpms-ublock-origin/palemoon-stackrpms-ublock-origin.spec index 06e5677..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.20 +Version: 1.16.4.23 Release: 1 Summary: uBlock Origin installed to the system Pale Moon extensions directory @@ -51,6 +51,15 @@ 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 + +* Mon Jun 29 2020 B Stack <bgstack15@gmail.com> - 1.16.4.21-1 +- Update + * Wed Mar 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.20-1 - Update diff --git a/palemoon-ublock-origin/debian/changelog b/palemoon-ublock-origin/debian/changelog index e5ebb97..9f99ac5 100644 --- a/palemoon-ublock-origin/debian/changelog +++ b/palemoon-ublock-origin/debian/changelog @@ -1,3 +1,21 @@ +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 + + -- B Stack <bgstack15@gmail.com> Sat, 04 Jul 2020 11:51:55 -0400 + +palemoon-ublock-origin (1.16.4.21-1+devuan) obs; urgency=medium + + * Update + + -- B Stack <bgstack15@gmail.com> Mon, 29 Jun 2020 10:21:52 -0400 + palemoon-ublock-origin (1.16.4.20-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 18d1807..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.20 +Version: 1.16.4.23 Release: 1 Summary: uBlock Origin installed to the system Pale Moon extensions directory @@ -51,6 +51,15 @@ 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 + +* Mon Jun 29 2020 B Stack <bgstack15@gmail.com> - 1.16.4.21-1 +- Update + * Wed Mar 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.20-1 - Update diff --git a/palemoon/README.md b/palemoon/README.md index 0f5b089..500a3b1 100644 --- a/palemoon/README.md +++ b/palemoon/README.md @@ -10,10 +10,14 @@ Palemoon itself is a fork from Mozilla Firefox, which is still actively maintain # Reverse dependency matrix Distro | Palemoon version ---------- | --------------- -All | 28.7.2 +All | 28.10.0 # Additional notes -See [credits.md](credits.md) for more references. +Credit goes to so many sources and inspirations: +* trava90 of the Pale Moon project +* firefox-61.0.2-3.fc28.src.rpm +* https://build.opensuse.org/package/view_file/network/palemoon/palemoon.spec?expand=1 +* instructions for compiling on centos 6 and 7 http://developer.palemoon.org/Developer_Guide:Build_Instructions/Pale_Moon/Linux#head:CentOS_6 # Differences from upstream None diff --git a/palemoon/bgstack15-palemoon-prefs.js b/palemoon/bgstack15-palemoon-prefs.js index 8958c78..5848539 100644 --- a/palemoon/bgstack15-palemoon-prefs.js +++ b/palemoon/bgstack15-palemoon-prefs.js @@ -14,6 +14,9 @@ pref("browser.search.update", false); pref("browser.sessionstore.restore_on_demand", false); pref("browser.startup.page", 3); pref("browser.tabs.closeWindowWithLastTab", false); +// These two have to stay undefined in Firefox 77+ in order for the drop-down for autocompletion to still work. +//pref("browser.urlbar.disableExtendForTests", true); +//pref("browser.urlbar.maxRichResults", 0); pref("browser.urlbar.trimURLs", false); pref("browser.urlbar.update1", false); pref("browser.xul.error_pages.enabled", false); diff --git a/palemoon/credits.md b/palemoon/credits.md deleted file mode 100644 index 35d05f4..0000000 --- a/palemoon/credits.md +++ /dev/null @@ -1,5 +0,0 @@ -Credit goes to so many sources and inspirations: -* trava90 of the Pale Moon project -* firefox-61.0.2-3.fc28.src.rpm -* https://build.opensuse.org/package/view_file/network/palemoon/palemoon.spec?expand=1 -* instructions for compiling on centos 6 and 7 http://developer.palemoon.org/Developer_Guide:Build_Instructions/Pale_Moon/Linux#head:CentOS_6 diff --git a/palemoon/debian/bgstack15-palemoon-prefs.js b/palemoon/debian/bgstack15-palemoon-prefs.js index 8958c78..5848539 100644 --- a/palemoon/debian/bgstack15-palemoon-prefs.js +++ b/palemoon/debian/bgstack15-palemoon-prefs.js @@ -14,6 +14,9 @@ pref("browser.search.update", false); pref("browser.sessionstore.restore_on_demand", false); pref("browser.startup.page", 3); pref("browser.tabs.closeWindowWithLastTab", false); +// These two have to stay undefined in Firefox 77+ in order for the drop-down for autocompletion to still work. +//pref("browser.urlbar.disableExtendForTests", true); +//pref("browser.urlbar.maxRichResults", 0); pref("browser.urlbar.trimURLs", false); pref("browser.urlbar.update1", false); pref("browser.xul.error_pages.enabled", false); diff --git a/palemoon/debian/changelog b/palemoon/debian/changelog index 5aed8ef..192aad6 100644 --- a/palemoon/debian/changelog +++ b/palemoon/debian/changelog @@ -1,3 +1,35 @@ +palemoon (28.10.0-1+devuan) obs; urgency=medium + + * This is a development, bugfix and security update. + - Implemented URLSearchParams' sort() function + - Implemented ES2020 globalThis for web compatibility + - Improved our WebM media parser to be more tolerant to different encoding + - styles. + - Improved our MP3 media parser to be more tolerant to different encoding + - styles and particularly tiny files/stream chunks. + - Improved performance of table drawing for more corner cases + - Changed the way images without a src are handled in page layouts to align + - with the Chrome-pushed spec. + - Added modern MIPS support + - Split out the ICU data file from xul.dll on Windows + - Fixed a regression in WebAudio channel handling due to a landed security + - fix. + - Fixed a regression preventing scripting from properly disabling input + - controls + - Fixed an issue with border radius sometimes not being honored in tables + - Fixed some build issues in non-standard configurations. + - Removed more telemetry code + - Removed the in-browser speech recognition engine and API + - Removed support for the obsolete and unmaintained NVidia 3DVision + - stereoscopic interface. + - Changed handling of braille blanks in the ui (CVE-2020-12409) DiD + - Mitigated a potential timing attack against DSA keys in NSS + - (CVE-2020-12399) + - Unified XUL Platform Mozilla Security Patch Summary: 1 fixed, 1 + - defense-in-depth, 8 not applicable. + + -- Ben Stack <bgstack15@gmail.com> Fri, 05 Jun 2020 09:15:04 -0400 + palemoon (28.9.3-1+devuan) obs; urgency=medium * This is a security update. diff --git a/palemoon/debian/palemoon_devuan.dsc b/palemoon/debian/palemoon_devuan.dsc index b59295b..3e314ec 100644 --- a/palemoon/debian/palemoon_devuan.dsc +++ b/palemoon/debian/palemoon_devuan.dsc @@ -2,7 +2,7 @@ Format: 3.0 (quilt) Source: palemoon Binary: palemoon Architecture: any -Version: 28.9.3-1+devuan +Version: 28.10.0-1+devuan Maintainer: B Stack <bgstack15@gmail.com> Homepage: http://www.palemoon.org/ Standards-Version: 4.1.4 diff --git a/palemoon/palemoon.spec b/palemoon/palemoon.spec index 1ea1ddc..b130f4c 100644 --- a/palemoon/palemoon.spec +++ b/palemoon/palemoon.spec @@ -5,7 +5,7 @@ %global stackrpms_custom 1 # derive from inside the full source tree or from notes at https://github.com/MoonchildProductions/Pale-Moon/releases # git submodule | awk -v "name=platform" '$2 == name {gsub("-","",$1); print $1}' -%global submodule_platform_tag RELBASE_20200506 +%global submodule_platform_tag RELBASE_20200603 # additional repos to get python27 and devtoolset-7 # for el6 and el7: Software Collection;, for x86_64 only @@ -42,8 +42,8 @@ Name: palemoon-stackrpms Name: palemoon %endif Summary: Pale Moon web browser -Version: 28.9.3 -Release: 2 +Version: 28.10.0 +Release: 1 Group: Networking/Web License: MPLv2.0 @@ -285,6 +285,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %doc AUTHORS LICENSE %changelog +* Fri Jun 05 2020 B Stack <bgstack15@gmail.com> - 28.10.0-1 +- update version + * Tue May 26 2020 B Stack <bgstack15@gmail.com> - 28.9.3-2 - add the aboutdialog customization diff --git a/waterfox-ublock-origin/debian/changelog b/waterfox-ublock-origin/debian/changelog index 23f7ee5..2d43faf 100644 --- a/waterfox-ublock-origin/debian/changelog +++ b/waterfox-ublock-origin/debian/changelog @@ -1,3 +1,21 @@ +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 + + -- B Stack <bgstack15@gmail.com> Sat, 04 Jul 2020 11:51:55 -0400 + +waterfox-ublock-origin (1.16.4.21-1+devuan) obs; urgency=medium + + * Update + + -- B Stack <bgstack15@gmail.com> Mon, 29 Jun 2020 10:21:52 -0400 + waterfox-ublock-origin (1.16.4.20-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 b789772..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.20 +Version: 1.16.4.23 Release: 1 Summary: uBlock Origin installed to system Waterfox extensions directory @@ -52,6 +52,15 @@ 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 + +* Mon Jun 29 2020 B Stack <bgstack15@gmail.com> - 1.16.4.21-1 +- Update + * Wed Mar 18 2020 B Stack <bgstack15@gmail.com> - 1.16.4.20-1 - Update diff --git a/waterfox/README.md b/waterfox/README.md index 642c136..11400d5 100644 --- a/waterfox/README.md +++ b/waterfox/README.md @@ -17,6 +17,7 @@ All | 2020.01-classic # Additional info * 2020-03-19 [https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md](https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md) is where the rpm scriptlet `_legacy_common_support 1` comes from, for telling gcc 10 to use `-fcommon` +* [https://github.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage](https://github.com/hawkeye116477/waterfox-deb-rpm-arch-AppImage) # Differences from upstream ## rpm diff --git a/waterfox/bgstack15-waterfox-prefs.js b/waterfox/bgstack15-waterfox-prefs.js index d5d7825..716667c 100644 --- a/waterfox/bgstack15-waterfox-prefs.js +++ b/waterfox/bgstack15-waterfox-prefs.js @@ -28,6 +28,9 @@ pref("browser.startup.page", 3); pref("browser.tabs.closeWindowWithLastTab", false); pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"e10s-button\",\"privatebrowsing-button\",\"save-page-button\",\"print-button\",\"history-panelmenu\",\"fullscreen-button\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"sync-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"urlbar-container\",\"bookmarks-menu-button\",\"downloads-button\",\"home-button\",\"jid1-n8wh2cbfc2qauj_jetpack-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"_f73df109-8fb4-453e-8373-f59e61ca4da3_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[\"jid1-n8wh2cbfc2qauj_jetpack-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"_f73df109-8fb4-453e-8373-f59e61ca4da3_-browser-action\",\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":6,\"newElementCount\":0}"); pref("browser.uidensity", 1); +// These two have to stay undefined in Firefox 77+ in order for the drop-down for autocompletion to still work. +//pref("browser.urlbar.disableExtendForTests", true); +//pref("browser.urlbar.maxRichResults", 0); pref("browser.urlbar.trimURLs", false); pref("browser.urlbar.update1", false); pref("browser.xul.error_pages.enabled", false); diff --git a/waterfox/debian/bgstack15-waterfox-prefs.js b/waterfox/debian/bgstack15-waterfox-prefs.js index d5d7825..716667c 100644 --- a/waterfox/debian/bgstack15-waterfox-prefs.js +++ b/waterfox/debian/bgstack15-waterfox-prefs.js @@ -28,6 +28,9 @@ pref("browser.startup.page", 3); pref("browser.tabs.closeWindowWithLastTab", false); pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"e10s-button\",\"privatebrowsing-button\",\"save-page-button\",\"print-button\",\"history-panelmenu\",\"fullscreen-button\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"sync-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"urlbar-container\",\"bookmarks-menu-button\",\"downloads-button\",\"home-button\",\"jid1-n8wh2cbfc2qauj_jetpack-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"_f73df109-8fb4-453e-8373-f59e61ca4da3_-browser-action\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[\"jid1-n8wh2cbfc2qauj_jetpack-browser-action\",\"ublock0_raymondhill_net-browser-action\",\"_f73df109-8fb4-453e-8373-f59e61ca4da3_-browser-action\",\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":6,\"newElementCount\":0}"); pref("browser.uidensity", 1); +// These two have to stay undefined in Firefox 77+ in order for the drop-down for autocompletion to still work. +//pref("browser.urlbar.disableExtendForTests", true); +//pref("browser.urlbar.maxRichResults", 0); pref("browser.urlbar.trimURLs", false); pref("browser.urlbar.update1", false); pref("browser.xul.error_pages.enabled", false); diff --git a/waterfox/debian/changelog b/waterfox/debian/changelog index 368d383..72a2da9 100644 --- a/waterfox/debian/changelog +++ b/waterfox/debian/changelog @@ -1,3 +1,26 @@ +waterfox (2020.06-1+devuan) obs; urgency=medium + + - Latest security advisories patched (best effort). + * Note: Aware of issues with some websites such as Netflix! It is + being investigated. + * As the differences between Classic and later Firefox versions + grow, we are doing our best to patch the security advisories as + we think apply to Classic. + + -- Ben Stack <bgstack15@gmail.com> Sat, 04 Jul 2020 12:04:59 -0400 + +waterfox (2020.06-1+devuan) obs; urgency=medium + + - Latest security advisories patched (best effort)* + - Various website compatibilty changes (Thanks to + [hawkeye116477](https://github.com/MrAlex94/Waterfox/issues?q=is%3Apr+author%3Ahawkeye116477)) + * JavaScript globalThis implemented + * Fix for WebAudio + * Partial Shadow DOM v1 support (experimental) + * Fix for some crashes + + -- Ben Stack <bgstack15@gmail.com> Thu, 04 Jun 2020 13:54:57 -0400 + waterfox (2020.05-1+devuan) obs; urgency=medium - Latest security advisories patched (best effort)* diff --git a/waterfox/debian/control b/waterfox/debian/control index 9ef1463..d272dd3 100644 --- a/waterfox/debian/control +++ b/waterfox/debian/control @@ -9,11 +9,11 @@ Build-Depends: debhelper (>= 12), binutils-avr, cargo (>= 0.35), ccache, - clang-6.0, + clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7, dpkg-dev (>= 1.16.1.1~), - libasound2-dev, + libasound2-dev, libbz2-dev, - libclang-6.0-dev, + libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libfontconfig-dev, @@ -31,9 +31,9 @@ Build-Depends: debhelper (>= 12), libx11-dev, libx11-xcb-dev, libxt-dev, - llvm-6.0-dev, + llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev, locales, - lsb-release, + lsb-release, python2.7, python-minimal (>= 2.6.6-13~), python-ply, diff --git a/waterfox/debian/mozconfig b/waterfox/debian/mozconfig index 0b6416a..e9f4bb6 100644 --- a/waterfox/debian/mozconfig +++ b/waterfox/debian/mozconfig @@ -1,5 +1,5 @@ -export CC=clang-6.0 -export CXX=clang++-6.0 +export CC=clang +export CXX=clang++ ac_add_options --prefix=/usr ac_add_options --enable-optimize="-O2" diff --git a/waterfox/debian/waterfox_devuan.dsc b/waterfox/debian/waterfox_devuan.dsc index 9c46b6b..34fd808 100644 --- a/waterfox/debian/waterfox_devuan.dsc +++ b/waterfox/debian/waterfox_devuan.dsc @@ -2,11 +2,11 @@ Format: 3.0 (quilt) Source: waterfox Binary: waterfox Architecture: any -Version: 2020.05-1+devuan +Version: 2020.07-1+devuan Maintainer: B Stack <bgstack15@gmail.com> Homepage: https://www.waterfox.net/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang-6.0, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-6.0-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libgconf2-dev, libglib2.0-dev (>= 2.16.0), libgtk2.0-dev (>= 2.10), libgtk-3-dev, libiw-dev, libjpeg-dev, libjsoncpp-dev, libnotify-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, libx11-dev, libx11-xcb-dev, libxt-dev, llvm-6.0-dev, locales, lsb-release, python2.7, python-minimal (>= 2.6.6-13~), python-ply, rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev +Build-Depends: debhelper (>= 12), autoconf2.13, autotools-dev, binutils-avr, cargo (>= 0.35), ccache, clang (>= 4.0) | clang-4.0 | clang-6.0 | clang-7, dpkg-dev (>= 1.16.1.1~), libasound2-dev, libbz2-dev, libclang-dev (>= 4.0) | libclang-4.0-dev | libclang-6.0-dev | libclang-7-dev, libdbus-glib-1-dev, libevent-dev (>= 1.4.1), libgconf2-dev, libglib2.0-dev (>= 2.16.0), libgtk2.0-dev (>= 2.10), libgtk-3-dev, libiw-dev, libjpeg-dev, libjsoncpp-dev, libnotify-dev, libreadline-dev, libstartup-notification0-dev, libtinfo-dev, libx11-dev, libx11-xcb-dev, libxt-dev, llvm-dev (>= 4.0) | llvm-4.0-dev | llvm-6.0-dev | llvm-7-dev, locales, lsb-release, python2.7, python-minimal (>= 2.6.6-13~), python-ply, rustc (>= 1.34), unzip, xauth, xfonts-base, xvfb, yasm (>= 1.1), zip, zlib1g-dev, libfontconfig-dev Package-List: waterfox deb web optional arch=any Files: diff --git a/waterfox/stackrpms-2019-03-06.diff b/waterfox/stackrpms-2019-03-06.diff deleted file mode 100644 index f05d9fd..0000000 --- a/waterfox/stackrpms-2019-03-06.diff +++ /dev/null @@ -1,134 +0,0 @@ -diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/distribution.ini stackrpms/waterfox/distribution.ini ---- chinforpms/waterfox/distribution.ini 2018-11-05 14:29:34.793145640 -0500 -+++ stackrpms/waterfox/distribution.ini 2019-01-15 11:12:47.458208372 -0500 -@@ -1,9 +1,9 @@ - [Global] --id=chinforpms -+id=stackrpms - version=1.0 - about=Waterfox for Fedora - - [Preferences] --app.distributor=chinforpms --app.distributor.channel=chinforpms --app.partner.fedora=chinforpms -+app.distributor=stackrpms -+app.distributor.channel=stackrpms -+app.partner.fedora=stackrpms -diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/issue2947383002_1.diff stackrpms/waterfox/issue2947383002_1.diff ---- chinforpms/waterfox/issue2947383002_1.diff 2018-11-05 14:29:34.794145647 -0500 -+++ stackrpms/waterfox/issue2947383002_1.diff 1969-12-31 19:00:00.000000000 -0500 -@@ -1,60 +0,0 @@ --Index: webrtc/common_audio/vad/vad_core.c --diff --git a/webrtc/common_audio/vad/vad_core.c b/webrtc/common_audio/vad/vad_core.c --index 0340165eb5050ec9fbc386f6d373d0d90a4868f1..1a3889c36787f7bf993692e8fe7781c2ae35e2c2 100644 ----- a/webrtc/common_audio/vad/vad_core.c --+++ b/webrtc/common_audio/vad/vad_core.c --@@ -115,8 +115,8 @@ static int32_t WeightedAverage(int16_t* data, int16_t offset, -- // undefined behavior, so not a good idea; this just makes UBSan ignore the -- // violation, so that our old code can continue to do what it's always been -- // doing.) ---static inline int32_t OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) --- RTC_NO_SANITIZE("signed-integer-overflow") { --+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") --+ OverflowingMulS16ByS32ToS32(int16_t a, int32_t b) { -- return a * b; -- } -- --Index: webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c --diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c --index 039bbc8af7ec26e286dfc94b4383428e5e6e863b..dc8bcf3f481012caab8718430aa9242cf91ad480 100644 ----- a/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c --+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/entropy_coding.c --@@ -193,16 +193,16 @@ static void CalcCorrelation(int32_t *PSpecQ12, int32_t *CorrQ7) -- // undefined behavior, so not a good idea; this just makes UBSan ignore the -- // violations, so that our old code can continue to do what it's always been -- // doing.) ---static inline int32_t OverflowingMulS16S32ToS32(int16_t a, int32_t b) --- RTC_NO_SANITIZE("signed-integer-overflow") { --+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") --+ OverflowingMulS16S32ToS32(int16_t a, int32_t b) { -- return a * b; -- } ---static inline int32_t OverflowingAddS32S32ToS32(int32_t a, int32_t b) --- RTC_NO_SANITIZE("signed-integer-overflow") { --+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") --+ OverflowingAddS32S32ToS32(int32_t a, int32_t b) { -- return a + b; -- } ---static inline int32_t OverflowingSubS32S32ToS32(int32_t a, int32_t b) --- RTC_NO_SANITIZE("signed-integer-overflow") { --+static inline int32_t RTC_NO_SANITIZE("signed-integer-overflow") --+ OverflowingSubS32S32ToS32(int32_t a, int32_t b) { -- return a - b; -- } -- --Index: webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c --diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c --index 2b92acb64a3d7dd268574abb57a24850b60cb3d1..b69a885f34de9eaa762a69f11d84cc8bec637376 100644 ----- a/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c --+++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/lattice.c --@@ -209,8 +209,8 @@ void WebRtcIsacfix_NormLatticeFilterMa(size_t orderCoef, -- // Left shift of an int32_t that's allowed to overflow. (It's still undefined -- // behavior, so not a good idea; this just makes UBSan ignore the violation, so -- // that our old code can continue to do what it's always been doing.) ---static inline int32_t OverflowingLShiftS32(int32_t x, int shift) --- RTC_NO_SANITIZE("shift") { --+static inline int32_t RTC_NO_SANITIZE("shift") --+ OverflowingLShiftS32(int32_t x, int shift) { -- return x << shift; -- } -- -diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-cubeb-build.patch stackrpms/waterfox/waterfox-cubeb-build.patch ---- chinforpms/waterfox/waterfox-cubeb-build.patch 2018-11-05 14:29:34.795145654 -0500 -+++ stackrpms/waterfox/waterfox-cubeb-build.patch 1969-12-31 19:00:00.000000000 -0500 -@@ -1,8 +0,0 @@ ----- Waterfox-56.0.2/media/libcubeb/src/moz.build.cubebbuild 2018-01-05 16:39:00.921101411 -0200 --+++ Waterfox-56.0.2/media/libcubeb/src/moz.build 2018-01-05 16:40:44.948718748 -0200 --@@ -89,4 +89,4 @@ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] -- CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] -- -- # We allow warnings for third-party code that can be updated from upstream. ---AllowCompilerWarnings() --+ALLOW_COMPILER_WARNINGS = True -diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-mozconfig stackrpms/waterfox/waterfox-mozconfig ---- chinforpms/waterfox/waterfox-mozconfig 2019-01-15 11:35:07.704294765 -0500 -+++ stackrpms/waterfox/waterfox-mozconfig 2019-01-17 07:54:36.258797151 -0500 -@@ -41,4 +41,4 @@ - ac_add_options --with-app-name=waterfox - ac_add_options --with-app-basename=Waterfox - ac_add_options --with-branding=browser/branding/unofficial --ac_add_options --with-distribution-id=chinforpms -+ac_add_options --with-distribution-id=stackrpms -diff -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox.spec stackrpms/waterfox/waterfox.spec ---- chinforpms/waterfox/waterfox.spec 2019-03-06 07:48:49.852601972 -0500 -+++ stackrpms/waterfox/waterfox.spec 2019-03-06 08:29:09.565750261 -0500 -@@ -91,7 +91,8 @@ - %global webp_version 1.0.0 - %endif - %if 0%{?system_vorbis} --%global ogg_version 1.3.3 -+# decrease this to fc28 libogg version and hope it works 2018-09-14 -+%global ogg_version 1.3.2 - %global vorbis_version 1.3.5 - %endif - -@@ -119,7 +120,7 @@ - Summary: Waterfox Web browser - Name: waterfox - Version: 56.2.7.1 --Release: 2%{?gver}%{?dist} -+Release: 3%{?gver}%{?dist} - URL: https://www.waterfoxproject.org - License: MPLv1.1 or GPLv2+ or LGPLv2+ - -@@ -992,6 +993,9 @@ - #--------------------------------------------------------------------- - - %changelog -+* Wed Mar 6 2019 B Stack <bgstack15@gmail.com> - 56.2.7.1-3.20190201gitf367fd2 -+- repackage for stackrpms -+ - * Wed Feb 13 2019 Phantom X <megaphantomx at bol dot com dot br> - 56.2.7.1-2.20190201gitf367fd2 - - LTO and fixes to build with it - diff --git a/waterfox/stackrpms-2020-06-04.diff b/waterfox/stackrpms-2020-06-04.diff new file mode 100644 index 0000000..5d8da37 --- /dev/null +++ b/waterfox/stackrpms-2020-06-04.diff @@ -0,0 +1,220 @@ +Message: This is the differences between the chinforpms srpm tree and stackrpms srpm tree. The cubeb file appears to have never been cleaned up by PhantomX. +Date: 2020-06-04 +Author: bgstack15 +diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/distribution.ini stackrpms/waterfox/distribution.ini +--- chinforpms/waterfox/distribution.ini 2020-03-16 14:17:56.196146446 -0400 ++++ stackrpms/waterfox/distribution.ini 2020-03-04 16:08:26.578716330 -0500 +@@ -1,9 +1,9 @@ + [Global] +-id=chinforpms ++id=stackrpms + version=1.0 + about=Waterfox _BRANCH_ for Fedora + + [Preferences] +-app.distributor=chinforpms +-app.distributor.channel=chinforpms +-app.partner.fedora=chinforpms ++app.distributor=stackrpms ++app.distributor.channel=stackrpms ++app.partner.fedora=stackrpms +diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/.gitignore stackrpms/waterfox/.gitignore +--- chinforpms/waterfox/.gitignore 2020-03-16 14:17:56.196146446 -0400 ++++ stackrpms/waterfox/.gitignore 2020-03-04 16:08:26.575716294 -0500 +@@ -1 +1,2 @@ +-/waterfox-gh-*.patch ++/FreeBSD-*.patch ++/wf-*.patch +diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-cubeb-build.patch stackrpms/waterfox/waterfox-cubeb-build.patch +--- chinforpms/waterfox/waterfox-cubeb-build.patch 2020-03-16 14:17:56.198146471 -0400 ++++ stackrpms/waterfox/waterfox-cubeb-build.patch 1969-12-31 19:00:00.000000000 -0500 +@@ -1,8 +0,0 @@ +---- Waterfox-56.0.2/media/libcubeb/src/moz.build.cubebbuild 2018-01-05 16:39:00.921101411 -0200 +-+++ Waterfox-56.0.2/media/libcubeb/src/moz.build 2018-01-05 16:40:44.948718748 -0200 +-@@ -89,4 +89,4 @@ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS'] +- CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS'] +- +- # We allow warnings for third-party code that can be updated from upstream. +--AllowCompilerWarnings() +-+ALLOW_COMPILER_WARNINGS = True +diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox-mozconfig stackrpms/waterfox/waterfox-mozconfig +--- chinforpms/waterfox/waterfox-mozconfig 2020-03-16 14:17:56.198146471 -0400 ++++ stackrpms/waterfox/waterfox-mozconfig 2020-03-04 16:08:26.581716366 -0500 +@@ -35,4 +35,4 @@ + ac_add_options --with-app-name=waterfox + ac_add_options --with-app-basename=Waterfox + ac_add_options --with-branding=browser/branding/unofficial +-ac_add_options --with-distribution-id=chinforpms ++ac_add_options --with-distribution-id=stackrpms +diff -x README.md -x bgstack15-waterfox-prefs.js -x debian -x 'stackrpms*.diff' -x 'stackrpms*.sh' -x '*z' -x '.*.swp' -Naur chinforpms/waterfox/waterfox.spec stackrpms/waterfox/waterfox.spec +--- chinforpms/waterfox/waterfox.spec 2020-06-04 13:46:08.786538725 -0400 ++++ stackrpms/waterfox/waterfox.spec 2020-06-04 13:49:13.091692264 -0400 +@@ -70,7 +70,8 @@ + %global debug_build 0 + + %global build_stylo 0 +-%global build_rust_simd 1 ++# stackrpms: disable simd because it only causes problems ++%global build_rust_simd 0 + # Set to build with pinned rust version + # This enables stylo build when default rust version is not supported + # and a downgraded rust package exists +@@ -125,10 +126,38 @@ + + %global build_langpacks 1 + ++# additional repos to get python27 and devtoolset-7 ++# for el6 and el7: Software Collection;, for x86_64 only ++# http://mirror.centos.org/centos/6/sclo/x86_64/rh/ ++# http://mirror.centos.org/centos/6/sclo/x86_64/sclo/ ++# for el6.i386: ++# https://copr-be.cloud.fedoraproject.org/results/ewdurbin/pythons-el6/epel-6-$basearch/ ++# https://copr-be.cloud.fedoraproject.org/results/mlampe/devtoolset-7/epel-6-$basearch/ ++%define scl_env %{nil} ++%define scl_buildreq coreutils ++%if 0%{?rhel} == 7 ++%define scl_env devtoolset-7 ++%define scl_buildreq devtoolset-7-toolchain ++%global system_nss 0 ++%global system_hunspell 0 ++%global system_libevent 0 ++%global system_sqlite 0 ++%global system_libvpx 0 ++%global build_stylo 0 ++%global build_rust_simd 0 ++%global build_with_pgo 0 ++%if "%{?scl_env}" != "" ++BuildRequires: %{scl_buildreq} ++%endif ++%endif ++%if 0%{?rhel} >= 7 ++%global system_webp 0 ++%endif ++ + Summary: Waterfox Web browser + Name: waterfox + Version: 2020.06 +-Release: 1%{?branch:.%{branch}}%{?gver}%{?dist} ++Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} + URL: https://www.waterfox.net + License: MPLv1.1 or GPLv2+ or LGPLv2+ + +@@ -148,7 +177,7 @@ + Source602: patch-bug1381815 + + Source10: waterfox-mozconfig +-Source12: waterfox-chinfo-default-prefs.js ++Source12: bgstack15-%{name}-prefs.js + Source20: waterfox.desktop + Source21: waterfox.sh.in + Source23: waterfox.1 +@@ -267,21 +296,20 @@ + BuildRequires: yasm + BuildRequires: llvm + BuildRequires: llvm-devel +-# clang is needed even with gcc ++%if !0%{?el7} + BuildRequires: clang ++BuildRequires: clang-libs + BuildRequires: clang-devel +-%if 0%{?build_with_clang} + BuildRequires: lld + BuildRequires: libstdc++-static ++%endif + %if 0%{?build_with_pgo} + BuildRequires: compiler-rt + %endif +-%else + %if 0%{?fedora} > 30 + BuildRequires: binutils-gold + %endif + BuildRequires: gcc-c++ +-%endif + BuildRequires: bash + BuildRequires: patchutils + +@@ -300,7 +328,9 @@ + Requires: nss >= 3.29.1-2.1 + + BuildRequires: desktop-file-utils ++%if 0%{?rhel} != 8 + BuildRequires: system-bookmarks ++%endif + %if 0%{?system_sqlite} + BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version} + Requires: sqlite >= %{sqlite_build_version} +@@ -758,6 +788,12 @@ + %endif + EOF + ++%if "%{?scl_env}" != "" ++ thispwd=$( pwd ) ++ scl enable %{scl_env} /bin/bash << 'EOFSCL' ++ pushd $thispwd ++%endif ++ + source ./%{name}-env + + %if 0%{?build_with_pgo} +@@ -768,6 +804,11 @@ + SHELL=%{_prefix}/bin/bash ./mach build %{?verbose_mach} + %endif + ++%if "%{?scl_env}" != "" ++ popd || : ++EOFSCL ++%endif ++ + %if %{?run_tests} + %if 0%{?system_nss} + ln -s %{_prefix}/bin/certutil objdir/dist/bin/certutil +@@ -801,9 +842,16 @@ + #--------------------------------------------------------------------- + + %install ++%if "%{?scl_env}" != "" ++ thispwd=$( pwd ) ++ scl enable %{scl_env} /bin/bash << 'EOFSCL' ++ pushd $thispwd ++%endif + ++%if ! 0%{?rhel} >= 8 + # set up our default bookmarks + cp -p %{default_bookmarks_file} objdir/dist/bin/browser/chrome/en-US/locale/browser/bookmarks.html ++%endif + + # Make sure locale works for langpacks + cat > objdir/dist/bin/browser/defaults/preferences/firefox-l10n.js << EOF +@@ -948,6 +996,11 @@ + rm -f %{buildroot}%{mozappdirdev}/sdk/lib/libxul.so + #--------------------------------------------------------------------- + ++%if "%{?scl_env}" != "" ++ popd || : ++EOFSCL ++%endif ++ + # Moves defaults/preferences to browser/defaults/preferences + %pretrans -p <lua> + require 'posix' +@@ -990,7 +1043,7 @@ + %license %{mozappdir}/LICENSE + %{mozappdir}/browser/chrome + %{mozappdir}/browser/chrome.manifest +-%{mozappdir}/browser/defaults/preferences/*-default-prefs.js ++%{mozappdir}/browser/defaults/preferences/*.js + %{mozappdir}/browser/features + %{mozappdir}/distribution/distribution.ini + # That's Windows only +@@ -1031,6 +1084,11 @@ + #--------------------------------------------------------------------- + + %changelog ++* Thu Jun 04 2020 B Stack <bgstack15@gmail.com> - 2020.06-11.classic ++- add el7 and el8 support ++- repackage for stackrpms ++- disable simd globally ++ + * Thu Jun 04 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.06-1.classic + - 2020.06 + diff --git a/waterfox/waterfox.spec b/waterfox/waterfox.spec index 280135a..33a6cb9 100644 --- a/waterfox/waterfox.spec +++ b/waterfox/waterfox.spec @@ -156,7 +156,7 @@ BuildRequires: %{scl_buildreq} Summary: Waterfox Web browser Name: waterfox -Version: 2020.05 +Version: 2020.07 Release: 11%{?branch:.%{branch}}%{?gver}%{?dist} URL: https://www.waterfox.net License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -460,8 +460,8 @@ done # 4: uncertain for i in \ 702179 991253 1021761 1144632 1288587 1379148 1393235 1393283 1393627 1395486 1396722 \ - 1401909 1427126 1430508 1433747 1452576 1453127 1454285 1455235 1466606 1469257 \ - 1384121 1384701 1388744 1401063 1413143 1415883 1437450 \ + 1401909 1419762 1427126 1430508 1433747 1452576 1453127 1454285 1455235 1466606 1469257 \ + 1384121 1384701 1388744 1401063 1413143 1415883 1402442 1437450 \ 1447519 do rm -f _patches/patch-bug${i} @@ -1084,11 +1084,17 @@ fi #--------------------------------------------------------------------- %changelog -* Mon May 11 2020 B Stack <bgstack15@gmail.com> - 2020.05-11.classic +* Sat Jul 04 2020 B Stack <bgstack15@gmail.com> - 2020.07-11.classic - add el7 and el8 support - repackage for stackrpms - disable simd globally +* Wed Jul 01 2020 Phantom X <megaphantomx at hotmail dot com> - 2020.07-1.classic +- 2020.07 + +* Thu Jun 04 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.06-1.classic +- 2020.06 + * Sat May 09 2020 Phantom X <megaphantomx at bol dot com dot br> - 2020.05-1.classic - 2020.05 |