aboutsummaryrefslogtreecommitdiffstats
path: root/macosx-support-lib-patches
diff options
context:
space:
mode:
authorDario Lombardo <lomato@gmail.com>2018-03-06 15:31:02 +0100
committerAnders Broman <a.broman58@gmail.com>2018-03-07 13:35:49 +0000
commit8a5385b9c9ec4ccfd692263eb7c59b09f9bc1a15 (patch)
tree168b19f922de6eafb9d21fb13d5893d9307816e6 /macosx-support-lib-patches
parent830adb2a02c3ef5209bf79c933879b49b12b7902 (diff)
More licenses converted to SPDX.
Change-Id: Id4f987dcdacf06622d70263f4659a4400e30dc39 Reviewed-on: https://code.wireshark.org/review/26332 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'macosx-support-lib-patches')
-rwxr-xr-xmacosx-support-lib-patches/qt-fix-pc-file14
-rwxr-xr-xmacosx-support-lib-patches/qt-fix-pc-files14
2 files changed, 2 insertions, 26 deletions
diff --git a/macosx-support-lib-patches/qt-fix-pc-file b/macosx-support-lib-patches/qt-fix-pc-file
index 2567ead713..fa9ba54bd5 100755
--- a/macosx-support-lib-patches/qt-fix-pc-file
+++ b/macosx-support-lib-patches/qt-fix-pc-file
@@ -6,19 +6,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2014 Gerald Combs
#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# SPDX-License-Identifier: GPL-2.0-or-later
#
# Fix a single Qt .pc file to provide the right flags; a -F flag is
# needed to point to the directory under which the frameworks are
diff --git a/macosx-support-lib-patches/qt-fix-pc-files b/macosx-support-lib-patches/qt-fix-pc-files
index 39fad414e8..87dc3966d5 100755
--- a/macosx-support-lib-patches/qt-fix-pc-files
+++ b/macosx-support-lib-patches/qt-fix-pc-files
@@ -6,19 +6,7 @@
# By Gerald Combs <gerald@wireshark.org>
# Copyright 2014 Gerald Combs
#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# SPDX-License-Identifier: GPL-2.0-or-later
#
# See bug QTBUG-35256 for the full painful story. Shorter version:
# the macOS Qt packages provide the Qt components as frameworks, but