diff --git a/0001-gitlab-CI-ensure-libtool-is-installed-in-build-conta.patch b/0001-gitlab-CI-ensure-libtool-is-installed-in-build-conta.patch deleted file mode 100644 index ca2db4e..0000000 --- a/0001-gitlab-CI-ensure-libtool-is-installed-in-build-conta.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 59113321b1eb9b5d476861a0ff82b08cd534365c Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith -Date: Fri, 6 Oct 2023 14:36:33 -0700 -Subject: [PATCH 01/15] gitlab CI: ensure libtool is installed in build - container - -Signed-off-by: Alan Coopersmith ---- - .gitlab-ci.yml | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index 35a3702..564e281 100644 ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -4,7 +4,7 @@ - # Please see the ci-templates documentation for details: - # https://freedesktop.pages.freedesktop.org/ci-templates/ - --.templates_sha: &template_sha 34f4ade99434043f88e164933f570301fd18b125 # see https://docs.gitlab.com/ee/ci/yaml/#includefile -+.templates_sha: &template_sha 25e8e9f020880aa35fffe3d6b259b933f0f9449f # see https://docs.gitlab.com/ee/ci/yaml/#includefile - - - include: -@@ -30,8 +30,8 @@ variables: - # The tag should be updated each time the list of packages is updated. - # Changing a tag forces the associated image to be rebuilt. - # Note: the tag has no meaning, we use a date format purely for readability -- FDO_DISTRIBUTION_TAG: '2022-01-30.0' -- FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake make xorg-util-macros xorgproto xorg-server-devel pixman libpciaccess' -+ FDO_DISTRIBUTION_TAG: '2023-10-06.0' -+ FDO_DISTRIBUTION_PACKAGES: 'git gcc pkgconf autoconf automake libtool make xorg-util-macros xorgproto xorg-server-devel pixman libpciaccess' - - - # --- -2.43.0 - diff --git a/xf86-video-voodoo.changes b/xf86-video-voodoo.changes index 04db1e9..e030a2b 100644 --- a/xf86-video-voodoo.changes +++ b/xf86-video-voodoo.changes @@ -1,8 +1,7 @@ ------------------------------------------------------------------- Wed Dec 11 16:10:06 UTC 2024 - Stefan Dirsch -- 0001-gitlab-CI-ensure-libtool-is-installed-in-build-conta.patch - 0002-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch +- 0002-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch 0003-Add-X.Org-s-standard-C-warning-flags-to-AM_CFLAGS.patch 0004-Quiet-Wredundant-decls-from-xorg-os.h-fallbacks-for-.patch 0005-Fix-3-Wunused-but-set-variable-warnings.patch diff --git a/xf86-video-voodoo.spec b/xf86-video-voodoo.spec index 0e613fb..d71ad65 100644 --- a/xf86-video-voodoo.spec +++ b/xf86-video-voodoo.spec @@ -26,7 +26,6 @@ URL: https://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.xz Source1: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.xz.sig Source2: xf86-video-voodoo.keyring -#Patch1: 0001-gitlab-CI-ensure-libtool-is-installed-in-build-conta.patch Patch2: 0002-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch Patch3: 0003-Add-X.Org-s-standard-C-warning-flags-to-AM_CFLAGS.patch Patch4: 0004-Quiet-Wredundant-decls-from-xorg-os.h-fallbacks-for-.patch