Fix compilation on Arch Linux

.github/workflows/make-dist.sh

@@ -31,8 +31,11 @@ cp -va locale/*/ dist/locale/
 if [ "$os" != "linux64" ]; then
   lookup_dependencies="dvdisaster"
   if [ "$GUI" = 1 ]; then
+    echo "!> Copying glib2 schemas..."
+    mkdir -p dist/share/glib-2.0
+    cp -va "$MINGW_PREFIX/share/glib-2.0/schemas" dist/share/glib-2.0/
     echo "!> Copying default icons..."
-    mkdir -p dist/share
+    mkdir -p dist/share/
     cp -va "$MINGW_PREFIX/share/icons" dist/share/
     loaders_cache="$(find "$MINGW_PREFIX/lib/gdk-pixbuf-2.0/" -name loaders.cache | head -n1)"
     pixbuf_dir="$(dirname "$loaders_cache")"

.github/workflows/make-mac-app.sh

@@ -10,7 +10,7 @@ else
   suffix=""
 fi
 
-archive="dvdisaster-$(echo "$github_ref" | grep -Eo '[^/]+$')$suffix.dmg"
+archive="dvdisaster-$(echo "$github_ref" | grep -Eo '[^/]+$')-macos$suffix.dmg"
 [ -n "$GITHUB_OUTPUT" ] && echo "archive=$archive" >> "$GITHUB_OUTPUT"
 echo "mac dmg is <$archive>"
 

CHANGELOG

@@ -20,6 +20,17 @@
 #  You should have received a copy of the GNU General Public License
 #  along with dvdisaster. If not, see <http://www.gnu.org/licenses/>.
 
+0.79.10.patchlevel-5 11-05-2025 *UNOFFICIAL*
+- fix: GUI fileopen dialog crash
+
+0.79.10.patchlevel-4 04-05-2025 *UNOFFICIAL*
+- enh: port the GUI to gtk3
+- enh: speedup RS03 repair
+- enh: add support for HD-DVD(-R(W))
+- fix: RS03 exhaustive search on BD-R when --no-bd-defect-management is used
+- fix: a few coding errors found by static analysis (no major impact)
+- fix: disable strip button on GUI when working
+
 0.79.10.patchlevel-3 17-02-2024 *UNOFFICIAL*
 - fix: corrupt data under Windows with mmap
 - fix: re-enable buttons after Split is used

CREDITS.de

@@ -14,6 +14,9 @@ Jesus Cea <jcea@jcea.es>
    hat das Projekt am Leben erhalten und ermöglicht momentan das
    Datenhosting.
 
+Paul Dicker (@pitdicker on GitHub)
+   migrierte die Anwendung von GTK2 nach GTK3.
+
 Julian Einwag (julian@einwag.de)
    erstellt und pflegt die Mac OS X / Darwin - spezifischen Anpassungen.
 
@@ -56,4 +59,4 @@ Sergey Svishchev (svs@ropnet.ru)
 
 Viele andere Personen haben weitere Anregungen und Fehlerberichte
 geliefert; schauen Sie auch in den Änderungsbericht für weitere
-Einzelheiten darüber.
+Einzelheiten darüber.

CREDITS.en

@@ -13,6 +13,9 @@ Harald Bögeholz (hwb@heise.de)
 Jesus Cea <jcea@jcea.es>
    for keeping the project alive and providing hosting for the project
 
+Paul Dicker (@pitdicker on GitHub)
+   for porting the codebase from GTK2 to GTK3.
+
 Julian Einwag (julian@einwag.de).
    provides and maintains the Mac OS X / Darwin port.
 

GNUmakefile.template

@@ -114,6 +114,10 @@ ${BUILDTMP}/%.o : src/%.c
 	@echo "Compiling:" $?
 	@$(CC) $(COPTS) -c $? -o $@
 
+${BUILDTMP}/inlined-icons.c.o : ${BUILDTMP}/inlined-icons.c
+	@echo "Compiling:" $?
+	@$(CC) $(COPTS) -c $? -o $@
+
 ${BUILDTMP}/build.o : src/build.c src/build.h
 	@echo "Compiling:" src/build.o
 	@$(CC) $(COPTS) -c src/build.c -o $@
@@ -139,7 +143,7 @@ dvdisaster: $(OFILES)
 
 $(BUILDTMP)/inlined-icons.c: icons/icons.gresource.xml icons/cd.svg icons/close.svg icons/create.svg icons/fix-symbolic.svg icons/log.svg icons/manual.svg icons/open-ecc.svg icons/open-img.svg icons/preferences.svg icons/quit.svg icons/read-symbolic.svg icons/scan-symbolic.svg icons/stop.svg icons/strip.svg icons/verify-symbolic.svg
 	@echo "Generating:" $(ICONS)
-	glib-compile-resources --generate-source --target=$(ICONS) --sourcedir=icons icons/icons.gresource.xml
+	@glib-compile-resources --generate-source --target=$(ICONS) --sourcedir=icons icons/icons.gresource.xml
 
 $(BUILDTMP)/rs-encoder-sse2.o: src/rs-encoder-sse2.c
 	@echo "Compiling:" src/rs-encoder-sse2.c

README.md

@@ -10,35 +10,25 @@ Please refer to the [PDF manual](documentation/user-manual/manual.pdf) for more
 
 # :wrench: Unofficial version
 
-The last upstream version by Carsten Gnörlich is dated 2017, and could be found on the
-[official](https://web.archive.org/web/20180428070843/http://dvdisaster.net/en/index.html)
-[website](https://web.archive.org/web/20180509154525/http://dvdisaster.org/en/index.html)
-which is [now](http://www.dvdisaster.net) [down](http://www.dvdisaster.org).
-The original source code [repository](https://sourceforge.net/projects/dvdisaster/files/dvdisaster) doesn't have it,
-but [Debian sources](https://sources.debian.org/src/dvdisaster/) does, thanks to the maintainer there.
-The original [README](README) has been left untouched in this repository.
+The last upstream version dates back to 2021, and can be found on the [official website](https://dvdisaster.jcea.es).
 
 This version is built on top of the latest upstream version, with the following notable enhancements:
 
 - Added pre-defined sizes for BD-R Triple Layer (100GB), BD-R Quadruple Layer (128GB)
-- Added an option to use more space for ECC on BD-R
-- Windows build supported again (it was dropped upstream a few versions back)
+- Added an option to use more space for ECC on BD-R when using RS03 (`--no-bdr-defect-management`)
+- Re-enabled adaptive reading for RS01 and RS02, and optionally for RS03 on user request (more on that below)
+- Ability to strip an augmented image from its additional ECC-data
 - A new CLI-only version, not depending on gtk (`./configure --with-gui=no && make clean && make -j4`)
-- Non-regression tests on each code change, for Linux64 and Windows32/64, CLI and GUI versions
-- Prebuilt binaries for Windows32, Windows64, Linux64 (static builds and AppImage builds), CLI and GUI versions
-- Fixed a bunch of (minor) quirks, a few (minor) bugs, added a couple (minor) features
+- GUI codebase ported from gtk2 to gtk3 to ensure future-proofness
+- Windows and macOS builds are supported again, those were dropped upstream a few versions back
+- Non-regression tests on each code change, along with prebuilt binaries for Linux64, Windows32/64 and macOS, for both CLI and GUI versions
+- Fixed a bunch of other (minor) quirks, a few (minor) bugs, added a couple other (minor) features
 
 Please refer to the [CHANGELOG](CHANGELOG) for all the details.
 
-In 2021, upstream development briefly resumed [on a new website](https://dvdisaster.jcea.es/).
-The new team successfully picked up some of the improvements of this unofficial version.
-If/when upstream resumes development again, their changes will be merged back here when possible.
-In any case, even if at some point we succeed in upstreaming all our patches, and both codebases are exactly the same,
-this repository will stay up as it provides automated tests and prebuilt binaries.
-
 This version will never break compatibility with upstream versions,
 the goal is to ensure an optical media protected by upstream dvdisaster will still be able to be repaired
-with this version 10+ years from now. Regression tests are here to ensure this is the case.
+with this version, decades from now. Regression tests are here to ensure this is the case.
 
 # :twisted_rightwards_arrows: 3 available protection modes ("codecs")
 
@@ -61,7 +51,7 @@ augmented images, with the following added features:
 - RS03 augmented images and error correction files are - contrary to RS01, and to a lesser extent RS02 - robust against
   damage of the dvdisaster-added recovery data itself
 
-There are, however, a few cons that must be noted:
+There are, however, a few cons that must be noted for RS03:
 
 - In image mode, the RS03 augmented image file size will be picked up from a predefined list of well-known medium sizes,
   while the size of augmented images can be freely chosen in RS02. This is the "price to pay" for the added robustness
@@ -77,6 +67,8 @@ There are, however, a few cons that must be noted:
 
 # :mag: Comparison table
 
+This attempts to summarize the differences, pros and cons of each codec:
+
 | Codecs                               | RS01 (separate file, obsolete) | RS02 (augmented image)         | RS03 (in separate file mode)   | RS03 (in augmented image mode) |
 |--------------------------------------|--------------------------------|--------------------------------|--------------------------------|--------------------------------|
 | Robustness :one:                     | :star:                         | :star::star::star:             | :star::star::star::star::star: | :star::star::star::star::star: |
@@ -86,21 +78,22 @@ There are, however, a few cons that must be noted:
 | Damaged media recovery speed :three: | :star:                         | :star::star::star:             | :star:                         | :star:                         |
 | Supports customizing redundancy size | :heavy_check_mark:             | :heavy_check_mark:             | :heavy_check_mark:             | :x: :four:                     |
 
-:one: Robustness against corruption of the dvdisaster-added ECC parts themselves. The higher the ranking, the less it is likely than a few badly located damaged sectors render the whole correction impossible because they affect dvdisaster metadata on-disc. For example corruption of the first dozens of sectors of an image can make RS02 entirely unusable regardless of the redundancy.
+:one: Here we're talking about the robustness against corruption of the dvdisaster-added ECC parts _themselves_. The higher the ranking, the less it is likely than a few badly located damaged sectors render the whole correction impossible because they affect dvdisaster metadata on-disc. For example, corruption of the first dozens of sectors of an image can make RS02 entirely unusable regardless of the redundancy data originally stored on it.
 
-:two: When algorithm is CPU-bound, i.e. generating or repairing an image stored on a SSD/NVMe drive.
+:two: When algorithm is CPU-bound, i.e. generating or repairing an image stored on a SSD/NVMe drive where the storage i/o speed is not an issue.
 
 :three: Using adaptive reading when supported (RS02), limiting the number of damaged sectors that need to be read to what is strictly necessary for repair. Using linear reading otherwise (RS03 and separate file codecs), assuming a badly damaged media, taking into account the time the drive takes to try to read damaged sectors.
 
-:four: The robustness of RS03 comes at the cost of having to augment images strictly to well-known media sizes, as explained in the previous section. This usually doesn't make much difference as long as you intend to burn the augmented image to a classic medium (CD-R, DVD-R, BD-R, ...).
+:four: The robustness of RS03 comes at the cost of having to augment images strictly to well-known media sizes, as explained in the previous section above. This usually doesn't make much difference as long as you intend to burn the augmented image to a classic medium (CD-R, DVD-R, BD-R, ...).
 
 # :bulb: Rationale
 
-Even if the optical media era is sunsetting now, and has been for a few years, it's still of some value for off-site backups.
+Even if the peak of the optical media era is well behind us, optical media is still of some value for specific use cases such as off-site backups.
 In any case, we still have media in our hands that we want to be able to repair, should it be damaged, during the next years/decades.
 Repairing is actually pretty much the very reason of dvdisaster existence (as long as parity data has been added, of course).
-The idea of this unofficial version is to ensure dvdisaster doesn't get hard to find, use or compile, ~~should upstream development never resume (we hope it does!)~~
-This is also why precompiled Windows binaries and a precompiled static CLI-only Linux version are available here.
+The main purpose of this unofficial version is to ensure dvdisaster doesn't get hard to find, use or compile on recent systems.
+To this effect, prebuilt binaries are available for the 3 main categories of operating systems, and on top of that we've also fixed a few
+bugs and added a few tiny features.
 
 # :hammer: Compiling
 

configure

@@ -26,7 +26,7 @@
 BASH_BASED_CONFIGURE=./scripts/bash-based-configure
 BASH_BASED_CONFIGURE_OPTS="--buildtmp=$(pwd)/build $@"
 REQUIRED_CFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -I. -pipe"
-RECOMMENDED_CFLAGS="-Wall -Wno-unknown-warning-option -Wno-stringop-truncation -Wno-format-zero-length -Wno-unused-but-set-variable"
+RECOMMENDED_CFLAGS="-Wall -Wno-format-zero-length -Wno-unused-but-set-variable"
 NODEBUG_CFLAGS="-O2 -fomit-frame-pointer"
 DEBUG_CFLAGS="-ggdb"
 
@@ -41,7 +41,7 @@ fi
 # Set the package name and version
 
 PACKAGE dvdisaster 0.79.10
-DEFINE_INT PATCHLEVEL 3
+DEFINE_INT PATCHLEVEL 5
 DEFINE_STRING HAVE_UNSTABLE_RELEASE 1
 DEFINE_STRING HOMEPAGE "https://dvdisaster.jcea.es"
 

documentation/user-manual/manual.tex

@@ -1,7 +1,7 @@
 \documentclass[12pt,a4paper,twoside]{article}
+\usepackage[utf8x]{inputenc} % Aktiviert Eingabe von unicode-Zeichensätzen
 \usepackage{times}	% Skalierbarer und lesbarer Zeichensatz
 \usepackage{ucs}	% Benötigt für Eingabe von unicode-Zeichensätzen
-\usepackage[utf8x]{inputenc} % Aktiviert Eingabe von unicode-Zeichensätzen
 \usepackage{epsfig}	% Makros zum Einfügen von Grafiken
 \usepackage{anysize}	% Makros zum Einstellen der Seitenränder
 %\usepackage{makeidx}	% Makros zum Erstellen des Indexes

src/help-dialogs.c

@@ -780,11 +780,13 @@ void GuiAboutDialog()
    GuiAboutTextWithLink(vbox, text, HOMEPAGE);
    g_free(text);
 
-   GuiAboutTextWithLink(vbox, _("\nThis version is <b>not the original</b>. It has been patched\n"
-			     "for Debian to support DVD-ROMs (with and without encryption),\n"
-			     "and subsequently patched again to support a CLI-only build, among other things.\n\n"
-			     "Please do not bother the original authors of dvdisaster\n"
-			     "but submit bugreports against [GitHub] instead.\n"),
+   GuiAboutTextWithLink(vbox, _("\nThis version is <b>not the original</b>. It has been enhanced mainly to\n"
+			     "add support for BD-R TL/QL and HD-DVD, add support for stripping ECC from ISOs,\n"
+                             "add an option to generate BD-R RS03 images with more redundancy,\n"
+			     "re-enable adaptive reading support,\n"
+                             "port the GUI to GTK3, and a lot of other things.\n\n"
+			     "Please do not bother the original authors of dvdisaster,\n"
+			     "submit bugreports against [GitHub] instead.\n"),
 			     "https://github.com/speed47/dvdisaster");
    
 #ifdef SYS_NETBSD

src/menubar.c

@@ -249,7 +249,10 @@ GtkWidget *GuiCreateMenuBar(GtkWidget *parent)
    add_menu_separator(menu_strip);
 
    add_menu_button(menu_strip, _("menu|Change log"), MENU_HELP_CHANGELOG);
-   add_menu_button(menu_strip, _("menu|To do list"), MENU_HELP_TODO);
+
+   /* Hide the todo list menu in the patchlevel series, as we're not upstream
+    * add_menu_button(menu_strip, _("menu|To do list"), MENU_HELP_TODO);
+    */
 
    menu_anchor = gtk_menu_item_new_with_label(_utf("menu|Help"));
    gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_anchor), menu_strip);
