[Commits] [SCM] claws-win32-installer branch, master, updated. 4.3.0-1-48-g9273020

jonathan at claws-mail.org jonathan at claws-mail.org
Sun Dec 8 11:14:16 UTC 2024


The branch, master has been updated
       via  9273020d589c646670c89953f884d913f741f3cd (commit)
      from  f7480fd0be3a15ba4c560978ed43bdf001ff005c (commit)

Summary of changes:
 configure.ac                              |   3 +-
 packages/packages.current                 |   1 -
 patches/bzip2-1.0.8/01-g10-bzlib_h.patch  |  14 --
 patches/bzip2-1.0.8/02-g10-Makefile.patch | 204 ------------------------------
 src/Makefile.am                           |  12 --
 src/config.nsi.in                         |   1 -
 src/sections-installer.nsi                |   4 -
 src/sections-uninstaller.nsi              |   4 -
 8 files changed, 1 insertion(+), 242 deletions(-)
 delete mode 100644 patches/bzip2-1.0.8/01-g10-bzlib_h.patch
 delete mode 100644 patches/bzip2-1.0.8/02-g10-Makefile.patch


- Log -----------------------------------------------------------------
commit 9273020d589c646670c89953f884d913f741f3cd
Author: Jonathan Boeing <jonathan at claws-mail.org>
Date:   Sun Dec 8 01:32:36 2024 -0700

    Remove unused bzip2 package

diff --git a/configure.ac b/configure.ac
index 8c32e89..b14b639 100644
--- a/configure.ac
+++ b/configure.ac
@@ -223,7 +223,6 @@ AC_SUBST(meson_cpu_family)
 # Packages.
 CM_BPKG([bsfilter])
 
-CM_MPKG([bzip2])
 CM_MPKG([poppler_data])
 CM_MPKG([zlib])
 
@@ -235,7 +234,7 @@ CM_SPKG([cyrus_sasl])
 CM_SPKG([enchant], [glib hunspell])
 CM_SPKG([expat])
 CM_SPKG([fontconfig], [expat freetype gettext libiconv libxml2 zlib])
-CM_SPKG([freetype], [bzip2 libpng zlib])
+CM_SPKG([freetype], [libpng zlib])
 CM_SPKG([fribidi])
 CM_SPKG([gdk_pixbuf], [gettext glib libpng])
 CM_SPKG([gettext], [libiconv libxml2])
diff --git a/packages/packages.current b/packages/packages.current
index 20d3cdb..eb392bb 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -17,7 +17,6 @@ claws_mail,,git,git://git.claws-mail.org/claws.git,,,HEAD
 adwaita_icon_theme,41.0,file,https://download.gnome.org/sources/adwaita-icon-theme/41/adwaita-icon-theme-41.0.tar.xz,ef5339d8c35fcad5d10481b70480803f0fa20b3d3cbc339238fcaceeaee01eba,,
 atk,2.38.0,file,https://download.gnome.org/sources/atk/2.38/atk-2.38.0.tar.xz,ac4de2a4ef4bd5665052952fe169657e65e895c5057dffb3c2a810f6191a0c36,,
 bsfilter,1.0.16,file,https://www.claws-mail.org/win32/bsfilter-1.0.16-bin.tar.gz,d95938a0af1a55f69d0f24d500b663529af122a651a06e0eb046b44064f37d85,,
-bzip2,1.0.8,file,https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz,ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269,,
 cairo,1.18.2,file,https://cairographics.org/releases/cairo-1.18.2.tar.xz,a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a,,
 certdata,20240827,file,https://hg.mozilla.org/releases/mozilla-release/raw-file/9727cd2f7983d01cc4fd3b5ef21b72fc8f6a052a/security/nss/lib/ckfw/builtins/certdata.txt,36105b01631f9fc03b1eca779b44a30a1a5890b9bf8dc07ccb001a07301e01cf,,
 curl,8.11.0,file,https://curl.se/download/curl-8.11.0.tar.xz,db59cf0d671ca6e7f5c2c5ec177084a33a79e04c97e71cf183a5cdea235054eb,,
