!3 Rebuilt for vala 0.50 and Add fix_buildrequires.patch for xfce4-4.16
From: @dwl301 Reviewed-by: @zhang__3125 Signed-off-by: @zhang__3125
This commit is contained in:
openeuler-ci-bot
Gitee
commit
ad8e99df45
81
fix_buildrequires.patch
Normal file
81
fix_buildrequires.patch
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
diff -up xfce4-vala-4.10.3/configure.bak xfce4-vala-4.10.3/configure
|
||||||
|
--- xfce4-vala-4.10.3/configure.bak 2021-08-06 07:24:46.063295907 +0000
|
||||||
|
+++ xfce4-vala-4.10.3/configure 2021-08-06 07:29:19.274598268 +0000
|
||||||
|
@@ -2460,11 +2460,11 @@ $as_echo "$as_me: WARNING: " >&2;}
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
-LIBXFCE4UI=libxfce4ui-1
|
||||||
|
+LIBXFCE4UI=libxfce4ui-2
|
||||||
|
|
||||||
|
if test -n "$PKG_CONFIG" && \
|
||||||
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxfce4ui-1 >= 4.10.0\""; } >&5
|
||||||
|
- ($PKG_CONFIG --exists --print-errors "libxfce4ui-1 >= 4.10.0") 2>&5
|
||||||
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxfce4ui-2 >= 4.16.0\""; } >&5
|
||||||
|
+ ($PKG_CONFIG --exists --print-errors "libxfce4ui-2 >= 4.16.0") 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
|
test $ac_status = 0; }; then
|
||||||
|
@@ -2472,8 +2472,8 @@ if test -n "$PKG_CONFIG" && \
|
||||||
|
else
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
|
||||||
|
$as_echo "$as_me: WARNING: " >&2;}
|
||||||
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The package libxfce4ui-1 >= 4.10.0 was not found" >&5
|
||||||
|
-$as_echo "$as_me: WARNING: The package libxfce4ui-1 >= 4.10.0 was not found" >&2;}
|
||||||
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The package libxfce4ui-2 >= 4.16.0 was not found" >&5
|
||||||
|
+$as_echo "$as_me: WARNING: The package libxfce4ui-2 >= 4.16.0 was not found" >&2;}
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need it to run the introspection tool" >&5
|
||||||
|
$as_echo "$as_me: WARNING: You need it to run the introspection tool" >&2;}
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
|
||||||
|
@@ -2481,11 +2481,11 @@ $as_echo "$as_me: WARNING: " >&2;}
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
-LIBXFCE4PANEL=libxfce4panel-1.0
|
||||||
|
+LIBXFCE4PANEL=libxfce4panel-2.0
|
||||||
|
|
||||||
|
if test -n "$PKG_CONFIG" && \
|
||||||
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxfce4panel-1.0 >= 4.10.0\""; } >&5
|
||||||
|
- ($PKG_CONFIG --exists --print-errors "libxfce4panel-1.0 >= 4.10.0") 2>&5
|
||||||
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxfce4panel-2.0 >= 4.16.0\""; } >&5
|
||||||
|
+ ($PKG_CONFIG --exists --print-errors "libxfce4panel-2.0 >= 4.16.0") 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
|
test $ac_status = 0; }; then
|
||||||
|
@@ -2493,8 +2493,8 @@ if test -n "$PKG_CONFIG" && \
|
||||||
|
else
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
|
||||||
|
$as_echo "$as_me: WARNING: " >&2;}
|
||||||
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The package libxfce4panel-1.0 >= 4.10.0 was not found" >&5
|
||||||
|
-$as_echo "$as_me: WARNING: The package libxfce4panel-1.0 >= 4.10.0 was not found" >&2;}
|
||||||
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The package libxfce4panel-2.0 >= 4.16.0 was not found" >&5
|
||||||
|
+$as_echo "$as_me: WARNING: The package libxfce4panel-2.0 >= 4.16.0 was not found" >&2;}
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need it to run the introspection tool" >&5
|
||||||
|
$as_echo "$as_me: WARNING: You need it to run the introspection tool" >&2;}
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
|
||||||
|
@@ -2502,11 +2502,11 @@ $as_echo "$as_me: WARNING: " >&2;}
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
-EXO=exo-1
|
||||||
|
+EXO=exo-2
|
||||||
|
|
||||||
|
if test -n "$PKG_CONFIG" && \
|
||||||
|
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exo-1 >= 0.8.0\""; } >&5
|
||||||
|
- ($PKG_CONFIG --exists --print-errors "exo-1 >= 0.8.0") 2>&5
|
||||||
|
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"exo-2 >= 4.16.0\""; } >&5
|
||||||
|
+ ($PKG_CONFIG --exists --print-errors "exo-2 >= 4.16.0") 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||||
|
test $ac_status = 0; }; then
|
||||||
|
@@ -2514,8 +2514,8 @@ if test -n "$PKG_CONFIG" && \
|
||||||
|
else
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
|
||||||
|
$as_echo "$as_me: WARNING: " >&2;}
|
||||||
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The package exo-1 >= 0.8.0 was not found" >&5
|
||||||
|
-$as_echo "$as_me: WARNING: The package exo-1 >= 0.8.0 was not found" >&2;}
|
||||||
|
+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: The package exo-2 >= 4.16.0 was not found" >&5
|
||||||
|
+$as_echo "$as_me: WARNING: The package exo-2 >= 4.16.0 was not found" >&2;}
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: You need it to run the introspection tool" >&5
|
||||||
|
$as_echo "$as_me: WARNING: You need it to run the introspection tool" >&2;}
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: " >&5
|
||||||
@ -1,13 +1,15 @@
|
|||||||
%global vala_version_api 0.48
|
%global vala_version_api 0.50
|
||||||
|
|
||||||
Name: xfce4-vala
|
Name: xfce4-vala
|
||||||
Version: 4.10.3
|
Version: 4.10.3
|
||||||
Release: 1
|
Release: 2
|
||||||
Summary: Vala bindings for the Xfce framework
|
Summary: Vala bindings for the Xfce framework
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
#Group: Development/Libraries
|
#Group: Development/Libraries
|
||||||
URL: http://wiki.xfce.org/vala-bindings
|
URL: http://wiki.xfce.org/vala-bindings
|
||||||
Source0: http://archive.xfce.org/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.3.tar.bz2
|
Source0: http://archive.xfce.org/src/bindings/xfce4-vala/4.10/xfce4-vala-4.10.3.tar.bz2
|
||||||
|
Patch0: fix_buildrequires.patch
|
||||||
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: exo-devel
|
BuildRequires: exo-devel
|
||||||
@ -31,6 +33,14 @@ libraries written in C.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
cd vapi
|
||||||
|
mv exo-1.deps exo-2.deps
|
||||||
|
mv exo-1.vapi exo-2.vapi
|
||||||
|
mv libxfce4panel-1.0.deps libxfce4panel-2.0.deps
|
||||||
|
mv libxfce4panel-1.0.vapi libxfce4panel-2.0.vapi
|
||||||
|
mv libxfce4ui-1.deps libxfce4ui-2.deps
|
||||||
|
mv libxfce4ui-1.vapi libxfce4ui-2.vapi
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --with-vala-api=%{vala_version_api}
|
%configure --with-vala-api=%{vala_version_api}
|
||||||
@ -46,5 +56,9 @@ libraries written in C.
|
|||||||
%{_datadir}/vala-%{vala_version_api}/vapi/*
|
%{_datadir}/vala-%{vala_version_api}/vapi/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 06 2021 Wenlong Ding <wenlong.ding@turbolinux.com.cn> - 4.10.3-2
|
||||||
|
- Rebuilt for vala 0.50
|
||||||
|
- Add fix_buildrequires.patch for xfce4-4.16
|
||||||
|
|
||||||
* Mon Jul 27 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 4.10.3-1
|
* Mon Jul 27 2020 Dillon Chen <dillon.chen@turbolinux.com.cn> - 4.10.3-1
|
||||||
- Init package
|
- Init package
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user