From c250c057f989f20522b585643541241ac821bdc9 Mon Sep 17 00:00:00 2001 From: David King Date: Tue, 24 Aug 2021 16:27:33 +0100 Subject: [PATCH] Drop unnecessary patch --- ...build-Don-t-treat-warnings-as-errors.patch | 35 ------------------- gnome-terminal.spec | 6 ++-- 2 files changed, 2 insertions(+), 39 deletions(-) delete mode 100644 0001-build-Don-t-treat-warnings-as-errors.patch diff --git a/0001-build-Don-t-treat-warnings-as-errors.patch b/0001-build-Don-t-treat-warnings-as-errors.patch deleted file mode 100644 index eb542cf..0000000 --- a/0001-build-Don-t-treat-warnings-as-errors.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8709588cc5ec11e7b1007e7d67aa4df74faf5c68 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -Date: Mon, 23 Feb 2015 18:54:36 +0100 -Subject: [PATCH] build: Don't treat warnings as errors - ---- - configure.ac | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f22050d6a2e3..d6d936eb0a96 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -225,12 +225,12 @@ CC_CHECK_FLAGS_APPEND([WARN_CFLAGS],[CFLAGS],[ \ - -Wall \ - -Wcast-align \ - -Wendif-labels \ -- "-Werror=format=2 -Werror=format-nonliteral -Werror=format-security" \ -- -Werror=implicit-function-declaration \ -- -Werror=init-self \ -- -Werror=missing-include-dirs \ -- -Werror=missing-prototypes \ -- -Werror=pointer-arith \ -+ "-Wformat=2 -Wformat-nonliteral -Wformat-security" \ -+ -Wimplicit-function-declaration \ -+ -Winit-self \ -+ -Wmissing-include-dirs \ -+ -Wmissing-prototypes \ -+ -Wpointer-arith \ - -Wextra \ - -Wfloat-equal \ - -Wimplicit \ --- -2.19.1 - diff --git a/gnome-terminal.spec b/gnome-terminal.spec index b38b2d1..e3975a5 100644 --- a/gnome-terminal.spec +++ b/gnome-terminal.spec @@ -17,7 +17,6 @@ Source0: https://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar. Source1: org.gnome.Terminal.gschema.override Patch100: gnome-terminal-cntr-ntfy-autottl-ts.patch -Patch101: 0001-build-Don-t-treat-warnings-as-errors.patch BuildRequires: pkgconfig(dconf) BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} @@ -30,14 +29,13 @@ BuildRequires: pkgconfig(vte-2.91) >= %{vte_version} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: docbook-style-xsl BuildRequires: gettext-devel >= %{gettext_version} +BuildRequires: gcc BuildRequires: gnome-shell BuildRequires: itstool BuildRequires: libxslt BuildRequires: make BuildRequires: systemd-rpm-macros BuildRequires: yelp-tools -# For Patch101. -BuildRequires: autoconf automake libtool Requires: dbus Requires: glib2%{?_isa} >= %{glib2_version} @@ -64,7 +62,6 @@ option to the right-click context menu in Nautilus. %autosetup -p1 %build -autoreconf --force --install %configure \ --disable-silent-rules \ --disable-static \ @@ -117,6 +114,7 @@ make check - Update to 3.40.3 - Minor packaging improvements - Use pkgconfig for BuildRequires +- Drop unnecessary patch * Wed Aug 04 2021 Kalev Lember - 3.40.2-3 - BuildRequire systemd-rpm-macros rather than systemd