diff --git a/patches/bzip2-1.0.8/01-g10-bzlib_h.patch b/patches/bzip2-1.0.8/01-g10-bzlib_h.patch
deleted file mode 100644
index a5ef54a..0000000
--- a/patches/bzip2-1.0.8/01-g10-bzlib_h.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN a/bzlib.h b/bzlib.h
---- a/bzlib.h	2010-09-10 16:08:42.000000000 -0700
-+++ b/bzlib.h	2010-09-23 00:04:43.000000000 -0700
-@@ -75,7 +75,9 @@
- #include <stdio.h>
- #endif
- 
--#ifdef _WIN32
-+/* We do not need a DLL and thus we don't want to include the
-+   Windows header file.   (g10 Code, 2007-08-20) */
-+#if defined( _WIN32 ) && 0
- #   include <windows.h>
- #   ifdef small
-       /* windows.h define small to char */
diff --git a/patches/bzip2-1.0.8/02-g10-Makefile.patch b/patches/bzip2-1.0.8/02-g10-Makefile.patch
deleted file mode 100644
index 92adf14..0000000
--- a/patches/bzip2-1.0.8/02-g10-Makefile.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-diff -urN a/Makefile b/Makefile
---- a/Makefile	2010-09-10 15:46:02.000000000 -0700
-+++ b/Makefile	2010-09-23 00:06:44.000000000 -0700
-@@ -11,17 +11,19 @@
- # This program is released under the terms of the license contained
- # in the file LICENSE.
- # ------------------------------------------------------------------
-+#
-+# Modified by g10 Code on 2010-09-23.
-+#
- 
- SHELL=/bin/sh
- 
- # To assist in cross-compiling
--CC=gcc
-+CC=cc
- AR=ar
- RANLIB=ranlib
- LDFLAGS=
- 
--BIGFILES=-D_FILE_OFFSET_BITS=64
--CFLAGS=-Wall -Winline -O2 -g $(BIGFILES)
-+CFLAGS=-Wall -Winline -O2 -g 
- 
- # Where you want it installed when you do 'make install'
- PREFIX=/usr/local
-@@ -35,13 +37,7 @@
-       decompress.o \
-       bzlib.o
- 
--all: libbz2.a bzip2 bzip2recover test
--
--bzip2: libbz2.a bzip2.o
--	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2 bzip2.o -L. -lbz2
--
--bzip2recover: bzip2recover.o
--	$(CC) $(CFLAGS) $(LDFLAGS) -o bzip2recover bzip2recover.o
-+all: libbz2.a
- 
- libbz2.a: $(OBJS)
- 	rm -f libbz2.a
-@@ -52,69 +48,18 @@
- 		$(RANLIB) libbz2.a ; \
- 	fi
- 
--check: test
--test: bzip2
--	@cat words1
--	./bzip2 -1  < sample1.ref > sample1.rb2
--	./bzip2 -2  < sample2.ref > sample2.rb2
--	./bzip2 -3  < sample3.ref > sample3.rb2
--	./bzip2 -d  < sample1.bz2 > sample1.tst
--	./bzip2 -d  < sample2.bz2 > sample2.tst
--	./bzip2 -ds < sample3.bz2 > sample3.tst
--	cmp sample1.bz2 sample1.rb2 
--	cmp sample2.bz2 sample2.rb2
--	cmp sample3.bz2 sample3.rb2
--	cmp sample1.tst sample1.ref
--	cmp sample2.tst sample2.ref
--	cmp sample3.tst sample3.ref
--	@cat words3
--
--install: bzip2 bzip2recover
--	if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi
-+install: libbz2.a
- 	if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi
--	if ( test ! -d $(PREFIX)/man ) ; then mkdir -p $(PREFIX)/man ; fi
--	if ( test ! -d $(PREFIX)/man/man1 ) ; then mkdir -p $(PREFIX)/man/man1 ; fi
- 	if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi
--	cp -f bzip2 $(PREFIX)/bin/bzip2
--	cp -f bzip2 $(PREFIX)/bin/bunzip2
--	cp -f bzip2 $(PREFIX)/bin/bzcat
--	cp -f bzip2recover $(PREFIX)/bin/bzip2recover
--	chmod a+x $(PREFIX)/bin/bzip2
--	chmod a+x $(PREFIX)/bin/bunzip2
--	chmod a+x $(PREFIX)/bin/bzcat
--	chmod a+x $(PREFIX)/bin/bzip2recover
--	cp -f bzip2.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzip2.1
- 	cp -f bzlib.h $(PREFIX)/include
- 	chmod a+r $(PREFIX)/include/bzlib.h
- 	cp -f libbz2.a $(PREFIX)/lib
- 	chmod a+r $(PREFIX)/lib/libbz2.a
--	cp -f bzgrep $(PREFIX)/bin/bzgrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep
--	ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep
--	chmod a+x $(PREFIX)/bin/bzgrep
--	cp -f bzmore $(PREFIX)/bin/bzmore
--	ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless
--	chmod a+x $(PREFIX)/bin/bzmore
--	cp -f bzdiff $(PREFIX)/bin/bzdiff
--	ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp
--	chmod a+x $(PREFIX)/bin/bzdiff
--	cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1
--	chmod a+r $(PREFIX)/man/man1/bzgrep.1
--	chmod a+r $(PREFIX)/man/man1/bzmore.1
--	chmod a+r $(PREFIX)/man/man1/bzdiff.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzegrep.1
--	echo ".so man1/bzgrep.1" > $(PREFIX)/man/man1/bzfgrep.1
--	echo ".so man1/bzmore.1" > $(PREFIX)/man/man1/bzless.1
--	echo ".so man1/bzdiff.1" > $(PREFIX)/man/man1/bzcmp.1
- 
- clean: 
--	rm -f *.o libbz2.a bzip2 bzip2recover \
--	sample1.rb2 sample2.rb2 sample3.rb2 \
--	sample1.tst sample2.tst sample3.tst
-+	rm -f *.o libbz2.a 
- 
- blocksort.o: blocksort.c
--	@cat words0
- 	$(CC) $(CFLAGS) -c blocksort.c
- huffman.o: huffman.c
- 	$(CC) $(CFLAGS) -c huffman.c
-@@ -128,90 +73,6 @@
- 	$(CC) $(CFLAGS) -c decompress.c
- bzlib.o: bzlib.c
- 	$(CC) $(CFLAGS) -c bzlib.c
--bzip2.o: bzip2.c
--	$(CC) $(CFLAGS) -c bzip2.c
--bzip2recover.o: bzip2recover.c
--	$(CC) $(CFLAGS) -c bzip2recover.c
--
- 
- distclean: clean
--	rm -f manual.ps manual.html manual.pdf
--
--DISTNAME=bzip2-1.0.8
--dist: check manual
--	rm -f $(DISTNAME)
--	ln -s -f . $(DISTNAME)
--	tar cvf $(DISTNAME).tar \
--	   $(DISTNAME)/blocksort.c \
--	   $(DISTNAME)/huffman.c \
--	   $(DISTNAME)/crctable.c \
--	   $(DISTNAME)/randtable.c \
--	   $(DISTNAME)/compress.c \
--	   $(DISTNAME)/decompress.c \
--	   $(DISTNAME)/bzlib.c \
--	   $(DISTNAME)/bzip2.c \
--	   $(DISTNAME)/bzip2recover.c \
--	   $(DISTNAME)/bzlib.h \
--	   $(DISTNAME)/bzlib_private.h \
--	   $(DISTNAME)/Makefile \
--	   $(DISTNAME)/LICENSE \
--	   $(DISTNAME)/bzip2.1 \
--	   $(DISTNAME)/bzip2.1.preformatted \
--	   $(DISTNAME)/bzip2.txt \
--	   $(DISTNAME)/words0 \
--	   $(DISTNAME)/words1 \
--	   $(DISTNAME)/words2 \
--	   $(DISTNAME)/words3 \
--	   $(DISTNAME)/sample1.ref \
--	   $(DISTNAME)/sample2.ref \
--	   $(DISTNAME)/sample3.ref \
--	   $(DISTNAME)/sample1.bz2 \
--	   $(DISTNAME)/sample2.bz2 \
--	   $(DISTNAME)/sample3.bz2 \
--	   $(DISTNAME)/dlltest.c \
--	   $(DISTNAME)/manual.html \
--	   $(DISTNAME)/manual.pdf \
--	   $(DISTNAME)/manual.ps \
--	   $(DISTNAME)/README \
--	   $(DISTNAME)/README.COMPILATION.PROBLEMS \
--	   $(DISTNAME)/README.XML.STUFF \
--	   $(DISTNAME)/CHANGES \
--	   $(DISTNAME)/libbz2.def \
--	   $(DISTNAME)/libbz2.dsp \
--	   $(DISTNAME)/dlltest.dsp \
--	   $(DISTNAME)/makefile.msc \
--	   $(DISTNAME)/unzcrash.c \
--	   $(DISTNAME)/spewG.c \
--	   $(DISTNAME)/mk251.c \
--	   $(DISTNAME)/bzdiff \
--	   $(DISTNAME)/bzdiff.1 \
--	   $(DISTNAME)/bzmore \
--	   $(DISTNAME)/bzmore.1 \
--	   $(DISTNAME)/bzgrep \
--	   $(DISTNAME)/bzgrep.1 \
--	   $(DISTNAME)/Makefile-libbz2_so \
--	   $(DISTNAME)/bz-common.xsl \
--	   $(DISTNAME)/bz-fo.xsl \
--	   $(DISTNAME)/bz-html.xsl \
--	   $(DISTNAME)/bzip.css \
--	   $(DISTNAME)/entities.xml \
--	   $(DISTNAME)/manual.xml \
--	   $(DISTNAME)/format.pl \
--	   $(DISTNAME)/xmlproc.sh
--	gzip -v $(DISTNAME).tar
--
--# For rebuilding the manual from sources on my SuSE 9.1 box
--
--MANUAL_SRCS= 	bz-common.xsl bz-fo.xsl bz-html.xsl bzip.css \
--		entities.xml manual.xml 
--
--manual: manual.html manual.ps manual.pdf
--
--manual.ps: $(MANUAL_SRCS)
--	./xmlproc.sh -ps manual.xml
--
--manual.pdf: $(MANUAL_SRCS)
--	./xmlproc.sh -pdf manual.xml
- 
--manual.html: $(MANUAL_SRCS)
--	./xmlproc.sh -html manual.xml
diff --git a/src/Makefile.am b/src/Makefile.am
index 9aa4944..76f6034 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -341,18 +341,6 @@ cm_pkg_gumbo_parser_configure = \
 
 # Extra options for the make invocations for individual packages.
 # make_flags is used for building, make_args_inst is used for installing.
