diff options
| -rw-r--r-- | ccextractor/ccextractor-system-libraries-and-cflags.patch | 258 | ||||
| -rw-r--r-- | ccextractor/ccextractor.spec | 42 | ||||
| -rw-r--r-- | freefilesync/debian/changelog | 14 | ||||
| -rw-r--r-- | freefilesync/debian/control | 2 | ||||
| -rw-r--r-- | freefilesync/debian/freefilesync+devuan.dsc | 4 | ||||
| -rw-r--r-- | freefilesync/debian/patches/ffs_no_check_updates.patch | 82 | ||||
| -rw-r--r-- | freefilesync/ffs_curl.patch | 30 | ||||
| -rw-r--r-- | freefilesync/ffs_no_check_updates.patch | 82 | ||||
| -rw-r--r-- | freefilesync/freefilesync.spec | 5 | ||||
| -rw-r--r-- | makemkv/makemkv.spec | 78 | ||||
| -rw-r--r-- | makemkv/stackrpms-makemkv.spec.diff | 53 |
11 files changed, 388 insertions, 262 deletions
diff --git a/ccextractor/ccextractor-system-libraries-and-cflags.patch b/ccextractor/ccextractor-system-libraries-and-cflags.patch index dd8510e..e1b1ae2 100644 --- a/ccextractor/ccextractor-system-libraries-and-cflags.patch +++ b/ccextractor/ccextractor-system-libraries-and-cflags.patch @@ -1,127 +1,129 @@ -diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefile.am ---- ccextractor-0.88.old/linux/Makefile.am 2019-05-21 20:41:08.000000000 +0200 -+++ ccextractor-0.88/linux/Makefile.am 2019-06-16 10:03:26.968105592 +0200 -@@ -82,28 +82,6 @@ - ../src/gpacmp4/gpac/internal/odf_dev.h \ - ../src/gpacmp4/gpac/internal/odf_parse_common.h \ - ../src/gpacmp4/gpac/internal/ogg.h \ -- ../src/libpng/pngstruct.h \ -- ../src/libpng/pngpriv.h \ -- ../src/libpng/pnginfo.h \ -- ../src/libpng/pnglibconf.h \ -- ../src/libpng/pngconf.h \ -- ../src/libpng/pngdebug.h \ -- ../src/libpng/png.h \ -- ../src/libpng/png.c \ -- ../src/libpng/pngerror.c \ -- ../src/libpng/pngget.c \ -- ../src/libpng/pngmem.c \ -- ../src/libpng/pngpread.c \ -- ../src/libpng/pngread.c \ -- ../src/libpng/pngrio.c \ -- ../src/libpng/pngrtran.c \ -- ../src/libpng/pngrutil.c \ -- ../src/libpng/pngset.c \ -- ../src/libpng/pngtrans.c \ -- ../src/libpng/pngwio.c \ -- ../src/libpng/pngwrite.c \ -- ../src/libpng/pngwtran.c \ -- ../src/libpng/pngwutil.c \ +diff -Naur ccextractor-0.89.old/linux/Makefile.am ccextractor-0.89/linux/Makefile.am +--- ccextractor-0.89.old/linux/Makefile.am 2021-06-20 14:04:42.569388396 +0200 ++++ ccextractor-0.89/linux/Makefile.am 2021-06-20 14:05:14.733984021 +0200 +@@ -87,28 +87,6 @@ + ../src/thirdparty/gpacmp4/gpac/internal/odf_dev.h \ + ../src/thirdparty/gpacmp4/gpac/internal/odf_parse_common.h \ + ../src/thirdparty/gpacmp4/gpac/internal/ogg.h \ +- ../src/thirdparty/libpng/pngstruct.h \ +- ../src/thirdparty/libpng/pngpriv.h \ +- ../src/thirdparty/libpng/pnginfo.h \ +- ../src/thirdparty/libpng/pnglibconf.h \ +- ../src/thirdparty/libpng/pngconf.h \ +- ../src/thirdparty/libpng/pngdebug.h \ +- ../src/thirdparty/libpng/png.h \ +- ../src/thirdparty/libpng/png.c \ +- ../src/thirdparty/libpng/pngerror.c \ +- ../src/thirdparty/libpng/pngget.c \ +- ../src/thirdparty/libpng/pngmem.c \ +- ../src/thirdparty/libpng/pngpread.c \ +- ../src/thirdparty/libpng/pngread.c \ +- ../src/thirdparty/libpng/pngrio.c \ +- ../src/thirdparty/libpng/pngrtran.c \ +- ../src/thirdparty/libpng/pngrutil.c \ +- ../src/thirdparty/libpng/pngset.c \ +- ../src/thirdparty/libpng/pngtrans.c \ +- ../src/thirdparty/libpng/pngwio.c \ +- ../src/thirdparty/libpng/pngwrite.c \ +- ../src/thirdparty/libpng/pngwtran.c \ +- ../src/thirdparty/libpng/pngwutil.c \ ../src/lib_ccx/ccx_common_common.h \ ../src/lib_ccx/ccx_common_option.h \ ../src/lib_ccx/utility.h \ -@@ -222,34 +200,6 @@ +@@ -230,34 +208,6 @@ ../src/lib_ccx/ts_tables_epg.c \ ../src/lib_ccx/wtv_constants.h \ ../src/lib_ccx/wtv_functions.c \ -- ../src/zlib/adler32.c \ -- ../src/zlib/compress.c \ -- ../src/zlib/crc32.c \ -- ../src/zlib/crc32.h \ -- ../src/zlib/deflate.c \ -- ../src/zlib/deflate.h \ -- ../src/zlib/gzclose.c \ -- ../src/zlib/gzguts.h \ -- ../src/zlib/gzlib.c \ -- ../src/zlib/gzread.c \ -- ../src/zlib/gzwrite.c \ -- ../src/zlib/infback.c \ -- ../src/zlib/inffast.c \ -- ../src/zlib/inffast.h \ -- ../src/zlib/inffixed.h \ -- ../src/zlib/inflate.c \ -- ../src/zlib/inflate.h \ -- ../src/zlib/inftrees.c \ -- ../src/zlib/inftrees.h \ -- ../src/zlib/trees.c \ -- ../src/zlib/trees.h \ -- ../src/zlib/uncompr.c \ -- ../src/zlib/zconf.h \ -- ../src/zlib/zlib.h \ -- ../src/zlib/zutil.c \ -- ../src/zlib/zutil.h \ -- ../src/utf8proc/utf8proc.c \ -- ../src/utf8proc/utf8proc.h \ - ../src/lib_hash/sha2.c \ - ../src/lib_hash/sha2.h \ - ../src/protobuf-c/protobuf-c.c \ -@@ -267,58 +217,17 @@ - ../src/zvbi/sliced.h \ - ../src/zvbi/zvbi_decoder.h \ - ../src/wrappers/wrapper.c \ -- ../src/wrappers/wrapper.h \ -- ../src/freetype/autofit/autofit.c \ -- ../src/freetype/base/ftbase.c \ -- ../src/freetype/base/ftbbox.c \ -- ../src/freetype/base/ftbdf.c \ -- ../src/freetype/base/ftbitmap.c \ -- ../src/freetype/base/ftcid.c \ -- ../src/freetype/base/ftfntfmt.c \ -- ../src/freetype/base/ftfstype.c \ -- ../src/freetype/base/ftgasp.c \ -- ../src/freetype/base/ftglyph.c \ -- ../src/freetype/base/ftgxval.c \ -- ../src/freetype/base/ftinit.c \ -- ../src/freetype/base/ftlcdfil.c \ -- ../src/freetype/base/ftmm.c \ -- ../src/freetype/base/ftotval.c \ -- ../src/freetype/base/ftpatent.c \ -- ../src/freetype/base/ftpfr.c \ -- ../src/freetype/base/ftstroke.c \ -- ../src/freetype/base/ftsynth.c \ -- ../src/freetype/base/ftsystem.c \ -- ../src/freetype/base/fttype1.c \ -- ../src/freetype/base/ftwinfnt.c \ -- ../src/freetype/bdf/bdf.c \ -- ../src/freetype/bzip2/ftbzip2.c \ -- ../src/freetype/cache/ftcache.c \ -- ../src/freetype/cff/cff.c \ -- ../src/freetype/cid/type1cid.c \ -- ../src/freetype/gzip/ftgzip.c \ -- ../src/freetype/lzw/ftlzw.c \ -- ../src/freetype/pcf/pcf.c \ -- ../src/freetype/pfr/pfr.c \ -- ../src/freetype/psaux/psaux.c \ -- ../src/freetype/pshinter/pshinter.c \ -- ../src/freetype/psnames/psnames.c \ -- ../src/freetype/raster/raster.c \ -- ../src/freetype/sfnt/sfnt.c \ -- ../src/freetype/smooth/smooth.c \ -- ../src/freetype/truetype/truetype.c \ -- ../src/freetype/type1/type1.c \ -- ../src/freetype/type42/type42.c \ -- ../src/freetype/winfonts/winfnt.c -+ ../src/wrappers/wrapper.h +- ../src/thirdparty/zlib/adler32.c \ +- ../src/thirdparty/zlib/compress.c \ +- ../src/thirdparty/zlib/crc32.c \ +- ../src/thirdparty/zlib/crc32.h \ +- ../src/thirdparty/zlib/deflate.c \ +- ../src/thirdparty/zlib/deflate.h \ +- ../src/thirdparty/zlib/gzclose.c \ +- ../src/thirdparty/zlib/gzguts.h \ +- ../src/thirdparty/zlib/gzlib.c \ +- ../src/thirdparty/zlib/gzread.c \ +- ../src/thirdparty/zlib/gzwrite.c \ +- ../src/thirdparty/zlib/infback.c \ +- ../src/thirdparty/zlib/inffast.c \ +- ../src/thirdparty/zlib/inffast.h \ +- ../src/thirdparty/zlib/inffixed.h \ +- ../src/thirdparty/zlib/inflate.c \ +- ../src/thirdparty/zlib/inflate.h \ +- ../src/thirdparty/zlib/inftrees.c \ +- ../src/thirdparty/zlib/inftrees.h \ +- ../src/thirdparty/zlib/trees.c \ +- ../src/thirdparty/zlib/trees.h \ +- ../src/thirdparty/zlib/uncompr.c \ +- ../src/thirdparty/zlib/zconf.h \ +- ../src/thirdparty/zlib/zlib.h \ +- ../src/thirdparty/zlib/zutil.c \ +- ../src/thirdparty/zlib/zutil.h \ +- ../src/thirdparty/utf8proc/utf8proc.c \ +- ../src/thirdparty/utf8proc/utf8proc.h \ + ../src/thirdparty/lib_hash/sha2.c \ + ../src/thirdparty/lib_hash/sha2.h \ + ../src/thirdparty/protobuf-c/protobuf-c.c \ +@@ -273,65 +223,22 @@ + ../src/lib_ccx/zvbi/sampling_par.c \ + ../src/lib_ccx/zvbi/sampling_par.h \ + ../src/lib_ccx/zvbi/sliced.h \ +- ../src/lib_ccx/zvbi/zvbi_decoder.h \ +- ../src/freetype/* \ +- ../src/thirdparty/freetype/autofit/autofit.c \ +- ../src/thirdparty/freetype/base/ftbase.c \ +- ../src/thirdparty/freetype/base/ftbbox.c \ +- ../src/thirdparty/freetype/base/ftbdf.c \ +- ../src/thirdparty/freetype/base/ftbitmap.c \ +- ../src/thirdparty/freetype/base/ftcid.c \ +- ../src/thirdparty/freetype/base/ftfntfmt.c \ +- ../src/thirdparty/freetype/base/ftfstype.c \ +- ../src/thirdparty/freetype/base/ftgasp.c \ +- ../src/thirdparty/freetype/base/ftglyph.c \ +- ../src/thirdparty/freetype/base/ftgxval.c \ +- ../src/thirdparty/freetype/base/ftinit.c \ +- ../src/thirdparty/freetype/base/ftlcdfil.c \ +- ../src/thirdparty/freetype/base/ftmm.c \ +- ../src/thirdparty/freetype/base/ftotval.c \ +- ../src/thirdparty/freetype/base/ftpatent.c \ +- ../src/thirdparty/freetype/base/ftpfr.c \ +- ../src/thirdparty/freetype/base/ftstroke.c \ +- ../src/thirdparty/freetype/base/ftsynth.c \ +- ../src/thirdparty/freetype/base/ftsystem.c \ +- ../src/thirdparty/freetype/base/fttype1.c \ +- ../src/thirdparty/freetype/base/ftwinfnt.c \ +- ../src/thirdparty/freetype/bdf/bdf.c \ +- ../src/thirdparty/freetype/bzip2/ftbzip2.c \ +- ../src/thirdparty/freetype/cache/ftcache.c \ +- ../src/thirdparty/freetype/cff/cff.c \ +- ../src/thirdparty/freetype/cid/type1cid.c \ +- ../src/thirdparty/freetype/gzip/ftgzip.c \ +- ../src/thirdparty/freetype/include/ft2build.h \ +- ../src/thirdparty/freetype/lzw/ftlzw.c \ +- ../src/thirdparty/freetype/pcf/pcf.c \ +- ../src/thirdparty/freetype/pfr/pfr.c \ +- ../src/thirdparty/freetype/psaux/psaux.c \ +- ../src/thirdparty/freetype/pshinter/pshinter.c \ +- ../src/thirdparty/freetype/psnames/psnames.c \ +- ../src/thirdparty/freetype/raster/raster.c \ +- ../src/thirdparty/freetype/sfnt/sfnt.c \ +- ../src/thirdparty/freetype/smooth/smooth.c \ +- ../src/thirdparty/freetype/truetype/truetype.c \ +- ../src/thirdparty/freetype/type1/type1.c \ +- ../src/thirdparty/freetype/type42/type42.c \ +- ../src/thirdparty/freetype/winfonts/winfnt.c ++ ../src/lib_ccx/zvbi/zvbi_decoder.h --ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -+ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP +-ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H ++ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H --ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/utf8proc/ -I../src/ -I../src/freetype/include/ -+ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/ -I/usr/include/freetype2 +-ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/thirdparty/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/ ++ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/zlib/ -I../src/thirdparty/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I/usr/include/freetype2/ --ccextractor_LDADD=-lm -+ccextractor_LDADD=-lm -lpng -lz -lutf8proc -lfreetype +-ccextractor_LDADD=-lm -lpthread -ldl ++ccextractor_LDADD=-lm -lpthread -ldl -lcrypto -lpng -lz -lutf8proc -lfreetype -lprotobuf-c if SYS_IS_LINUX -ccextractor_CFLAGS += -O3 -s -DGPAC_CONFIG_LINUX @@ -129,7 +131,13 @@ diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefil endif if SYS_IS_MAC -@@ -350,7 +259,7 @@ + ccextractor_CFLAGS += -DPAC_CONFIG_DARWIN -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek +-ccextractor_LDADD += -liconv -lz ++ccextractor_LDADD += -liconv -lz + endif + + if SYS_IS_64_BIT +@@ -358,7 +265,7 @@ if TESSERACT_PRESENT TESS_LIB = ${tesseract_LIBS} @@ -138,16 +146,16 @@ diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefil else #fix for raspberry pi not having a pkgconfig file for tesseract -@@ -367,7 +276,7 @@ +@@ -375,7 +282,7 @@ ccextractor_LDADD += $(LEPT_LIB) endif --EXTRA_DIST = ../src/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm ../src/utf8proc/utf8proc_data.c fonts/ icon/ -+EXTRA_DIST = ../src/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm fonts/ icon/ +-EXTRA_DIST = ../src/thirdparty/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm ../src/thirdparty/utf8proc/utf8proc_data.c fonts/ icon/ ++EXTRA_DIST = ../src/thirdparty/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm fonts/ icon/ #For GUI if BUILD_WITH_GUI -@@ -404,14 +313,14 @@ +@@ -412,14 +319,14 @@ if SYS_IS_LINUX @@ -164,15 +172,15 @@ diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefil ccextractorGUI_CFLAGS += ${glew_CFLAGS} ccextractorGUI_LDADD += ${glew_LIBS} ccextractorGUI_LDFLAGS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -diff -Naur ccextractor-0.88.old/src/lib_ccx/params.c ccextractor-0.88/src/lib_ccx/params.c ---- ccextractor-0.88.old/src/lib_ccx/params.c 2019-05-21 20:41:08.000000000 +0200 -+++ ccextractor-0.88/src/lib_ccx/params.c 2019-06-16 10:04:33.404332826 +0200 +diff -Naur ccextractor-0.89.old/src/lib_ccx/params.c ccextractor-0.89/src/lib_ccx/params.c +--- ccextractor-0.89.old/src/lib_ccx/params.c 2021-06-20 14:04:42.583388655 +0200 ++++ ccextractor-0.89/src/lib_ccx/params.c 2021-06-20 14:04:50.704539043 +0200 @@ -13,7 +13,7 @@ #include "../lib_hash/sha2.h" #include <string.h> #include <stdio.h> --#include "utf8proc/utf8proc.h" -+#include "utf8proc.h" +-#include <utf8proc/utf8proc.h> ++#include <utf8proc.h> #ifdef ENABLE_OCR - #include "tesseract/capi.h" + #include <tesseract/capi.h> diff --git a/ccextractor/ccextractor.spec b/ccextractor/ccextractor.spec index 03d8598..0fbb748 100644 --- a/ccextractor/ccextractor.spec +++ b/ccextractor/ccextractor.spec @@ -1,11 +1,22 @@ +%define _legacy_common_support 1 + +%global commit0 67e15aaf80a576f6f9b79442eaa355d544f0d5c2 +%global date 20210527 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global tag %{version} + Name: ccextractor -Version: 0.88 +Version: 0.93 Release: 1%{?dist} Summary: A closed captions and teletext subtitles extractor for video streams. License: GPL URL: http://ccextractor.org/ -Source0: https://github.com/CCExtractor/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +%if 0%{?tag:1} +Source0: https://github.com/CCExtractor/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +%else +Source0: https://github.com/CCExtractor/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz +%endif Patch0: %{name}-system-libraries-and-cflags.patch @@ -14,6 +25,7 @@ BuildRequires: automake BuildRequires: gcc BuildRequires: freetype-devel BuildRequires: libpng-devel +BuildRequires: openssl-devel BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glfw3) BuildRequires: pkgconfig(lept) @@ -22,12 +34,12 @@ BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(tesseract) +BuildRequires: protobuf-c-devel BuildRequires: utf8proc-devel BuildRequires: zlib-devel # Unbundle! Provides: bundled(gpac) -Provides: bundled(protobuf-c) Provides: bundled(zvbi) %description @@ -35,8 +47,14 @@ CCExtractor is a tool used to produce subtitles for TV recordings from almost anywhere in the world. We intend to keep up with all sources and formats. %prep +%if 0%{?tag:1} %autosetup -p1 +%else +%autosetup -p1 -n %{name}-%{commit0} +%endif + rm -fr src/{freetype,libpng,utf8proc,zlib} +rm -fr OpenBSD mac windows %build cd linux @@ -60,6 +78,24 @@ cd linux %{_bindir}/%{name} %changelog +* Fri Sep 24 2021 Simone Caronni <negativo17@gmail.com> - 0.93-1 +- Update to 0.93. + +* Wed Jul 21 2021 Simone Caronni <negativo17@gmail.com> - 0.90-1 +- Update to 0.90. + +* Sun Jun 20 2021 Simone Caronni <negativo17@gmail.com> - 0.89-4 +- Update to final 0.89. + +* Thu May 27 2021 Simone Caronni <negativo17@gmail.com> - 0.89-3.20210527git67e15aa +- Update to latest snapshot. + +* Fri Mar 26 2021 Simone Caronni <negativo17@gmail.com> - 0.89-2.20210325git19da837 +- Update to latest snapshot. + +* Thu Jul 16 2020 Simone Caronni <negativo17@gmail.com> - 0.89-1.20200508git33eccce +- Update to latest snapshot. + * Sun Jun 16 2019 Simone Caronni <negativo17@gmail.com> - 0.88-1 - Update to 0.88. diff --git a/freefilesync/debian/changelog b/freefilesync/debian/changelog index d77e932..793683d 100644 --- a/freefilesync/debian/changelog +++ b/freefilesync/debian/changelog @@ -1,3 +1,17 @@ +freefilesync (11.18-1+devuan) obs; urgency=medium + + * Upstream updates + * Add comparison time to sync log when using GUI + * Added user-configurable timeout for Google Drive + * Consider port when comparing (S)FTP paths for equality + * Fixed SFTP key file login error on OpenSSH_8.8p1 + * Add error details for NSFileReadUnknownError (macOS) + * Disable new config button when already at default + * Use user language instead of region locale during installation + * Bump required libcurl4-openssl-dev >= 7.82.0 + + -- B. Stack <bgstack15@gmail.com> Wed, 09 Mar 2022 09:38:41 -0500 + freefilesync (11.17-1+devuan) obs; urgency=medium * Upstream updates diff --git a/freefilesync/debian/control b/freefilesync/debian/control index 3911ad5..f9ccd02 100644 --- a/freefilesync/debian/control +++ b/freefilesync/debian/control @@ -6,7 +6,7 @@ Build-Depends: debhelper (>=12~), imagemagick, g++-10, libbrotli-dev, - libcurl4-openssl-dev (>=7.68.0), + libcurl4-openssl-dev (>=7.82.0), libglibmm-2.4-dev, libssh2-1-dev, libssl-dev, diff --git a/freefilesync/debian/freefilesync+devuan.dsc b/freefilesync/debian/freefilesync+devuan.dsc index 6a0b5c8..3566056 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: 11.16-1+devuan +Version: 11.18-1+devuan Maintainer: B. Stack <bgstack15@gmail.com> Homepage: https://freefilesync.org/ Standards-Version: 4.1.4 -Build-Depends: debhelper (>= 12~), g++-10, imagemagick, libbrotli-dev, libcurl4-openssl-dev, libglibmm-2.4-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, libbrotli-dev, libcurl4-openssl-dev (>= 7.82.0), libglibmm-2.4-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_no_check_updates.patch b/freefilesync/debian/patches/ffs_no_check_updates.patch index fd16a6f..9cfc123 100644 --- a/freefilesync/debian/patches/ffs_no_check_updates.patch +++ b/freefilesync/debian/patches/ffs_no_check_updates.patch @@ -1,56 +1,56 @@ -Version: 11.17 -Date: 2022-02-06 +Version: 11.18 +Date: 2022-03-08 Author: bgstack15 Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program. -diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp 11.12-1/FreeFileSync/Source/ui/gui_generated.cpp ---- 11.17-1/FreeFileSync/Source/ui/gui_generated.cpp.orig 2022-02-06 16:45:53.752498824 -0500 -+++ 11.17-1/FreeFileSync/Source/ui/gui_generated.cpp 2022-02-06 16:49:22.210474742 -0500 +diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 11.18-1/FreeFileSync/Source/ui/gui_generated.cpp +--- 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 2022-03-08 16:51:21.090657955 -0500 ++++ 11.18-1/FreeFileSync/Source/ui/gui_generated.cpp 2022-03-08 16:55:57.009584234 -0500 @@ -110,15 +110,6 @@ - m_menuHelp->AppendSeparator(); + m_menuHelp->AppendSeparator(); -- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL ); -- m_menuHelp->Append( m_menuItemCheckVersionNow ); +- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL ); +- m_menuHelp->Append( m_menuItemCheckVersionNow ); - -- m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ), wxEmptyString, wxITEM_CHECK ); -- m_menuHelp->Append( m_menuItemCheckVersionAuto ); -- m_menuItemCheckVersionAuto->Check( true ); +- m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK ); +- m_menuHelp->Append( m_menuItemCheckVersionAuto ); +- m_menuItemCheckVersionAuto->Check( true ); - -- m_menuHelp->AppendSeparator(); +- m_menuHelp->AppendSeparator(); - - m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL ); - m_menuHelp->Append( m_menuItemAbout ); + m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL ); + m_menuHelp->Append( m_menuItemAbout ); @@ -1131,8 +1122,6 @@ - m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId()); - m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId()); - m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId()); -- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId()); -- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId()); - m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId()); - m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this ); - m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); -diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.h 11.10-2/FreeFileSync/Source/ui/gui_generated.h ---- 11.17-1/FreeFileSync/Source/ui/gui_generated.h.orig 2022-02-06 16:45:53.756498862 -0500 -+++ 11.17-1/FreeFileSync/Source/ui/gui_generated.h 2022-02-06 16:46:55.745086430 -0500 + m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId()); + m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId()); + m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId()); +- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId()); +- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId()); + m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId()); + m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this ); + m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); +diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.h 11.18-1/FreeFileSync/Source/ui/gui_generated.h +--- 11.18-0/FreeFileSync/Source/ui/gui_generated.h 2022-03-08 16:51:21.114658209 -0500 ++++ 11.18-1/FreeFileSync/Source/ui/gui_generated.h 2022-03-08 16:56:17.057796860 -0500 @@ -95,8 +95,6 @@ - wxMenuItem* m_menuItemShowOverview; - wxMenu* m_menuHelp; - wxMenuItem* m_menuItemHelp; -- wxMenuItem* m_menuItemCheckVersionNow; -- wxMenuItem* m_menuItemCheckVersionAuto; - wxMenuItem* m_menuItemAbout; - wxBoxSizer* bSizerPanelHolder; - wxPanel* m_panelTopButtons; + wxMenuItem* m_menuItemShowOverview; + wxMenu* m_menuHelp; + wxMenuItem* m_menuItemHelp; +- wxMenuItem* m_menuItemCheckVersionNow; +- wxMenuItem* m_menuItemCheckVersionAuto; + wxMenuItem* m_menuItemAbout; + wxBoxSizer* bSizerPanelHolder; + wxPanel* m_panelTopButtons; @@ -231,8 +229,6 @@ - virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); } - virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); } - virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); } -- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); } -- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); } - virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); } - virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); } - virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); } + virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); } + virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); } + virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); } +- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); } +- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); } + virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); } + virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); } + virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); } diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp --- 11.16-0/FreeFileSync/Source/ui/main_dlg.cpp 2022-01-04 08:52:19.811432573 -0500 +++ 11.16-1/FreeFileSync/Source/ui/main_dlg.cpp 2022-01-04 08:57:14.506728896 -0500 diff --git a/freefilesync/ffs_curl.patch b/freefilesync/ffs_curl.patch index 2b93756..bd0354a 100644 --- a/freefilesync/ffs_curl.patch +++ b/freefilesync/ffs_curl.patch @@ -1,9 +1,9 @@ Author: Brulhart, bgstack15 -Date: 2021-06-12 10:54:15 -0400 +Date: 2022-03-09 Message: remove assertion for libcurl version >1.71 -Version: FreeFileSync 11.16 +Version: FreeFileSync 11.18 Message: We have to omit checking for certain definitions. -On Fedora 33, file /usr/include/curl/curl.h from libcurl-devel 7.71 stops with CURLE_QUIC_CONNECT_ERROR 96 +Distro: Fedora 34. File ffs_curl.patch is different between fc34 and devuan! On Devuan Ceres file /usr/include/x86_64-linux-gnu/curl/curl.h from libcurl 4-openssl-dev stops with CURLE_PROXY 97 For Devuan Ceres libcurl4-openssl-dev 7.74.0-1.3+b1 uses CURLE_TELNET_OPTION_SYNTAX and not CURLE_SETOPT_OPTION_SYNTAX which replaced the first at version 7.78.0 per https://github.com/curl/curl/blob/master/docs/libcurl/symbols-in-versions diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/afs/ftp.cpp @@ -18,9 +18,9 @@ diff -r -u 10.17-0/FreeFileSync/Source/afs/ftp.cpp 10.17-1/FreeFileSync/Source/a /* 1. CURLFTPMETHOD_NOCWD requires absolute paths to unconditionally skip CWDs: https://github.com/curl/curl/pull/4382 2. CURLFTPMETHOD_SINGLECWD requires absolute paths to skip one needless "CWD entry path": https://github.com/curl/curl/pull/4332 => https://curl.haxx.se/docs/faq.html#How_do_I_list_the_root_dir_of_an -diff -x '*.orig' -x '*.rej' -aur 11.16-0/libcurl/curl_wrap.cpp 11.16-1/libcurl/curl_wrap.cpp ---- 11.16-0/libcurl/curl_wrap.cpp 2022-01-04 08:52:19.603430247 -0500 -+++ 11.16-1/libcurl/curl_wrap.cpp 2022-01-04 09:18:42.877140030 -0500 +diff -aur 11.18-{0,1}/libcurl/curl_wrap.cpp +--- 11.18-0/libcurl/curl_wrap.cpp 2022-03-09 10:19:42.961942416 -0500 ++++ 11.18-1/libcurl/curl_wrap.cpp 2022-03-09 10:37:44.702421086 -0500 @@ -330,7 +330,7 @@ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE46); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TOO_MANY_REDIRECTS); @@ -30,6 +30,24 @@ diff -x '*.orig' -x '*.rej' -aur 11.16-0/libcurl/curl_wrap.cpp 11.16-1/libcurl/c ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE50); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE51); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_GOT_NOTHING); +@@ -343,7 +343,7 @@ + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CIPHER); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_PEER_FAILED_VERIFICATION); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_BAD_CONTENT_ENCODING); +- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE62); ++ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_LDAP_INVALID_URL); // < libcurl 7.82.0 + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_FILESIZE_EXCEEDED); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_USE_SSL_FAILED); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SEND_FAIL_REWIND); +@@ -357,7 +357,7 @@ + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_REMOTE_FILE_EXISTS); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_TFTP_NOSUCHUSER); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_CONV_FAILED); +- ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_OBSOLETE76); ++ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_CONV_REQD); // < libcurl 7.82.0 + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSL_CACERT_BADFILE); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_REMOTE_FILE_NOT_FOUND); + ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_SSH); @@ -378,11 +378,8 @@ ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_AUTH_ERROR); ZEN_CHECK_CASE_FOR_CONSTANT(CURLE_HTTP3); diff --git a/freefilesync/ffs_no_check_updates.patch b/freefilesync/ffs_no_check_updates.patch index fd16a6f..9cfc123 100644 --- a/freefilesync/ffs_no_check_updates.patch +++ b/freefilesync/ffs_no_check_updates.patch @@ -1,56 +1,56 @@ -Version: 11.17 -Date: 2022-02-06 +Version: 11.18 +Date: 2022-03-08 Author: bgstack15 Message: This is a major rewrite of the ffs_no_check_updates patch from before 11.10 which disabled only a few technical www interactions. This current version completely deletes all logic associated with checking the version of the program. -diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.cpp 11.12-1/FreeFileSync/Source/ui/gui_generated.cpp ---- 11.17-1/FreeFileSync/Source/ui/gui_generated.cpp.orig 2022-02-06 16:45:53.752498824 -0500 -+++ 11.17-1/FreeFileSync/Source/ui/gui_generated.cpp 2022-02-06 16:49:22.210474742 -0500 +diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 11.18-1/FreeFileSync/Source/ui/gui_generated.cpp +--- 11.18-0/FreeFileSync/Source/ui/gui_generated.cpp 2022-03-08 16:51:21.090657955 -0500 ++++ 11.18-1/FreeFileSync/Source/ui/gui_generated.cpp 2022-03-08 16:55:57.009584234 -0500 @@ -110,15 +110,6 @@ - m_menuHelp->AppendSeparator(); + m_menuHelp->AppendSeparator(); -- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ), wxEmptyString, wxITEM_NORMAL ); -- m_menuHelp->Append( m_menuItemCheckVersionNow ); +- m_menuItemCheckVersionNow = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("&Check for updates now") ) , wxEmptyString, wxITEM_NORMAL ); +- m_menuHelp->Append( m_menuItemCheckVersionNow ); - -- m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ), wxEmptyString, wxITEM_CHECK ); -- m_menuHelp->Append( m_menuItemCheckVersionAuto ); -- m_menuItemCheckVersionAuto->Check( true ); +- m_menuItemCheckVersionAuto = new wxMenuItem( m_menuHelp, wxID_ANY, wxString( _("Check &automatically once a week") ) , wxEmptyString, wxITEM_CHECK ); +- m_menuHelp->Append( m_menuItemCheckVersionAuto ); +- m_menuItemCheckVersionAuto->Check( true ); - -- m_menuHelp->AppendSeparator(); +- m_menuHelp->AppendSeparator(); - - m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL ); - m_menuHelp->Append( m_menuItemAbout ); + m_menuItemAbout = new wxMenuItem( m_menuHelp, wxID_ABOUT, wxString( _("&About") ) + wxT('\t') + wxT("Shift+F1"), wxEmptyString, wxITEM_NORMAL ); + m_menuHelp->Append( m_menuItemAbout ); @@ -1131,8 +1122,6 @@ - m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId()); - m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId()); - m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId()); -- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId()); -- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId()); - m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId()); - m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this ); - m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); -diff -aur 11.10-1/FreeFileSync/Source/ui/gui_generated.h 11.10-2/FreeFileSync/Source/ui/gui_generated.h ---- 11.17-1/FreeFileSync/Source/ui/gui_generated.h.orig 2022-02-06 16:45:53.756498862 -0500 -+++ 11.17-1/FreeFileSync/Source/ui/gui_generated.h 2022-02-06 16:46:55.745086430 -0500 + m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuExportFileList ), this, m_menuItemExportList->GetId()); + m_menuTools->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuResetLayout ), this, m_menuItemResetLayout->GetId()); + m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onShowHelp ), this, m_menuItemHelp->GetId()); +- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersion ), this, m_menuItemCheckVersionNow->GetId()); +- m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuCheckVersionAutomatically ), this, m_menuItemCheckVersionAuto->GetId()); + m_menuHelp->Bind(wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler( MainDialogGenerated::onMenuAbout ), this, m_menuItemAbout->GetId()); + m_bpButtonCmpConfig->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( MainDialogGenerated::onCmpSettings ), NULL, this ); + m_bpButtonCmpConfig->Connect( wxEVT_RIGHT_DOWN, wxMouseEventHandler( MainDialogGenerated::onCompSettingsContextMouse ), NULL, this ); +diff -aur 11.18-0/FreeFileSync/Source/ui/gui_generated.h 11.18-1/FreeFileSync/Source/ui/gui_generated.h +--- 11.18-0/FreeFileSync/Source/ui/gui_generated.h 2022-03-08 16:51:21.114658209 -0500 ++++ 11.18-1/FreeFileSync/Source/ui/gui_generated.h 2022-03-08 16:56:17.057796860 -0500 @@ -95,8 +95,6 @@ - wxMenuItem* m_menuItemShowOverview; - wxMenu* m_menuHelp; - wxMenuItem* m_menuItemHelp; -- wxMenuItem* m_menuItemCheckVersionNow; -- wxMenuItem* m_menuItemCheckVersionAuto; - wxMenuItem* m_menuItemAbout; - wxBoxSizer* bSizerPanelHolder; - wxPanel* m_panelTopButtons; + wxMenuItem* m_menuItemShowOverview; + wxMenu* m_menuHelp; + wxMenuItem* m_menuItemHelp; +- wxMenuItem* m_menuItemCheckVersionNow; +- wxMenuItem* m_menuItemCheckVersionAuto; + wxMenuItem* m_menuItemAbout; + wxBoxSizer* bSizerPanelHolder; + wxPanel* m_panelTopButtons; @@ -231,8 +229,6 @@ - virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); } - virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); } - virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); } -- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); } -- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); } - virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); } - virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); } - virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); } + virtual void onMenuExportFileList( wxCommandEvent& event ) { event.Skip(); } + virtual void onMenuResetLayout( wxCommandEvent& event ) { event.Skip(); } + virtual void onShowHelp( wxCommandEvent& event ) { event.Skip(); } +- virtual void onMenuCheckVersion( wxCommandEvent& event ) { event.Skip(); } +- virtual void onMenuCheckVersionAutomatically( wxCommandEvent& event ) { event.Skip(); } + virtual void onMenuAbout( wxCommandEvent& event ) { event.Skip(); } + virtual void onCompSettingsContextMouse( wxMouseEvent& event ) { event.Skip(); } + virtual void onCompSettingsContext( wxCommandEvent& event ) { event.Skip(); } diff -aur 11.10-1/FreeFileSync/Source/ui/main_dlg.cpp 11.10-2/FreeFileSync/Source/ui/main_dlg.cpp --- 11.16-0/FreeFileSync/Source/ui/main_dlg.cpp 2022-01-04 08:52:19.811432573 -0500 +++ 11.16-1/FreeFileSync/Source/ui/main_dlg.cpp 2022-01-04 08:57:14.506728896 -0500 diff --git a/freefilesync/freefilesync.spec b/freefilesync/freefilesync.spec index 2d7dddf..63cd2e6 100644 --- a/freefilesync/freefilesync.spec +++ b/freefilesync/freefilesync.spec @@ -19,7 +19,7 @@ %define libssh2_name libssh2-%{name} %endif Name: freefilesync -Version: 11.17 +Version: 11.18 Release: 1%{?dist} Summary: A file synchronization utility @@ -217,6 +217,9 @@ update-mime-database -n ${_datadir}/mime 1>/dev/null 2>&1 & : %ghost %config %attr(666, -, -) %{_datadir}/%{name}/GlobalSettings.xml %changelog +* Wed Mar 09 2022 B. Stack <bgstack15@gmail.com> - 11.18-1 +- version bump + * Sun Feb 06 2022 B. Stack <bgstack15@gmail.com> - 11.17-1 - version bump diff --git a/makemkv/makemkv.spec b/makemkv/makemkv.spec index e42ee38..3ea0968 100644 --- a/makemkv/makemkv.spec +++ b/makemkv/makemkv.spec @@ -10,20 +10,23 @@ # on x86_64. %global _missing_build_ids_terminate_build 0 +# stackrpms, 2 disable debug package %define debug_package %{nil} Summary: DVD and Blu-ray to MKV converter and network streamer Name: makemkv -Version: 1.16.5 +Version: 1.16.7 Release: 10%{?dist} License: GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+ URL: http://www.%{name}.com/ -ExclusiveArch: %{ix86} x86_64 +ExclusiveArch: %{ix86} x86_64 aarch64 armv7hl +# stackrpms,3 because copr likes https Source0: https://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz Source1: https://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz Source2: changelog.txt Source3: %{name}.appdata.xml +# stackrpms,4 https and my value add Source4: https://www.%{name}.com/developers/usage.txt#/%{name}con.txt Source5: %{name}-wrapper Source6: settings.conf.example @@ -45,15 +48,20 @@ BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: zlib-devel -Requires: ccextractor +%if 0%{?rhel} == 7 +BuildRequires: devtoolset-8-gcc-c++ +%else +BuildRequires: gcc-c++ +%endif + Requires: hicolor-icon-theme # This makes sure you can open AACS and BD+ encrypted BluRays transparently. # See below in the install section. -Provides: libaacs%{?__isa:%{__isa}}%{!?__isa:%{nil}} = %{version}-%{release} -Provides: libbdplus%{?__isa:%{__isa}}%{!?__isa:%{nil}} = %{version}-%{release} -Obsoletes: libaacs%{?__isa:%{__isa}}%{!?__isa:%{nil}} < %{version}-%{release} -Obsoletes: libbdplus%{?__isa:%{__isa}}%{!?__isa:%{nil}} < %{version}-%{release} +Provides: libaacs%{?_isa} = %{version}-%{release} +Provides: libbdplus%{?_isa} = %{version}-%{release} +Obsoletes: libaacs < %{version}-%{release} +Obsoletes: libbdplus < %{version}-%{release} %description MakeMKV is your one-click solution to convert video that you own into free and @@ -70,9 +78,14 @@ your favorite player on your favorite OS or on your favorite device. %prep %setup -q -T -c -n %{name}-%{version} -a 0 -a 1 cp %{SOURCE2} %{SOURCE4} . +# stackrpms,2 my value add cp %{SOURCE5} %{SOURCE6} . %build +%if 0%{?rhel} == 7 +. /opt/rh/devtoolset-8/enable +%endif + # Accept eula mkdir -p %{name}-bin-%{version}/tmp echo "accepted" > %{name}-bin-%{version}/tmp/eula_accepted @@ -106,6 +119,7 @@ EOF mkdir -p %{buildroot}%{_datadir}/appdata install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/ %endif +# stackrpms,2 install my script %{__install} -m0755 %{SOURCE5} %{buildroot}%{_bindir}/ %check @@ -136,12 +150,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files %license %{name}-bin-%{version}/src/eula_en_linux.txt %license %{name}-oss-%{version}/License.txt +# stackrpms,2 add my conf file %doc changelog.txt makemkvcon.txt settings.conf.example %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh %{_bindir}/makemkv %{_bindir}/makemkvcon -%{_bindir}/sdftool %{_bindir}/mmccextr +%{_bindir}/sdftool +# stackrpms,2 my script %{_bindir}/%{name}-wrapper %{_datadir}/MakeMKV %if 0%{?fedora} @@ -154,33 +170,43 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_libdir}/libmmbd.so.0 %changelog -* Fri Nov 05 2021 B. Stack <bgstack15@gmail.com> - 1.16.5-10 -- Update +* Fri Mar 11 2022 B. Stack <bgstack15@gmail.com> - 1.16.7-10 +- Add stackrpms customization - Remove debug package -* Thu Jul 08 2021 B. Stack <bgstack15@gmail.com> - 1.16.4-10 -- Update +* Tue Mar 01 2022 Simone Caronni <negativo17@gmail.com> - 1.16.7-1 +- Update to 1.16.7. + +* Tue Nov 02 2021 Simone Caronni <negativo17@gmail.com> - 1.16.5-1 +- Update to 1.16.5. + +* Tue Jul 20 2021 Simone Caronni <negativo17@gmail.com> - 1.16.4-1 +- Update to 1.16.4. + +* Fri Mar 26 2021 Simone Caronni <negativo17@gmail.com> - 1.16.3-1 +- Update to 1.16.3. +- Remove ccextractor dependency, mmccextr is a bundled stripped down version. -* Thu Apr 01 2021 B. Stack <bgstack15@gmail.com> - 1.16.3-10 -- Update +* Mon Mar 15 2021 Simone Caronni <negativo17@gmail.com> - 1.16.1-1 +- Update to 1.16.1. -* Tue Dec 15 2020 B. Stack <bgstack15@gmail.com> - 1.15.4-10 -- Update +* Thu Dec 17 2020 Simone Caronni <negativo17@gmail.com> - 1.15.4-1 +- Update to 1.15.4. -* Mon Oct 05 2020 B. Stack <bgstack15@gmail.com> - 1.15.3-10 -- Update +* Mon Oct 12 2020 Simone Caronni <negativo17@gmail.com> - 1.15.3-1 +- Update to 1.15.3. -* Thu Jul 23 2020 B. Stack <bgstack15@gmail.com> - 1.15.2-10 -- Update +* Mon Aug 17 2020 Simone Caronni <negativo17@gmail.com> - 1.15.2-1 +- Update to 1.15.2. -* Thu Apr 16 2020 B. Stack <bgstack15@gmail.com> - 1.15.1-10 -- Update +* Fri Apr 24 2020 Simone Caronni <negativo17@gmail.com> - 1.15.1-1 +- Update to 1.15.1. -* Wed Dec 04 2019 B. Stack <bgstack15@gmail.com> - 1.14.7-10 -- Update +* Sat Mar 07 2020 Simone Caronni <negativo17@gmail.com> - 1.15.0-1 +- Update to 1.15.0. -* Mon Nov 11 2019 B. Stack <bgstack15@gmail.com> - 1.14.5-10 -- Add stackrpms customizations +* Tue Dec 17 2019 Simone Caronni <negativo17@gmail.com> - 1.14.7-1 +- Update to 1.14.7. * Thu Sep 12 2019 Simone Caronni <negativo17@gmail.com> - 1.14.5-1 - Update to 1.14.5. diff --git a/makemkv/stackrpms-makemkv.spec.diff b/makemkv/stackrpms-makemkv.spec.diff index 528f652..32b791b 100644 --- a/makemkv/stackrpms-makemkv.spec.diff +++ b/makemkv/stackrpms-makemkv.spec.diff @@ -1,60 +1,81 @@ ---- 1.14.5-1/makemkv.spec 2019-09-12 12:36:18.000000000 -0400 -+++ 1.14.5-10/makemkv.spec 2019-11-11 08:21:09.541158055 -0500 -@@ -14,7 +14,7 @@ + +--- negativo17/makemkv/makemkv.spec 2022-03-11 09:09:19.698330344 -0500 ++++ stackrpms/makemkv/makemkv.spec 2022-03-11 09:20:23.416023295 -0500 +@@ -10,20 +10,27 @@ + # on x86_64. + + %global _missing_build_ids_terminate_build 0 ++# stackrpms, 2 disable debug package ++%define debug_package %{nil} + Summary: DVD and Blu-ray to MKV converter and network streamer Name: makemkv - Version: 1.14.5 + Version: 1.16.7 -Release: 1%{?dist} +Release: 10%{?dist} License: GuinpinSoft inc and Mozilla Public License Version 1.1 and LGPLv2.1+ URL: http://www.%{name}.com/ - ExclusiveArch: %{ix86} x86_64 -@@ -24,6 +24,9 @@ + ExclusiveArch: %{ix86} x86_64 aarch64 armv7hl + +-Source0: http://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz +-Source1: http://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz ++# stackrpms,3 because copr likes https ++Source0: https://www.%{name}.com/download/%{name}-oss-%{version}.tar.gz ++Source1: https://www.%{name}.com/download/%{name}-bin-%{version}.tar.gz Source2: changelog.txt Source3: %{name}.appdata.xml - Source4: http://www.%{name}.com/developers/usage.txt#/%{name}con.txt +-Source4: http://www.%{name}.com/developers/usage.txt#/%{name}con.txt ++# stackrpms,4 https and my value add ++Source4: https://www.%{name}.com/developers/usage.txt#/%{name}con.txt +Source5: %{name}-wrapper +Source6: settings.conf.example + BuildRequires: desktop-file-utils BuildRequires: expat-devel -@@ -66,6 +69,7 @@ +@@ -71,6 +78,8 @@ %prep %setup -q -T -c -n %{name}-%{version} -a 0 -a 1 cp %{SOURCE2} %{SOURCE4} . ++# stackrpms,2 my value add +cp %{SOURCE5} %{SOURCE6} . %build - # Accept eula -@@ -101,6 +105,7 @@ + %if 0%{?rhel} == 7 +@@ -110,6 +119,8 @@ mkdir -p %{buildroot}%{_datadir}/appdata install -p -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/appdata/ %endif ++# stackrpms,2 install my script +%{__install} -m0755 %{SOURCE5} %{buildroot}%{_bindir}/ %check desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop -@@ -130,10 +135,11 @@ +@@ -139,12 +150,15 @@ %files %license %{name}-bin-%{version}/src/eula_en_linux.txt %license %{name}-oss-%{version}/License.txt -%doc changelog.txt makemkvcon.txt ++# stackrpms,2 add my conf file +%doc changelog.txt makemkvcon.txt settings.conf.example %config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh %{_bindir}/makemkv %{_bindir}/makemkvcon + %{_bindir}/mmccextr + %{_bindir}/sdftool ++# stackrpms,2 my script +%{_bindir}/%{name}-wrapper %{_datadir}/MakeMKV %if 0%{?fedora} %{_datadir}/appdata/%{name}.appdata.xml -@@ -145,6 +151,9 @@ +@@ -156,6 +170,10 @@ %{_libdir}/libmmbd.so.0 %changelog -+* Mon Nov 11 2019 B Stack <bgstack15@gmail.com> - 1.14.5-10 -+- Add stackrpms customizations ++* Fri Mar 11 2022 B. Stack <bgstack15@gmail.com> - 1.16.7-10 ++- Add stackrpms customization ++- Remove debug package + - * Thu Sep 12 2019 Simone Caronni <negativo17@gmail.com> - 1.14.5-1 - - Update to 1.14.5. + * Tue Mar 01 2022 Simone Caronni <negativo17@gmail.com> - 1.16.7-1 + - Update to 1.16.7. |