catanzaro pushed to epiphany (master). "Drop DRI3 patch since Fedora has switched back to DRI2."

[notifications at fedoraproject.org]

From 3cc059e17a78c3301fd16daba3e0c2c722aed9de Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro at gnome.org>
Date: Wed, 27 May 2015 16:59:07 -0500
Subject: Drop DRI3 patch since Fedora has switched back to DRI2.


diff --git a/epiphany-disable-DRI3.patch b/epiphany-disable-DRI3.patch
deleted file mode 100644
index 385b646..0000000
--- a/epiphany-disable-DRI3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 64454729e88d3cb5888657e16666c2f62619f6e6 Mon Sep 17 00:00:00 2001
-From: Michael Catanzaro <mcatanzaro at igalia.com>
-Date: Thu, 13 Nov 2014 10:57:36 -0600
-Subject: [PATCH] Disable DRI3
-
-DRI3 is broken in Fedora, so we need this workaround.
----
- src/ephy-main.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/ephy-main.c b/src/ephy-main.c
-index 12704ea..2dd214c 100644
---- a/src/ephy-main.c
-+++ b/src/ephy-main.c
-@@ -238,6 +238,9 @@ main (int argc,
-   int status;
-   EphyFileHelpersFlags flags;
- 
-+  /* Fedora enables DRI3 which breaks many web sites, e.g. DuckDuckGo and YouTube. */
-+  g_setenv ("LIBGL_DRI3_DISABLE", "1", FALSE);
-+
- #ifdef ENABLE_NLS
-   /* Initialize the i18n stuff */
-   bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
--- 
-1.9.3
-
diff --git a/epiphany.spec b/epiphany.spec
index daa4ff4..5edaa91 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -10,10 +10,8 @@ Source0: http://download.gnome.org/sources/epiphany/3.16/%{name}-%{version}.tar.
 
 # Fedora bookmarks
 Patch0: epiphany-default-bookmarks.patch
-# DRI3 is currently only used in Fedora. It breaks DuckDuckGo, YouTube, et. al.
-Patch1: epiphany-disable-DRI3.patch
 # Fix the build, backported from upstream
-Patch2: 0001-Fix-a-syntax-error-in-Esperanto-translation.patch
+Patch1: 0001-Fix-a-syntax-error-in-Esperanto-translation.patch
 
 # There is a large queue of unreviewed patches upstream, so we'll carry more
 # patches than we really ought to until it comes under control.
@@ -85,8 +83,7 @@ installing the epiphany application itself.
 %prep
 %setup -q
 %patch0 -p1 -b .default-bookmarks
-%patch1 -p1 -b .disable-dri3
-%patch2 -p1
+%patch1 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -148,6 +145,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_mandir}/man*/*
 
 %changelog
+* Wed May 27 2015 Michael Catanzaro <mcatanzaro at igalia.com> 1:3.16.1-2
+- Drop DRI3 patch since Fedora has switched back to DRI2.
+
 * Tue May 12 2015 Kalev Lember <kalevlember at gmail.com> - 1:3.16.1-1
 - Update to 3.16.1
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/epiphany.git/commit/?h=master&id=3cc059e17a78c3301fd16daba3e0c2c722aed9de