summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel2015-07-23 12:16:07 +0200
committerManuel2015-07-23 12:16:07 +0200
commitfb30506babc02e79059a465bac04d70f4c9be268 (patch)
tree98d82d15da1a3253fb8ae285ffbc8e0c87155d07
parentf2419a1e1fa89a7ae32c632e30cb98d291108888 (diff)
downloadaur-fb30506babc02e79059a465bac04d70f4c9be268.tar.gz
Version 3.16.2
-rw-r--r--.SRCINFO10
-rw-r--r--0001-build-Don-t-treat-warnings-as-errors.patch37
-rw-r--r--PKGBUILD9
-rw-r--r--gnome-terminal-restore-transparency.patch32
4 files changed, 65 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 873cbfd4ea68..c18af1ce1910 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gnome-terminal-fedora
pkgdesc = The GNOME Terminal Emulator with Fedora patches
- pkgver = 3.16.1
+ pkgver = 3.16.2
pkgrel = 1
url = http://www.gnome.org
install = gnome-terminal-fedora.install
@@ -24,12 +24,14 @@ pkgbase = gnome-terminal-fedora
optdepends = gconf: settings migration when upgrading from older version
conflicts = gnome-terminal
options = !emptydirs
- source = http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/3.16/gnome-terminal-3.16.1.tar.xz
+ source = http://ftp.gnome.org/pub/gnome/sources/gnome-terminal/3.16/gnome-terminal-3.16.2.tar.xz
+ source = 0001-build-Don-t-treat-warnings-as-errors.patch
source = gnome-terminal-restore-transparency.patch
source = gnome-terminal-restore-dark.patch
source = gnome-terminal-command-notify.patch
- sha256sums = 7dce4df5d88e4968ed64d57e61d51e2ab7944a02ece34d5776582a0ed3d7b45b
- sha256sums = 00e8e84d6f348bfb4ac3c63c4971f4f1da1d603ca32deed45d8586f4aac73e1c
+ sha256sums = 9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0
+ sha256sums = 83c42ed513e374c181b23da4f9fce39e197c1e09ae328147b2b2bcdfbc4c99d7
+ sha256sums = 14f50bc4a531adc830742968de49c9cf8364e44ed635e7f4e787132da563cd6e
sha256sums = 5ef48574b93ec5530ce2747012fc0838a5e1ffa265803069a8da79b1be5e1eff
sha256sums = 9c7a4f631dce079892dad72cd9ee1a143fb637d1d9fc961bbde36defca89e7c3
diff --git a/0001-build-Don-t-treat-warnings-as-errors.patch b/0001-build-Don-t-treat-warnings-as-errors.patch
new file mode 100644
index 000000000000..f8426615a31b
--- /dev/null
+++ b/0001-build-Don-t-treat-warnings-as-errors.patch
@@ -0,0 +1,37 @@
+From 5ecf7b1d3ccc7b196803e48d3bfce7caefe82416 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray <debarshir@gnome.org>
+Date: Mon, 23 Feb 2015 18:54:36 +0100
+Subject: [PATCH] build: Don't treat warnings as errors
+
+---
+ configure.ac | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 523a0da..f055dfe 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -270,13 +270,13 @@ CC_CHECK_FLAGS_APPEND([WARN_CFLAGS],[CFLAGS],[ \
+ -Wall \
+ -Wcast-align \
+ -Wendif-labels \
+- -Werror=declaration-after-statement \
+- "-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 \
++ -Wdeclaration-after-statement \
++ "-Wformat=2 -Wformat-nonliteral -Wformat-security" \
++ -Wimplicit-function-declaration \
++ -Winit-self \
++ -Wmissing-include-dirs \
++ -Wmissing-prototypes \
++ -Wpointer-arith \
+ -Wextra \
+ -Wfloat-equal \
+ -Wimplicit \
+--
+2.1.0
+
diff --git a/PKGBUILD b/PKGBUILD
index a074d6fd4946..8b060eb4df44 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=gnome-terminal-fedora
_pkgname=gnome-terminal
-pkgver=3.16.1
+pkgver=3.16.2
pkgrel=1
pkgdesc="The GNOME Terminal Emulator with Fedora patches"
arch=(i686 x86_64)
@@ -18,17 +18,20 @@ url="http://www.gnome.org"
conflicts=('gnome-terminal')
install=gnome-terminal-fedora.install
source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver:0:4}/$_pkgname-$pkgver.tar.xz
+ 0001-build-Don-t-treat-warnings-as-errors.patch
gnome-terminal-restore-transparency.patch
gnome-terminal-restore-dark.patch
gnome-terminal-command-notify.patch)
-sha256sums=('7dce4df5d88e4968ed64d57e61d51e2ab7944a02ece34d5776582a0ed3d7b45b'
- '00e8e84d6f348bfb4ac3c63c4971f4f1da1d603ca32deed45d8586f4aac73e1c'
+sha256sums=('9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0'
+ '83c42ed513e374c181b23da4f9fce39e197c1e09ae328147b2b2bcdfbc4c99d7'
+ '14f50bc4a531adc830742968de49c9cf8364e44ed635e7f4e787132da563cd6e'
'5ef48574b93ec5530ce2747012fc0838a5e1ffa265803069a8da79b1be5e1eff'
'9c7a4f631dce079892dad72cd9ee1a143fb637d1d9fc961bbde36defca89e7c3')
prepare () {
cd $_pkgname-$pkgver
+ patch -p1 -i ../0001-build-Don-t-treat-warnings-as-errors.patch
patch -p1 -i ../gnome-terminal-restore-transparency.patch
patch -p1 -i ../gnome-terminal-restore-dark.patch
patch -p1 -i ../gnome-terminal-command-notify.patch
diff --git a/gnome-terminal-restore-transparency.patch b/gnome-terminal-restore-transparency.patch
index 94585d8113a8..56bebcdfb9f6 100644
--- a/gnome-terminal-restore-transparency.patch
+++ b/gnome-terminal-restore-transparency.patch
@@ -1,4 +1,4 @@
-From 2155e115d5fe25cbb7a4c52ab52d82d69a12f480 Mon Sep 17 00:00:00 2001
+From 181dca2c0b50af1326a84e1ec0134afab88ff5b2 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Mon, 12 May 2014 14:57:18 +0200
Subject: [PATCH 1/3] Restore transparency
@@ -269,7 +269,7 @@ index 12cae4f..366e4f8 100644
2.1.0
-From a2ad67f5b0b98b22b71bd28aeb8eda369fc21a3b Mon Sep 17 00:00:00 2001
+From de7d64698ac700f63898221a5815af939001ba18 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 28 May 2014 14:11:02 +0200
Subject: [PATCH 2/3] window: Make the drawing robust across all themes
@@ -331,7 +331,7 @@ index 366e4f8..2458656 100644
2.1.0
-From cb436cf1327f77915d0e1df6ba24bb9f2d32ff48 Mon Sep 17 00:00:00 2001
+From dfc31fb0803d546cc21ef8bcd33e54c30e14dc1c Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Tue, 17 Feb 2015 17:06:17 +0100
Subject: [PATCH 3/3] Restore translations for transparency
@@ -442,10 +442,10 @@ index 27a7e96..04a8ad9 100644
#: ../src/gnome-terminal.glade2.h:103
msgid "_Update login records when command is launched"
diff --git a/po/ar.po b/po/ar.po
-index 04ba00a..574aa89 100644
+index c27cd9c..f541938 100644
--- a/po/ar.po
+++ b/po/ar.po
-@@ -2881,8 +2881,8 @@ msgstr "أغ_لق النافذة"
+@@ -2914,8 +2914,8 @@ msgstr "أغ_لق النافذة"
#~ msgid "Background image _scrolls"
#~ msgstr "صورة الخلفية ت_لتف"
@@ -1019,10 +1019,10 @@ index 221825b..96e3581 100644
#: ../src/gnome-terminal.glade2.h:87
msgid "_Update login records when command is launched"
diff --git a/po/lt.po b/po/lt.po
-index c906132..aa1403f 100644
+index 294482b..c0ec0cf 100644
--- a/po/lt.po
+++ b/po/lt.po
-@@ -2083,3 +2083,6 @@ msgstr "_Užverti langą"
+@@ -2082,3 +2082,6 @@ msgstr "_Užverti langą"
#~ msgid "Use _dark theme variant"
#~ msgstr "Nau_doti tamsų temos variantą"
@@ -1262,13 +1262,13 @@ index 9c95b66..5e5b8ba 100644
#~ msgid "S/Key Challenge Response"
#~ msgstr "S/ਸਵਿੱਚ ਚੈਲੰਜ਼ ਜਵਾਬ"
diff --git a/po/pl.po b/po/pl.po
-index ea0254a..f1604a2 100644
+index deb91b7..f772171 100644
--- a/po/pl.po
+++ b/po/pl.po
-@@ -2091,3 +2091,6 @@ msgstr ""
- #: ../src/terminal-window.c:3652
- msgid "C_lose Window"
- msgstr "_Zamknij okno"
+@@ -2116,3 +2116,6 @@ msgid ""
+ msgstr ""
+ "Wartość między 0 a 100, gdzie 0 oznacza nieprzezroczystość, a 100 oznacza "
+ "całkowitą przezroczystość."
+
+msgid "Transparent background"
+msgstr "Przezroczyste tło"
@@ -1329,10 +1329,10 @@ index 179dd77..f7fc7ae 100644
#: ../src/profile-preferences.glade.h:78
msgid "_Underline color:"
diff --git a/po/ru.po b/po/ru.po
-index d3b9023..fa6d923 100644
+index 01d1683..672ab01 100644
--- a/po/ru.po
+++ b/po/ru.po
-@@ -2078,3 +2078,6 @@ msgstr ""
+@@ -2073,3 +2073,6 @@ msgstr ""
#: ../src/terminal-window.c:3652
msgid "C_lose Window"
msgstr "_Закрыть окно"
@@ -1567,10 +1567,10 @@ index e5981c6..7f9f804 100644
#: ../src/gnome-terminal.glade2.h:103
msgid "_Update login records when command is launched"
diff --git a/po/zh_CN.po b/po/zh_CN.po
-index 2f688ae..95d7b20 100644
+index b18a9e7..287db04 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
-@@ -2266,3 +2266,6 @@ msgstr "关闭窗口(_L)"
+@@ -2280,3 +2280,6 @@ msgstr "关闭窗口(_L)"
#~ msgid "_Find..."
#~ msgstr "查找(_F)..."