From 1618ade8a46c2622df2bf07a9bfc6f28f6a45e3f Mon Sep 17 00:00:00 2001 From: Wook Song Date: Wed, 24 Feb 2021 18:07:41 +0900 Subject: [PATCH] [Dist/Tizen] Fix the wrong cflags in the .pc file This patch fixes the wrong cflags in the .pc file by updating the local patch file that generates that pkg-config file. Change-Id: Idad0808335912b84f71482567db09a6738031e90 Signed-off-by: Wook Song --- packaging/0001-API-Makefile-Revise-Makefile-for-API.patch | 4 ++-- packaging/0002-API-Makefile-Generalize-Makefile.patch | 4 ++-- ...Makefile-Modifies-Makefile-to-generate-libmvnc.p.patch | 8 ++++---- ...Makefile-Add-flag-to-skip-.-get_mvcmd.sh-when-it.patch | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packaging/0001-API-Makefile-Revise-Makefile-for-API.patch b/packaging/0001-API-Makefile-Revise-Makefile-for-API.patch index bb7481b..95ba35c 100644 --- a/packaging/0001-API-Makefile-Revise-Makefile-for-API.patch +++ b/packaging/0001-API-Makefile-Revise-Makefile-for-API.patch @@ -1,7 +1,7 @@ -From 08bff1f635f2d1e743bf510c6db93121fdaa647e Mon Sep 17 00:00:00 2001 +From df6ca3910ae07c9ca9f4af1686e757bb6c947d45 Mon Sep 17 00:00:00 2001 From: Wook Song Date: Mon, 4 Nov 2019 14:29:44 +0900 -Subject: [PATCH 1/5] [API/Makefile] Revise Makefile for API +Subject: [PATCH 1/4] [API/Makefile] Revise Makefile for API This patch eliminates a trailing white space and a commented line, which is not required anymore. diff --git a/packaging/0002-API-Makefile-Generalize-Makefile.patch b/packaging/0002-API-Makefile-Generalize-Makefile.patch index 6f1095f..f753f03 100644 --- a/packaging/0002-API-Makefile-Generalize-Makefile.patch +++ b/packaging/0002-API-Makefile-Generalize-Makefile.patch @@ -1,7 +1,7 @@ -From 07aa89394577ae953a99cc9b5e8b18da8f620c99 Mon Sep 17 00:00:00 2001 +From cb96c11ef3e1a190c2c3d286a1ef7227b4f7b714 Mon Sep 17 00:00:00 2001 From: Wook Song Date: Mon, 4 Nov 2019 15:24:46 +0900 -Subject: [PATCH 2/5] [API/Makefile] Generalize Makefile +Subject: [PATCH 2/4] [API/Makefile] Generalize Makefile The current version of Makefile for API uses hard-coded install prefix, library and include directories. In order to generalize the diff --git a/packaging/0003-API-Makefile-Modifies-Makefile-to-generate-libmvnc.p.patch b/packaging/0003-API-Makefile-Modifies-Makefile-to-generate-libmvnc.p.patch index 199822c..885b0a3 100644 --- a/packaging/0003-API-Makefile-Modifies-Makefile-to-generate-libmvnc.p.patch +++ b/packaging/0003-API-Makefile-Modifies-Makefile-to-generate-libmvnc.p.patch @@ -1,7 +1,7 @@ -From cb903c6adc55fce0e0d8477571f17d222b967918 Mon Sep 17 00:00:00 2001 +From 4e564587a1f9fc31561fdc6c6e9d36b7c802553e Mon Sep 17 00:00:00 2001 From: Wook Song Date: Mon, 4 Nov 2019 15:56:04 +0900 -Subject: [PATCH 3/5] [API/Makefile] Modifies Makefile to generate libmvnc.pc +Subject: [PATCH 3/4] [API/Makefile] Modifies Makefile to generate libmvnc.pc This patch modifies Makefile to generate libmvnc.pc from libmvnc.pc.in, which is also added by this patch. @@ -67,7 +67,7 @@ index af78525..a072fdf 100644 + find -name "libmvnc.pc" -delete diff --git a/api/src/libmvnc.pc.in b/api/src/libmvnc.pc.in new file mode 100644 -index 0000000..9a607e9 +index 0000000..f507cb8 --- /dev/null +++ b/api/src/libmvnc.pc.in @@ -0,0 +1,11 @@ @@ -81,7 +81,7 @@ index 0000000..9a607e9 +Version: @VERSION@ +Requires: +Libs: -L${libdir} -lmvnc -+Cflags: -I${includedir}/mvnc ++Cflags: -I${includedir}/mvnc2 -- 2.17.1 diff --git a/packaging/0004-API-Makefile-Add-flag-to-skip-.-get_mvcmd.sh-when-it.patch b/packaging/0004-API-Makefile-Add-flag-to-skip-.-get_mvcmd.sh-when-it.patch index e58412d..d12738b 100644 --- a/packaging/0004-API-Makefile-Add-flag-to-skip-.-get_mvcmd.sh-when-it.patch +++ b/packaging/0004-API-Makefile-Add-flag-to-skip-.-get_mvcmd.sh-when-it.patch @@ -1,7 +1,7 @@ -From b8447c33754e25a88434a00a9868d54ce9615d20 Mon Sep 17 00:00:00 2001 +From 93d1c642ce0dd23c79fd8f6a366e6d13347fecef Mon Sep 17 00:00:00 2001 From: Wook Song Date: Mon, 4 Nov 2019 16:07:34 +0900 -Subject: [PATCH 4/5] [API/Makefile] Add flag to skip ./get_mvcmd.sh when it is +Subject: [PATCH 4/4] [API/Makefile] Add flag to skip ./get_mvcmd.sh when it is set In order to support build systems such as OBS and LaunchPad that do -- 2.34.1