Skip to content

Commit 1e9601f

Browse files
committed
Merge remote-tracking branch 'upstream/icewm-1-4-BRANCH' into icewm-1-4-BRANCH
2 parents 196bd41 + f362d18 commit 1e9601f

File tree

5 files changed

+34
-18
lines changed

5 files changed

+34
-18
lines changed

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
[icewm -- read me first file. 2024-03-25]: #
1+
[icewm -- read me first file. 2025-03-09]: #
22

33
Ice Window Manager (IceWM)
44
==========================
@@ -19,7 +19,7 @@ list, and various other GitHub forks.
1919
Release
2020
-------
2121

22-
This is the `icewm-3.4.7` package, released 2024-03-25. This release, and
22+
This is the `icewm-3.7.2` package, released 2025-03-09. This release, and
2323
the latest version, can be obtained from [GitHub][1], using a command such as:
2424

2525
$> git clone https://github.com/bbidulock/icewm.git
@@ -56,6 +56,8 @@ like to spend the extra 15 seconds reading `./configure --help`, some compile
5656
time options can be turned on and off before the build.
5757

5858
For general information on GNU's `./configure`, see the file [INSTALL][7].
59+
To disable sound support, use --without-icesound. When the image library
60+
supports SVG natively, you can use --disable-librsvg and --disable-nanosvg.
5961

6062
Please see the [INSTALL][7] file for more detailed installation instructions.
6163
An alternative way to build IceWM using CMake is [documented here][19].
@@ -74,7 +76,7 @@ Prerequisites
7476
Building from tarball requires:
7577

7678
- gcc or clang
77-
- imlib2
79+
- imlib2 or libgdkpixbuf
7880
- libxcomposite
7981
- libxdamage
8082
- libxfixes
@@ -88,7 +90,12 @@ Building from git also requires:
8890

8991
- complete autoconf or cmake toolchain
9092
- either markdown or asciidoctor
93+
- pod2man
9194

95+
For optional features:
96+
97+
- libjpeg, libpng, librsvg or nanosvg
98+
- gettext, libfribidi
9299

93100
Configuring IceWM
94101
-----------------

README.md.in

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ like to spend the extra 15 seconds reading `./configure --help`, some compile
5656
time options can be turned on and off before the build.
5757

5858
For general information on GNU's `./configure`, see the file [INSTALL][7].
59+
To disable sound support, use --without-icesound. When the image library
60+
supports SVG natively, you can use --disable-librsvg and --disable-nanosvg.
5961

6062
Please see the [INSTALL][7] file for more detailed installation instructions.
6163
An alternative way to build IceWM using CMake is [documented here][19].
@@ -73,7 +75,7 @@ Prerequisites
7375

7476
Building from tarball requires:
7577

76-
- gcc or clang (or C++11 with C99 support)
78+
- gcc or clang
7779
- imlib2 or libgdkpixbuf
7880
- libxcomposite
7981
- libxdamage

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
PACKAGE=icewm
2-
VERSION=3.6.0
2+
VERSION=3.7.2

configure.ac

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# Process this file with autoconf to produce a configure script.
33