-cm_pkg_bzip2_make_args = \
-	-j$(CM_MAKE_JOBS) \
-	CC=$(CC) \
-	AR=$(AR) \
-	RANLIB=$(RANLIB)
-
-cm_pkg_bzip2_make_args_inst = \
-	PREFIX=$(pkg_idir) \
-	CC=$(CC) \
-	AR=$(AR) \
-	RANLIB=$(RANLIB)
-
 cm_pkg_zlib_make_args = \
 	-j$(CM_MAKE_JOBS) \
 	-fwin32/Makefile.gcc \
diff --git a/src/config.nsi.in b/src/config.nsi.in
index d87bc30..6346bf2 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -63,7 +63,6 @@
 !define cm_pkg_libpsl_version @cm_pkg_libpsl_version@
 !define cm_pkg_bsfilter_version @cm_pkg_bsfilter_version@
 !define cm_pkg_zlib_version @cm_pkg_zlib_version@
-!define cm_pkg_bzip2_version @cm_pkg_bzip2_version@
 !define cm_pkg_libpng_version @cm_pkg_libpng_version@
 !define cm_pkg_hunspell_version @cm_pkg_hunspell_version@
 !define cm_pkg_enchant_version @cm_pkg_enchant_version@
diff --git a/src/sections-installer.nsi b/src/sections-installer.nsi
index 53731c4..be295df 100644
--- a/src/sections-installer.nsi
+++ b/src/sections-installer.nsi
@@ -36,10 +36,6 @@ File "${libwinpthread_dir}/${libwinpthread_dll}"
 
 ### Now install files for each software component
 
-#######################################
-### bzip2
-# Nothing to install, as we link statically
-
 #######################################
 ### libiconv
 !insertmacro SetPrefix libiconv
diff --git a/src/sections-uninstaller.nsi b/src/sections-uninstaller.nsi
index aae68b6..63301b9 100644
--- a/src/sections-uninstaller.nsi
+++ b/src/sections-uninstaller.nsi
@@ -429,10 +429,6 @@ Delete "$INSTDIR\libtasn1-6.dll"
 ### libiconv
 Delete /REBOOTOK "$INSTDIR\libiconv-2.dll"
 
-#######################################
-### bzip2
-# Nothing to uninstall, as we link statically
-
 
 ### Final cleanup
 Delete /REBOOTOK "$INSTDIR\${libstdcpp_dll}"

-----------------------------------------------------------------------


hooks/post-receive
-- 
Installer sources for Claws Mail Windows port


More information about the Commits mailing list