7fc9190f0e
* gcc is kept at -Np0, because of void-cross
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From 44490f7f78c3281c8fc4f38aa7226fc5955720a9 Mon Sep 17 00:00:00 2001
|
|
From: Dominique Leuenberger <dimstar@opensuse.org>
|
|
Date: Wed, 3 Apr 2013 22:26:17 +0200
|
|
Subject: [PATCH] include gtksource.h instead of gtksourceview.h
|
|
|
|
The main header of gtksourceview is now called gtksource.h
|
|
|
|
https://bugzilla.gnome.org/show_bug.cgi?id=697220
|
|
---
|
|
configure.ac | 2 +-
|
|
src/giggle-diff-view.h | 3 +--
|
|
src/giggle-view-file.c | 3 +--
|
|
3 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git configure.ac configure.ac
|
|
index a7011f8..3e47b48 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -54,7 +54,7 @@ dnl ------------------
|
|
GLIB_REQUIRED_VERSION=2.30
|
|
GDK_PIXBUF_REQUIRED_VERSION=2.22
|
|
GTK_REQUIRED_VERSION=3.3.12
|
|
-GTKSOURCE_REQUIRED_VERSION=3.0
|
|
+GTKSOURCE_REQUIRED_VERSION=3.8
|
|
EDS_REQUIRED_VERSION=3.2
|
|
VTE_REQUIRED_VERSION=0.28
|
|
|
|
diff --git src/giggle-diff-view.h src/giggle-diff-view.h
|
|
index 74fb983..28266e3 100644
|
|
--- a/src/giggle-diff-view.h
|
|
+++ b/src/giggle-diff-view.h
|
|
@@ -21,8 +21,7 @@
|
|
|
|
#include <glib-object.h>
|
|
#include <gtk/gtk.h>
|
|
-#include <gtksourceview/gtksourceview.h>
|
|
-#include <gtksourceview/gtksourcelanguagemanager.h>
|
|
+#include <gtksourceview/gtksource.h>
|
|
|
|
#include "libgiggle/giggle-revision.h"
|
|
|
|
diff --git src/giggle-view-file.c src/giggle-view-file.c
|
|
index 130af4a..94c6c76 100644
|
|
--- a/src/giggle-view-file.c
|
|
+++ b/src/giggle-view-file.c
|
|
@@ -38,8 +38,7 @@
|
|
#include <gio/gio.h>
|
|
#include <glib/gi18n.h>
|
|
|
|
-#include <gtksourceview/gtksourcelanguagemanager.h>
|
|
-#include <gtksourceview/gtksourceview.h>
|
|
+#include <gtksourceview/gtksource.h>
|
|
|
|
#define GIGGLE_TYPE_VIEW_FILE_SNAPSHOT (giggle_view_file_snapshot_get_type ())
|
|
#define GIGGLE_VIEW_FILE_SNAPSHOT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIGGLE_TYPE_VIEW_FILE_SNAPSHOT, GiggleViewFileSnapshot))
|