@@ -365,12 +368,12 @@ static void file_select_cb(GtkWidget *widget, gpointer data)
          gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(dialog),
                                        gtk_entry_get_text(GTK_ENTRY(Closure->eccEntry)));
          if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
-         {  g_free(Closure->imageName);
+         {  g_free(Closure->eccName);
             Closure->eccName = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
             if(Closure->autoSuffix)
                Closure->eccName = ApplyAutoSuffix(Closure->eccName, "ecc");
-            gtk_entry_set_text(GTK_ENTRY(Closure->eccName), Closure->eccName);
-            gtk_editable_set_position(GTK_EDITABLE(Closure->eccName), -1);
+            gtk_entry_set_text(GTK_ENTRY(Closure->eccEntry), Closure->eccName);
+            gtk_editable_set_position(GTK_EDITABLE(Closure->eccEntry), -1);
          }
          gtk_widget_destroy (dialog);
          break;

src/read-adaptive.c

@@ -691,9 +691,11 @@ static void open_and_determine_mode(read_closure *rc)
    {  int answer;
       PrintLog(_("%s-type ECC found\n"), "RS03");
       answer = ModalWarning(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK_CANCEL, NULL,
-			    _("Adaptive reading has not been adapted yet to handle RS03-augmented images properly.\n"
-			      "To quote the original author: \"behaviour with RS03 is unpredictable and undefined\".\n"
-			      "You should cancel and use the linear reading strategy instead. Continue at your own risk.\n"));
+			    _("Adaptive reading has not been adapted yet to handle RS03-augmented images in an optimal way.\n"
+			      "The 'divide and conquer' reading method will still be applied, by attempting to detect and skip\n"
+                              "badly damaged zones and give priority to good zones first. However we won't stop reading automatically\n"
+                              "once enough data and ECC data have been recovered to be able to rebuild the image, as we do for RS02.\n"
+			      "You should stop the reading and launch a 'verify' yourself from time to time to see if this is the case.\n"));
 
       if(!answer)
       {  GuiSetAdaptiveReadFootline(_("Aborted by user request!"), Closure->redText);

src/welcome-window.c

@@ -80,9 +80,14 @@ void GuiCreateWelcomePage(GtkNotebook *notebook)
 
    GuiAboutText(box, _("<i>New in this Version:</i>"));
 
-   GuiAboutTextWithLink(box, _("This is <b>v0.79.10-pl3</b>. The [patchlevel series] are enhanced from the last upstream release.\n"
-      "We add support for BD-R TL/QL, Windows and MacOS builds, an option to produce bigger BD-R RS03,\n"
-      "images, support for stripping ECC from ISOs, re-enabled adaptive reading (except for RS03), and more.\n"
+   GuiAboutTextWithLink(box, _(
+      "This is <b>v0.79.10-pl5</b>. The [patchlevel series] are enhanced on top of the last upstream release to:\n"
+      "- add support for BD-R TL/QL and HD-DVD,\n"
+      "- add support for stripping ECC from ISOs,\n"
+      "- add an option to generate BD-R RS03 images with more redundancy,\n"
+      "- re-enable adaptive reading support,\n"
+      "- port the GUI to GTK3,\n"
+      "- ... and a lot more.\n"
       "\n"
       "Please refer to the <i>Help &gt; Change log</i> menu for all the details."), "https://github.com/speed47/dvdisaster");