From e601a6c7dec6aa4d2af71e621fa6102147120343 Mon Sep 17 00:00:00 2001 From: Anders Jonsson Date: Wed, 29 Jun 2022 17:40:55 +0200 Subject: [PATCH] Change GTK+ to GTK GTK got rid of the + in 2019: https://lwn.net/Articles/779305/ --- INSTALL.in | 18 +++++++++--------- app/gui/gui.c | 8 ++++---- build/windows/installer/lang/setup.isl.xml.in | 4 ++-- configure.ac | 4 ++-- devel-docs/debugging-tips.md | 2 +- devel-docs/gimp-module-dependencies.svg | 2 +- docs/gimp.1.in | 10 +++++----- docs/gimptool.1.in | 6 +++--- ...extension.goat-exercises.metainfo.xml.in.in | 2 +- icons/Color/color-scalable.svg | 2 +- icons/Symbolic/symbolic-scalable.svg | 2 +- meson.build | 2 +- meson_options.txt | 4 ++-- 13 files changed, 33 insertions(+), 33 deletions(-) diff --git a/INSTALL.in b/INSTALL.in index fbb53a47ff..5ba93a663e 100644 --- a/INSTALL.in +++ b/INSTALL.in @@ -67,7 +67,7 @@ header files installed. "gegl:introspect" which is always built but deactivated unless the `dot` tool from graphviz is available (runtime dependency). - 4. You need to have installed GTK+ version @GTK_REQUIRED_VERSION@ or newer. + 4. You need to have installed GTK version @GTK_REQUIRED_VERSION@ or newer. GIMP also needs a recent version of GLib (>= @GLIB_REQUIRED_VERSION@), GDK-Pixbuf (>= @GDK_PIXBUF_REQUIRED_VERSION@), and Pango (>= @PANGOCAIRO_REQUIRED_VERSION@). Sources for these can be grabbed from ftp://ftp.gtk.org/. @@ -191,7 +191,7 @@ header files installed. 15. GObject Introspection requires the following dependencies to be built and installed with introspection as well: babl, cairo, - GdkPixbuf, GEGL, GIO, GLib, GObject and GTK+. + GdkPixbuf, GEGL, GIO, GLib, GObject and GTK. 16. Windows builds can now generate backtrace logs upon a crash. The logs will be available in: %APPDATA%\GIMP\@GIMP_APP_VERSION@\CrashLog\ @@ -233,7 +233,7 @@ header files installed. GIO GLib @GLIB_REQUIRED_VERSION@ glib-networking - GTK+ @GTK_REQUIRED_VERSION@ + GTK @GTK_REQUIRED_VERSION@ gvfs (on Linux) HarfBuzz @HARFBUZZ_REQUIRED_VERSION@ libbzip2 @@ -398,7 +398,7 @@ These are: --with-html-dir=PATH. This option allows to specify where the libgimp API reference should be installed. You might want to modify - the path so it points to the place where glib and gtk+ installed + the path so it points to the place where glib and gtk installed their API references so that the libgimp reference can link to them. @@ -474,7 +474,7 @@ When ./configure fails scripts. The most recent version is available from https://www.freedesktop.org/software/pkgconfig/ -'configure' tries to compile and run a short GTK+ program. There are +'configure' tries to compile and run a short GTK program. There are several reasons why this might fail: * pkg-config could not find the file 'gtk+-2.0.pc' that gets installed @@ -501,14 +501,14 @@ several reasons why this might fail: or LDFLAGS="-Wl,-rpath -Wl,/home/joe/lib" ./configure -* An old version of the GTK+ libraries was found instead of +* An old version of the GTK libraries was found instead of your newly installed version. This commonly happens if a - binary package of GTK+ was previously installed on your system, - and you later compiled GTK+ from source. + binary package of GTK was previously installed on your system, + and you later compiled GTK from source. Fix: Remove the old libraries and include files. If you are afraid that removing the old libraries may break other packages supplied by - your distributor, you can try installing GLib, GTK+ and other + your distributor, you can try installing GLib, GTK and other libraries in a different prefix after setting the environment variable PKG_CONFIG_LIBDIR to point to lib/pkgconfig/ in that new prefix so that it does not try to read the *.pc files from the diff --git a/app/gui/gui.c b/app/gui/gui.c index c2f69af9ea..530504b8ef 100644 --- a/app/gui/gui.c +++ b/app/gui/gui.c @@ -385,11 +385,11 @@ gui_sanity_check (void) { return g_strdup_printf ("%s\n\n" - "GIMP requires GTK+ version %d.%d.%d or later.\n" - "Installed GTK+ version is %d.%d.%d.\n\n" + "GIMP requires GTK version %d.%d.%d or later.\n" + "Installed GTK version is %d.%d.%d.\n\n" "Somehow you or your software packager managed\n" - "to install GIMP with an older GTK+ version.\n\n" - "Please upgrade to GTK+ version %d.%d.%d or later.", + "to install GIMP with an older GTK version.\n\n" + "Please upgrade to GTK version %d.%d.%d or later.", mismatch, GTK_REQUIRED_MAJOR, GTK_REQUIRED_MINOR, GTK_REQUIRED_MICRO, gtk_major_version, gtk_minor_version, gtk_micro_version, diff --git a/build/windows/installer/lang/setup.isl.xml.in b/build/windows/installer/lang/setup.isl.xml.in index db5c7c02e3..70fa32e542 100644 --- a/build/windows/installer/lang/setup.isl.xml.in +++ b/build/windows/installer/lang/setup.isl.xml.in @@ -98,7 +98,7 @@ - Run-time libraries used by GIMP, including GTK+ Run-time Environment + Run-time libraries used by GIMP, including GTK Run-time Environment @@ -110,7 +110,7 @@ - MS-Windows engine for GTK+ + MS-Windows engine for GTK diff --git a/configure.ac b/configure.ac index e370c1319c..ec85f0cdda 100644 --- a/configure.ac +++ b/configure.ac @@ -571,7 +571,7 @@ if test "x$os_win32" = xyes; then esac if test "x$msnative_struct" = x ; then AC_MSG_RESULT([no way]) - AC_MSG_WARN([build will be incompatible with GTK+ DLLs]) + AC_MSG_WARN([build will be incompatible with GTK DLLs]) else CFLAGS="$CFLAGS $msnative_struct" AC_MSG_RESULT([${msnative_struct}]) @@ -2815,7 +2815,7 @@ AC_ARG_ENABLE(default-binary, [ --enable-default-binary install this as the def AM_CONDITIONAL(DEFAULT_BINARY, test "x$enable_default_binary" = xyes) -AC_ARG_ENABLE(gimp-console, [ --enable-gimp-console build a console-only binary which does not link GTK+], , enable_gimp_console=yes) +AC_ARG_ENABLE(gimp-console, [ --enable-gimp-console build a console-only binary which does not link GTK], , enable_gimp_console=yes) AM_CONDITIONAL(ENABLE_GIMP_CONSOLE, test "x$enable_gimp_console" != xno) diff --git a/devel-docs/debugging-tips.md b/devel-docs/debugging-tips.md index 4a62f8a3ae..5801ef374f 100644 --- a/devel-docs/debugging-tips.md +++ b/devel-docs/debugging-tips.md @@ -49,7 +49,7 @@ But this happens only for crashes, so it still requires to use Note: on Windows, even the debugging GUI happens only for crashes and requires that you built with Dr. Mingw dependency. -## Debugging GTK+ ## +## Debugging GTK ## You can use GtkInspector by running GIMP with: diff --git a/devel-docs/gimp-module-dependencies.svg b/devel-docs/gimp-module-dependencies.svg index f0a36e1a79..b498daa29c 100644 --- a/devel-docs/gimp-module-dependencies.svg +++ b/devel-docs/gimp-module-dependencies.svg @@ -277,7 +277,7 @@ GTK+ -GTK+ +GTK libgimpwidgets->GTK+ diff --git a/docs/gimp.1.in b/docs/gimp.1.in index 665c7a01fa..42512a15c0 100644 --- a/docs/gimp.1.in +++ b/docs/gimp.1.in @@ -57,7 +57,7 @@ Show GIMP command\-line options. Show all command\-line options. .TP 8 .B \-\-help-gtk -Show GTK+ command\-line options. +Show GTK command\-line options. .TP 8 .B \-\-help-gegl Show GEGL command\-line options. @@ -203,11 +203,11 @@ home directories the first time GIMP is run. with the tool, colors, brush, pattern and gradient associated to that device. -@manpage_gimpdir@/gtkrc - users set of GIMP-specific GTK+ config +@manpage_gimpdir@/gtkrc - users set of GIMP-specific GTK config settings. Options such as widget color and fonts sizes can be set here. -@gimpsysconfdir@/gtkrc - system wide default set of GIMP-specific GTK+ +@gimpsysconfdir@/gtkrc - system wide default set of GIMP-specific GTK config settings. @manpage_gimpdir@/menurc - user's set of keybindings. @@ -326,7 +326,7 @@ https://gitlab.gnome.org/GNOME/gimp/issues. Before reporting bugs, please check to see if the bug has already been reported. When reporting GIMP bugs, it is important to include a reliable way to -reproduce the bug, version number of GIMP (and probably GTK+), OS name +reproduce the bug, version number of GIMP (and probably GTK), OS name and version, and any relevant hardware specs. If a bug is causing a crash, it is very useful if a stack trace can be provided. And of course, patches to rectify the bug are even better. @@ -340,7 +340,7 @@ tutorials, data sets, mailing list archives, and more. There is also a GIMP User Manual available at https://docs.gimp.org/ that goes into much more detail about the interactive use of GIMP. -The latest versions of GIMP and the GTK+ libs are always available at +The latest versions of GIMP and the GTK libs are always available at https://download.gimp.org/. diff --git a/docs/gimptool.1.in b/docs/gimptool.1.in index 2fca41da0a..c151f19c7c 100644 --- a/docs/gimptool.1.in +++ b/docs/gimptool.1.in @@ -175,14 +175,14 @@ Print the linker flags that are necessary to link a \fIGIMP\fP plug-in. .TP 8 .B \-\-libs-noui Print the linker flags that are necessary to link a \fIGIMP\fP plug-in, for -plug-ins that do not require the GTK+ libraries. +plug-ins that do not require the GTK libraries. .TP 8 .B \-\-cflags Print the compiler flags that are necessary to compile a \fIGIMP\fP plug-in. .TP 8 .B \-\-clags-noui Print the compiler flags that are necessary to compile a \fIGIMP\fP plug-in -for plug-ins that do not require the GTK+ libraries. +for plug-ins that do not require the GTK libraries. .TP 8 .B \-\-prefix=PREFIX If specified, use PREFIX instead of the installation prefix that \fIGIMP\fP @@ -216,7 +216,7 @@ LIBS=-lintl . .TP 8 .B PKG_CONFIG to get the location of the \fIpkg-config\fP program that is used to determine -details about your glib, pango, gtk+ and gimp installation. +details about your glib, pango, gtk and gimp installation. .SH SEE ALSO diff --git a/extensions/goat-exercises/org.gimp.extension.goat-exercises.metainfo.xml.in.in b/extensions/goat-exercises/org.gimp.extension.goat-exercises.metainfo.xml.in.in index 902f3d6ec6..45fecfff1b 100644 --- a/extensions/goat-exercises/org.gimp.extension.goat-exercises.metainfo.xml.in.in +++ b/extensions/goat-exercises/org.gimp.extension.goat-exercises.metainfo.xml.in.in @@ -10,7 +10,7 @@ how to create your own plug-ins. Each plug-in does the same thing, except it is developed in a different programming language. - They all create a GTK+ dialog with a text view displaying their own code + They all create a GTK dialog with a text view displaying their own code (hence also demonstrating how to package data) and a button which calls a GEGL operation on the active layer.

diff --git a/icons/Color/color-scalable.svg b/icons/Color/color-scalable.svg index ce05120de0..f4fa51cbba 100644 --- a/icons/Color/color-scalable.svg +++ b/icons/Color/color-scalable.svg @@ -59892,7 +59892,7 @@ sodipodi:role="line" x="629.85901" y="642.7876" - id="tspan14932-5">GTK+ icons + id="tspan14932-5">GTK icons GTK+ icons + style="stroke-width:1.00044">GTK icons