GNOME.org
 

[gimp] Change GTK+ to GTK

commit e601a6c7dec6aa4d2af71e621fa6102147120343
Author: Anders Jonsson <anders jonsson norsjovallen se>
Date:   Wed Jun 29 17:40:55 2022 +0200

    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 +++---
 ...rg.gimp.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 @@
     </config>
     <!-- Components -->
     <config name="ComponentsDepsDescription">
-      <value>Run-time libraries used by GIMP, including GTK+ Run-time Environment</value>
+      <value>Run-time libraries used by GIMP, including GTK Run-time Environment</value>
     </config>
     <!-- Components -->
     <config name="ComponentsDebug">
@@ -110,7 +110,7 @@
     </config>
     <!-- Components -->
     <config name="ComponentsGtkWimp">
-      <value>MS-Windows engine for GTK+</value>
+      <value>MS-Windows engine for GTK</value>
     </config>
     <!-- Components -->
     <config name="ComponentsGtkWimpDescription">
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+ -->
 <g id="node48" class="node"><title>GTK+</title>
 <ellipse fill="lightblue" stroke="black" cx="577" cy="-463" rx="36.977" ry="19.0919"/>
-<text text-anchor="middle" x="577" y="-459.9" font-family="Times Roman,serif" font-size="14.00">GTK+</text>
+<text text-anchor="middle" x="577" y="-459.9" font-family="Times Roman,serif" font-size="14.00">GTK</text>
 </g>
 <!-- libgimpwidgets&#45;&gt;GTK+ -->
 <g id="edge48" class="edge"><title>libgimpwidgets&#45;&gt;GTK+</title>
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.
     </p>
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</tspan></text>
+         id="tspan14932-5">GTK icons</tspan></text>
     <path
        
style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#cc0000;fill-opacity:1;fill-rule:nonzero;stroke:#a40000;stroke-width:0.371054;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
        d="m 640.67009,669.37291 c -3.32802,-0.056 -6.44204,2.043 -7.539,5.372 -1.35011,4.0977 0.88144,8.5113 
4.97677,9.8621 4.09532,1.3508 8.50693,-0.8828 9.85703,-4.9803 l 0.0729,-0.1949 c 1.21344,-4.053 
-1.03348,-8.3421 -5.04964,-9.667 -0.76787,-0.2532 -1.55003,-0.3787 -2.31803,-0.3919 z m -0.1221,2.3454 c 
3.01848,0 5.46519,2.4483 5.46519,5.4685 0,1.0114 -0.27977,1.9541 -0.75824,2.7667 l -7.47204,-7.479 c 
0.81174,-0.4779 1.75514,-0.7562 2.76509,-0.7562 z m -4.70301,2.6939 7.47007,7.483 c -0.81226,0.4788 
-1.75615,0.7583 -2.76706,0.7583 -3.0185,0 -5.46519,-2.4467 -5.46519,-5.4667 0,-1.014 0.28148,-1.9605 
0.76218,-2.7746 z"
diff --git a/icons/Symbolic/symbolic-scalable.svg b/icons/Symbolic/symbolic-scalable.svg
index d0907a923d..af13934792 100644
--- a/icons/Symbolic/symbolic-scalable.svg
+++ b/icons/Symbolic/symbolic-scalable.svg
@@ -26487,7 +26487,7 @@
          y="744.66333"
          x="466.40045"
          sodipodi:role="line"
-         style="stroke-width:1.00044">GTK+ icons</tspan></text>
+         style="stroke-width:1.00044">GTK icons</tspan></text>
     <g
        inkscape:label="gtk-cancel"
        transform="matrix(0.80004464,0,0,0.79676613,483.56671,-35.78622)"
diff --git a/meson.build b/meson.build
index 80ee48a4a7..19ff90c9d2 100644
--- a/meson.build
+++ b/meson.build
@@ -270,7 +270,7 @@ if platform_windows and cc.get_id() == 'gcc'
   if msvc_compat_args == []
     error('''
       GCC does not support '-fnative-struct' nor '-mms-bitfields'.
-      Build will be incompatible with GTK+ DLLs.
+      Build will be incompatible with GTK DLLs.
     ''')
   endif
   compiler_args += msvc_compat_args
diff --git a/meson_options.txt b/meson_options.txt
index 31306509f4..3e8943ee46 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,8 +1,8 @@
 # Build properties
 option('ansi',              type: 'boolean', value: false,  description: 'Turn on strict ansi')
-option('enable-console-bin',type: 'boolean', value: true,   description: 'Build a console-only binary which 
does not link GTK+')
+option('enable-console-bin',type: 'boolean', value: true,   description: 'Build a console-only binary which 
does not link GTK')
 option('win32-debug-console',type:'boolean', value: true,   description: 'Open a console when starting the 
program')
-option('enable-default-bin',type: 'boolean', value: true,   description: 'Build default Gtk+ binary')
+option('enable-default-bin',type: 'boolean', value: true,   description: 'Build default Gtk binary')
 option('enable-multiproc',  type: 'boolean', value: true,   description: 'Support for multiple processors')
 option('profiling',         type: 'boolean', value: false,  description: 'Enable profiling')
 option('windows-installer', type: 'boolean', value: false,  description: 'Generate files needed for the 
Windows installer')
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]