diff options
| author | Victor Kareh <[email protected]> | 2026-02-11 15:55:14 -0500 |
|---|---|---|
| committer | Luke from DC <[email protected]> | 2026-02-12 20:16:08 +0000 |
| commit | 60cde2ba0f24946272e925c352129fcad18a7c4f (patch) | |
| tree | 882faee3da73840de66444bf245cd55e90640649 /data | |
| parent | 636cd88ac33b7e54fad01b616e6dc8875b0e32ea (diff) | |
| download | libmateweather-60cde2ba0f24946272e925c352129fcad18a7c4f.tar.bz2 libmateweather-60cde2ba0f24946272e925c352129fcad18a7c4f.tar.xz | |
locations: remove compression support
libxml2 is removing built-in zlib support, which breaks reading
compressed Locations.xml.gz files. Instead of implementing our own
decompression, drop compression entirely.
Fixes: #144
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 7f1e1f4..8676fb1 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,15 +6,12 @@ libmateweatherlocations_in_files = Locations.xml.in if USE_ONE_BIG_XML -LOCATIONS_STAMP = +LOCATIONS_STAMP = -libmateweatherlocations_DATA = $(libmateweatherlocations_in_files:.xml.in=.xml$(COMPRESS_EXT)) +libmateweatherlocations_DATA = $(libmateweatherlocations_in_files:.xml.in=.xml) -%.xml$(COMPRESS_EXT): %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) - $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po-locations -o `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"` && \ - if test "x$(COMPRESS_EXT)" = "x.gz"; then \ - gzip -n --force `echo $@ | sed "s/.xml$(COMPRESS_EXT)/.xml/"`; \ - fi +%.xml: %.xml.in $(wildcard $(top_srcdir)/po-locations/*.po) + $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po-locations -o $@ else # USE_ONE_BIG_XML @@ -25,7 +22,7 @@ PO_LOCATIONS = $(shell if test -n "$(LINGUAS)"; then for lang in $(LINGUAS); do # Helper variable libmateweatherlocations_data = $(libmateweatherlocations_in_files:.xml.in=.xml) -libmateweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml$(COMPRESS_EXT)|g") $(libmateweatherlocations_data)$(COMPRESS_EXT) +libmateweatherlocations_DATA = $(shell echo $(PO_LOCATIONS) | sed "s|$(top_srcdir)/po-locations/|Locations.|g;s|\.po|.xml|g") $(libmateweatherlocations_data) # We need this step so that we merge all the make Locations.xy.xml destinations # into one unique destination. This makes -j2 work. (Else, we end up with @@ -38,14 +35,8 @@ $(LOCATIONS_STAMP): $(libmateweatherlocations_in_files) $(PO_LOCATIONS) Makefile GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) -l $$locale --xml --template $< $(top_srcdir)/po-locations/$$locale.po -o $(libmateweatherlocations_data) && \ xmllint --noblanks -o Locations.$$locale.xml $(libmateweatherlocations_data); \ rm -f $(libmateweatherlocations_data); \ - if test "x$(COMPRESS_EXT)" = "x.gz"; then \ - gzip -n --force Locations.$$locale.xml; \ - fi; \ done && \ xmllint --noblanks --dtdvalid $(top_srcdir)/data/$(libmateweatherdtd_DATA) -o Locations.xml $(top_srcdir)/data/$(libmateweatherlocations_in_files) && \ - if test "x$(COMPRESS_EXT)" = "x.gz"; then \ - gzip -n --force Locations.xml; \ - fi && \ touch $@ endif # USE_ONE_BIG_XML |