[gtk/drop-the-plus] Rename some references to GTK+
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/drop-the-plus] Rename some references to GTK+
- Date: Mon, 4 Feb 2019 17:07:36 +0000 (UTC)
commit d080be3e5091c98d5171063a95d55c01170881f3
Author: Matthias Clasen <mclasen redhat com>
Date: Mon Feb 4 11:56:52 2019 -0500
Rename some references to GTK+
We are dropping the plus.
README.md | 26 +++++++++++-----------
gtk.doap | 14 ++++++------
gtk+-unix-print-4.0.pc.in => gtk4-unix-print.pc.in | 4 ++--
gtk+-4.0.pc.in => gtk4.pc.in | 4 ++--
meson.build | 12 +++++-----
5 files changed, 30 insertions(+), 30 deletions(-)
---
diff --git a/README.md b/README.md
index 689042ad39..42ab872115 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,17 @@
-GTK+ — The GTK toolkit
-======================
+GTK — The GTK toolkit
+=====================
[![Build
Status](https://gitlab.gnome.org/GNOME/gtk/badges/master/build.svg)](https://gitlab.gnome.org/GNOME/gtk/pipelines)
General information
-------------------
-GTK+ is a multi-platform toolkit for creating graphical user interfaces.
-Offering a complete set of widgets, GTK+ is suitable for projects ranging
+GTK is a multi-platform toolkit for creating graphical user interfaces.
+Offering a complete set of widgets, GTK is suitable for projects ranging
from small one-off projects to complete application suites.
-GTK+ is free software and part of the GNU Project. However, the
-licensing terms for GTK+, the GNU LGPL, allow it to be used by all
+GTK is free software and part of the GNU Project. However, the
+licensing terms for GTK, the GNU LGPL, allow it to be used by all
developers, including those developing proprietary software, without any
license fees or royalties.
@@ -39,7 +39,7 @@ Nightly documentation can be found at
Building and installing
-----------------------
-In order to build GTK+ you will need:
+In order to build GTK you will need:
- [a C99 compatible compiler](https://wiki.gnome.org/Projects/GLib/CompilerRequirements)
- [Python 3](https://www.python.org/)
@@ -79,7 +79,7 @@ If you are building the Wayland backend, you will also need:
- Wayland-cursor
- Wayland-EGL
-Once you have all the necessary dependencies, you can build GTK+ by using
+Once you have all the necessary dependencies, you can build GTK by using
Meson:
```sh
@@ -94,7 +94,7 @@ You can run the test suite using:
$ meson test
```
-And, finally, you can install GTK+ using:
+And, finally, you can install GTK using:
```
$ sudo ninja install
@@ -118,10 +118,10 @@ In the bug report please include:
* Information about your system. For instance:
- - which version of GTK+ you are using
+ - which version of GTK you are using
- what operating system and version
- for Linux, which distribution
- - if you built GTK+, the list of options used to configure the build
+ - if you built GTK, the list of options used to configure the build
And anything else you think is relevant.
@@ -143,7 +143,7 @@ In the bug report please include:
Release notes
-------------
-The release notes for GTK+ are part of the migration guide in the API
+The release notes for GTK are part of the migration guide in the API
reference. See:
- [3.x release notes](https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html)
@@ -152,7 +152,7 @@ reference. See:
Licensing terms
---------------
-GTK+ is released under the terms of the GNU Lesser General Public License,
+GTK is released under the terms of the GNU Lesser General Public License,
version 2.1 or, at your option, any later version, as published by the Free
Software Foundation.
diff --git a/gtk.doap b/gtk.doap
index 12f4b5565c..f0d0c80920 100644
--- a/gtk.doap
+++ b/gtk.doap
@@ -6,20 +6,20 @@
xmlns="http://usefulinc.com/ns/doap#">
<name xml:lang="en">gtk+</name>
- <shortname>gtk+</shortname>
+ <shortname>gtk</shortname>
<shortdesc xml:lang="en">Multi-platform toolkit</shortdesc>
- <description xml:lang="en">GTK+ is a multi-platform toolkit for creating graphical user
-interfaces. Offering a complete set of widgets, GTK+ is suitable for
+ <description xml:lang="en">GTK is a multi-platform toolkit for creating graphical user
+interfaces. Offering a complete set of widgets, GTK is suitable for
projects ranging from small one-off tools to complete application
suites.
-GTK+ has been designed from the ground up to support a range of
-languages, not only C/C++. Using GTK+ from languages such as Perl and
+GTK has been designed from the ground up to support a range of
+languages, not only C/C++. Using GTK from languages such as Perl and
Python (especially in combination with the Glade GUI builder) provides
an effective method of rapid application development.
-GTK+ is free software and part of the GNU Project. However, the
-licensing terms for GTK+, the GNU LGPL, allow it to be used by all
+GTK is free software and part of the GNU Project. However, the
+licensing terms for GTK, the GNU LGPL, allow it to be used by all
developers, including those developing proprietary software, without
any license fees or royalties.</description>
<homepage rdf:resource="http://www.gtk.org/" />
diff --git a/gtk+-unix-print-4.0.pc.in b/gtk4-unix-print.pc.in
similarity index 85%
rename from gtk+-unix-print-4.0.pc.in
rename to gtk4-unix-print.pc.in
index 8c0f32326c..efcda5689b 100644
--- a/gtk+-unix-print-4.0.pc.in
+++ b/gtk4-unix-print.pc.in
@@ -7,8 +7,8 @@ targets=@GDK_BACKENDS@
gtk_binary_version=@GTK_BINARY_VERSION@
gtk_host=@host@
-Name: GTK+
-Description: GTK+ Unix print support
+Name: GTK
+Description: GTK Unix print support
Version: @VERSION@
Requires: gtk+-@GTK_API_VERSION@ @GTK_PACKAGES@
Cflags: -I${includedir}/gtk-@GTK_API_VERSION@/unix-print
diff --git a/gtk+-4.0.pc.in b/gtk4.pc.in
similarity index 90%
rename from gtk+-4.0.pc.in
rename to gtk4.pc.in
index 0bb6363ba5..e721361170 100644
--- a/gtk+-4.0.pc.in
+++ b/gtk4.pc.in
@@ -7,8 +7,8 @@ targets=@GDK_BACKENDS@
gtk_binary_version=@GTK_BINARY_VERSION@
gtk_host=@host@
-Name: GTK+
-Description: GTK+ Graphical UI Library
+Name: GTK
+Description: GTK Graphical UI Library
Version: @VERSION@
Requires: @GDK_PACKAGES@ @GSK_PACKAGES@ @GTK_PACKAGES@
Requires.private: @GDK_PRIVATE_PACKAGES@ @GSK_PRIVATE_PACKAGES@ @GTK_PRIVATE_PACKAGES@
diff --git a/meson.build b/meson.build
index 0385d15b07..70c12a1fdc 100644
--- a/meson.build
+++ b/meson.build
@@ -864,27 +864,27 @@ pkgconf.set('GTK_EXTRA_CFLAGS', '')
pkg_install_dir = join_paths(get_option('libdir'), 'pkgconfig')
-pkgs = [ 'gtk+-4.0.pc' ]
+pkgs = [ 'gtk4.pc' ]
pkg_targets = ''
foreach backend: [ 'broadway', 'quartz', 'wayland', 'win32', 'x11', ]
if get_variable('@0@_enabled'.format(backend))
- pkgs += ['gtk+-@0 -4 0 pc'.format(backend)]
+ pkgs += ['gtk4-@0@.pc'.format(backend)]
pkg_targets += ' ' + backend
endif
endforeach
pkgconf.set('GDK_BACKENDS', pkg_targets.strip())
foreach pkg: pkgs
- configure_file(input: 'gtk+-4.0.pc.in',
+ configure_file(input: 'gtk4.pc.in',
output: pkg,
configuration: pkgconf,
install_dir: pkg_install_dir)
endforeach
if os_unix
- configure_file(input: 'gtk+-unix-print-4.0.pc.in',
- output: 'gtk+-unix-print-4.0.pc',
+ configure_file(input: 'gtk4-unix-print.pc.in',
+ output: 'gtk4-unix-print.pc',
configuration: pkgconf,
install_dir: pkg_install_dir)
endif
@@ -907,7 +907,7 @@ meson.add_install_script('build-aux/meson/post-install.sh',
summary = [
'',
'------',
- 'GTK+ @0@ (@1@)'.format(gtk_version, gtk_api_version),
+ 'GTK @0@ (@1@)'.format(gtk_version, gtk_api_version),
'',
' Display backends: @0@'.format(pkg_targets.strip()),
' Print backends: @0@'.format(' '.join(print_backends)),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]