| 1 |
hasufell 12/11/27 23:51:42 |
| 2 |
|
| 3 |
Added: devilspie2-0.26-cflags.patch |
| 4 |
devilspie2-0.26-anti-debian.patch |
| 5 |
Log: |
| 6 |
initial import wrt #445006 |
| 7 |
|
| 8 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key E73C35B3) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 x11-misc/devilspie2/files/devilspie2-0.26-cflags.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/devilspie2/files/devilspie2-0.26-cflags.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/devilspie2/files/devilspie2-0.26-cflags.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: devilspie2-0.26-cflags.patch |
| 17 |
=================================================================== |
| 18 |
From c7e44ff0bed2c670f6b01c9ab5bc103c5ebdae1d Mon Sep 17 00:00:00 2001 |
| 19 |
From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <gusnan@××××××.se> |
| 20 |
Date: Wed, 28 Nov 2012 00:25:25 +0100 |
| 21 |
Subject: [PATCH] Use CFLAGS in both compilation and linking invocations of |
| 22 |
the compiler |
| 23 |
|
| 24 |
--- |
| 25 |
Makefile | 6 +++--- |
| 26 |
1 file changed, 3 insertions(+), 3 deletions(-) |
| 27 |
|
| 28 |
diff --git a/Makefile b/Makefile |
| 29 |
index ae38a46..28c3baf 100644 |
| 30 |
--- a/Makefile |
| 31 |
+++ b/Makefile |
| 32 |
@@ -4,9 +4,9 @@ OBJ=obj |
| 33 |
BIN=bin |
| 34 |
|
| 35 |
ifdef DEBUG |
| 36 |
- STD_CFLAGS=-c -Wall -g3 -ggdb -D_DEBUG |
| 37 |
+ STD_CFLAGS=-Wall -g3 -ggdb -D_DEBUG |
| 38 |
else |
| 39 |
- STD_CFLAGS=-c -Wall -Wformat -Wno-format-extra-args -Wformat-security -Wformat-nonliteral -Wformat=2 |
| 40 |
+ STD_CFLAGS=-Wall -Wformat -Wno-format-extra-args -Wformat-security -Wformat-nonliteral -Wformat=2 |
| 41 |
endif |
| 42 |
|
| 43 |
DEPEND=Makefile.dep |
| 44 |
@@ -67,7 +67,7 @@ $(OBJ)/%.o: $(SRC)/%.c |
| 45 |
$(CC) $(LOCAL_CFLAGS) $(LOCAL_CPPFLAGS) -c $< -o $@ |
| 46 |
|
| 47 |
$(BIN)/$(NAME): $(OBJECTS) |
| 48 |
- $(CC) $(LOCAL_LDFLAGS) $(OBJECTS) -o $(PROG) $(LIBS) |
| 49 |
+ $(CC) $(LOCAL_CFLAGS) $(LOCAL_LDFLAGS) $(OBJECTS) -o $(PROG) $(LIBS) |
| 50 |
|
| 51 |
.PHONY: clean |
| 52 |
clean: |
| 53 |
-- |
| 54 |
1.7.10 |
| 55 |
|
| 56 |
|
| 57 |
|
| 58 |
1.1 x11-misc/devilspie2/files/devilspie2-0.26-anti-debian.patch |
| 59 |
|
| 60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/devilspie2/files/devilspie2-0.26-anti-debian.patch?rev=1.1&view=markup |
| 61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-misc/devilspie2/files/devilspie2-0.26-anti-debian.patch?rev=1.1&content-type=text/plain |
| 62 |
|
| 63 |
Index: devilspie2-0.26-anti-debian.patch |
| 64 |
=================================================================== |
| 65 |
From 8bbc2f64bc2115178d5e1de170c1c1882eaf2799 Mon Sep 17 00:00:00 2001 |
| 66 |
From: =?UTF-8?q?Andreas=20R=C3=B6nnquist?= <gusnan@××××××.se> |
| 67 |
Date: Tue, 27 Nov 2012 23:30:47 +0100 |
| 68 |
Subject: [PATCH] Fix building on systems with pc-config using name lua |
| 69 |
instead of lua5.1 |
| 70 |
|
| 71 |
|
| 72 |
from hasufell: THANKS FOR MESSING UP PKGCONFIG FILES @ DEBIAN MAINTAINERS |
| 73 |
|
| 74 |
--- |
| 75 |
Makefile | 4 ++-- |
| 76 |
1 file changed, 2 insertions(+), 2 deletions(-) |
| 77 |
|
| 78 |
diff --git a/Makefile b/Makefile |
| 79 |
index 1d03165..ae38a46 100644 |
| 80 |
--- a/Makefile |
| 81 |
+++ b/Makefile |
| 82 |
@@ -37,9 +37,9 @@ else |
| 83 |
PKG_WNCK=libwnck-3.0 |
| 84 |
endif |
| 85 |
|
| 86 |
-LIB_CFLAGS=`pkg-config --cflags $(PKG_GTK) $(PKG_WNCK) lua5.1` |
| 87 |
+LIB_CFLAGS=$(shell pkg-config --cflags --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.1 || pkg-config --cflags $(PKG_GTK) $(PKG_WNCK) lua) |
| 88 |
STD_LDFLAGS= |
| 89 |
-LIBS=-lX11 `pkg-config --libs $(PKG_GTK) $(PKG_WNCK) lua5.1` |
| 90 |
+LIBS=-lX11 $(shell pkg-config --libs --silence-errors $(PKG_GTK) $(PKG_WNCK) lua5.1 || pkg-config --libs $(PKG_GTK) $(PKG_WNCK) lua) |
| 91 |
|
| 92 |
LOCAL_CFLAGS=$(STD_CFLAGS) $(DEPRECATED) $(CFLAGS) $(LIB_CFLAGS) |
| 93 |
LOCAL_LDFLAGS=$(LDFLAGS) $(STD_LDFLAGS) |
| 94 |
-- |
| 95 |
1.7.10 |
Archives