44
AC_PREREQ([2.69])
5-
AC_INIT([icewm],[3.6.0],
5+
AC_INIT([icewm],[3.7.2],
66
[https://github.com/bbidulock/icewm/issues],
77
[icewm],[https://ice-wm.org])
8-
AC_REVISION([3.6.0])
8+
AC_REVISION([3.7.2])
99

1010
# set better defaults
1111
AC_PREFIX_DEFAULT([/usr])
@@ -22,13 +22,13 @@ AC_CONFIG_AUX_DIR([scripts])
2222
AC_USE_SYSTEM_EXTENSIONS
2323
AC_CANONICAL_TARGET
2424

25-
DATE='2024-06-16'
25+
DATE='2025-03-09'
2626
AC_SUBST([DATE])
2727

28-
MDOCDATE='June 16, 2024'
28+
MDOCDATE='March 9, 2025'
2929
AC_SUBST([MDOCDATE])
3030

31-
BRANCH='2.1.1'
31+
BRANCH='3.7.2'
3232
AC_SUBST([BRANCH])
3333

3434
APPLICATIONS='icewm icewm-session icesh icewmhint icewmbg icehelp'
@@ -87,7 +87,7 @@ LT_INIT([dlopen])
8787
LT_LANG([C++])
8888
AC_SUBST([LIBTOOL_DEPS])
8989

90-
AM_GNU_GETTEXT_VERSION([0.19.8])
90+
AM_GNU_GETTEXT_VERSION([0.19.2])
9191
AM_GNU_GETTEXT([external])
9292

9393
AC_ARG_ENABLE([i18n],
@@ -296,6 +296,9 @@ for iface in `echo "$with_icesound"|sed 's|,| |g'` ; do
296296
CONFIG_OSS=yes; audio_support=$iface; break],
297297
[AC_MSG_WARN([OSS is not supported])])
298298
;;
299+
(no)
300+
true
301+
;;
299302
(*)
300303
AC_MSG_WARN([Invalid audio interface: $iface])
301304
;;
@@ -308,7 +311,11 @@ then
308311
BUILD_SOUND=yes
309312
APPLICATIONS="${APPLICATIONS} icesound"
310313
else
311-
AC_MSG_WARN([No valid sound interface, not building icesound.])
314+
audio_support=no
315+
if test "x$with_icesound" != "xno"
316+
then
317+
AC_MSG_WARN([No valid sound interface, not building icesound.])
318+
fi
312319
fi
313320

314321
AC_SUBST([AUDIO_CFLAGS])
@@ -348,7 +355,7 @@ fi
348355
AC_SUBST([GIO_CFLAGS])
349356
AC_SUBST([GIO_LIBS])
350357

351-
AC_ARG_ENABLE([rsvg],
358+
AC_ARG_ENABLE([librsvg],
352359
AS_HELP_STRING([--disable-librsvg],[Disable SVG using librsvg.]))
353360
AC_ARG_ENABLE([imlib2],
354361
AS_HELP_STRING([--disable-imlib2],[Disable imlib2 rendering.

po/tr.po

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ msgstr ""
88
"Project-Id-Version: IceWM 1.2.12\n"
99
"Report-Msgid-Bugs-To: https://github.com/bbidulock/icewm/issues\n"
1010
"POT-Creation-Date: 2025-02-22 16:19+0100\n"
11-
"PO-Revision-Date: 2024-10-07 06:40+0000\n"
11+
"PO-Revision-Date: 2025-03-16 10:56+0000\n"
1212
"Last-Translator: Mehmet Akif 9oglu <[email protected]>\n"
13-
"Language-Team: Turkish <https://l10n.opensuse.org/projects/icewm/icewm-1-4-"
14-
"branch/tr/>\n"
13+
"Language-Team: Turkish <https://l10n.opensuse.org/projects/icewm/"
14+
"icewm-1-4-branch/tr/>\n"
1515
"Language: tr\n"
1616
"MIME-Version: 1.0\n"
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919
"Plural-Forms: nplurals=2; plural=n > 1;\n"
20-
"X-Generator: Weblate 5.7.2\n"
20+
"X-Generator: Weblate 5.10.3\n"
2121

2222
#: src/aapm.cc:113
2323
#, c-format
@@ -2117,7 +2117,7 @@ msgstr "O_turum kapatmayı iptal et"
21172117

21182118
#: src/wmapp.cc:523
21192119
msgid "Lock _Workstation"
2120-
msgstr "_Bilgisayarı Kilitle"
2120+
msgstr "Bilgisayarı _Kilitle"
21212121

21222122
#: src/wmapp.cc:525 src/wmdialog.cc:89
21232123
msgid "Re_boot"

0 commit comments

Comments
 (0)