diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 279681b..525fda0 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,9 @@ jobs: set +x ./configure ${{ matrix.clionly }} --with-werror - name: make - run: make -j$(sysctl -n hw.ncpu || 2) + run: | + cat Makefile.config + make -j$(sysctl -n hw.ncpu || 2) - name: check executability run: ./dvdisaster --version - name: check executable (GUI) @@ -49,7 +51,7 @@ jobs: run: ./.github/workflows/make-mac-app.sh ${{ github.ref }} id: dist - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: ${{ steps.dist.outputs.archive }} draft: true @@ -112,7 +114,7 @@ jobs: cd dist dvdisaster.exe --version - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: ${{ steps.dist.outputs.archive }} draft: true @@ -138,7 +140,7 @@ jobs: run: ./.github/workflows/make-dist.sh ${{ github.ref }} id: dist - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: ${{ steps.dist.outputs.archive }} draft: true @@ -156,7 +158,7 @@ jobs: mkdir -p /tmp/dist docker run --device /dev/fuse --privileged --name uu -d -v $PWD:/code -v /tmp/dist:/dist ubuntu:14.04 sleep 1800 - name: install prerequisites in docker - run: docker exec uu sh -c 'sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man libgtk2.0-dev gtk2-engines-pixbuf gtk2-engines pkg-config gnome-themes-standard fuse' + run: docker exec uu sh -c 'sudo apt update && sudo apt install -y libglib2.0-dev ghostscript man libgtk2.0-dev gtk2-engines-pixbuf gtk2-engines libgail-common pkg-config gnome-themes-standard fuse' - name: configure in docker run: docker exec uu sh -c 'cd /code && ./configure --prefix=/usr' - name: make in docker @@ -164,7 +166,9 @@ jobs: - name: make install in docker run: docker exec uu sh -c 'cd /code && touch documentation/user-manual/manual.pdf && make install DESTDIR=/dist' - name: copy things to dist in docker - run: docker exec uu sh -c 'install -d /dist/usr/lib/gtk-2.0 && cp -va $(pkg-config --variable=libdir gtk+-2.0)/gtk-2.0/$(pkg-config --variable=gtk_binary_version gtk+-2.0)/* /dist/usr/lib/gtk-2.0' + run: | + docker exec uu sh -c 'install -d /dist/usr/lib/gtk-2.0 && cp -va $(pkg-config --variable=libdir gtk+-2.0)/gtk-2.0/$(pkg-config --variable=gtk_binary_version gtk+-2.0)/* /dist/usr/lib/gtk-2.0' + docker exec uu sh -c 'cp -va $(pkg-config --variable=libdir gtk+-2.0)/gtk-2.0/modules /dist/usr/lib/gtk-2.0/' - name: build appimage in docker run: | wget -q https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage @@ -193,7 +197,7 @@ jobs: echo "archive=$archive" >> "$GITHUB_OUTPUT" echo "appimage is <$archive>" - name: Release - uses: softprops/action-gh-release@v1 + uses: softprops/action-gh-release@v2 with: files: ${{ steps.dist.outputs.archive }} draft: true diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c88d4b8..6e80e52 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -32,7 +32,11 @@ jobs: set +x ./configure ${{ matrix.clionly }} ${{ matrix.debugprintf }} --with-werror - name: make - run: make -j$(sysctl -n hw.ncpu || 2) + run: | + cat Makefile.config + echo xxxxxxxxxxxxxxxxxxxxxxx + grep -i icon GNUmakefile + make -j$(sysctl -n hw.ncpu || 2) - name: check executability run: ./dvdisaster --version - name: check executable (GUI) diff --git a/GNUmakefile.template b/GNUmakefile.template index fc3ee59..08f4fc4 100644 --- a/GNUmakefile.template +++ b/GNUmakefile.template @@ -118,11 +118,11 @@ ${BUILDTMP}/build.o : src/build.c src/build.h @echo "Compiling:" src/build.o @$(CC) $(COPTS) -c src/build.c -o $@ -${BUILDTMP}/closure.o : src/closure.c src/inlined-icons.h +${BUILDTMP}/closure.o : src/closure.c $(ICONS) @echo "Compiling:" src/closure.c @$(CC) $(COPTS) -c src/closure.c -o $@ -${BUILDTMP}/icon-factory.o : src/icon-factory.c src/inlined-icons.h +${BUILDTMP}/icon-factory.o : src/icon-factory.c $(ICONS) @echo "Compiling:" src/icon-factory.c @$(CC) $(COPTS) -c src/icon-factory.c -o $@ diff --git a/configure b/configure index 7e73606..e4f140b 100755 --- a/configure +++ b/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="-O2 -fomit-frame-pointer -Wall -Wno-unknown-warning-option -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-format-zero-length" +RECOMMENDED_CFLAGS="-O2 -fomit-frame-pointer -Wall -Wno-unknown-warning-option -Wno-deprecated-declarations -Wno-stringop-truncation -Wno-format-zero-length -Wno-unused-but-set-variable" DEBUG_CFLAGS="-ggdb -Wall" if test -e $BASH_BASED_CONFIGURE; then diff --git a/src/closure.c b/src/closure.c index 1e4600b..c300cba 100644 --- a/src/closure.c +++ b/src/closure.c @@ -23,7 +23,10 @@ /*** src type: some GUI code ***/ #include "dvdisaster.h" -#include "inlined-icons.h" + +#ifdef WITH_GUI_YES + #include "inlined-icons.h" +#endif #if 0 #define Verbose g_printf