[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 3f48d7a3a344f38e6ed7efb012ec8dd75436722b
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 3.x development tree".
The branch, master has been updated via 3f48d7a3a344f38e6ed7efb012ec8dd75436722b (commit) via 1cd81daca731e99bbc7120d9d049b40ac083be40 (commit) via 1ef1fcd99b7e5f3071f7fca660a28c1aa5639543 (commit) via d6e9b7d05ad117814cb03309cfc9c580e4762d42 (commit) from b40cdb8c182d8b4aa05c6e23cc67118c4aa4853c (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3f48d7a3a344f38e6ed7efb012ec8dd75436722b Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jul 2 17:09:29 2022 +0200
Cleanup: Remove more X11 related libraries and packages.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1cd81daca731e99bbc7120d9d049b40ac083be40 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jul 2 17:01:27 2022 +0200
Cleanup: Remove various for packages for X11, gtk3 and gnome.
These packages have been added in favour of a graphical install tool. This idea has been dropped because we now have the TUI-based installer called bricklayer, which perfectly does its job.
So there is no need anymore for all of those packages.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 1ef1fcd99b7e5f3071f7fca660a28c1aa5639543 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jul 2 17:01:26 2022 +0200
pango: Do not link against X11 libs anymore.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit d6e9b7d05ad117814cb03309cfc9c580e4762d42 Author: Stefan Schantl stefan.schantl@ipfire.org Date: Sat Jul 2 17:01:25 2022 +0200
qemu: Build without support for SDL.
Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: SDL/SDL.nm | 64 ---- X11vnc/X11vnc.nm | 60 --- .../x11vnc-0.9.8-XShm-explicit-include.patch | 10 - X11vnc/patches/x11vnc-0.9.8-disableRpath.patch | 103 ------ at-spi2-atk/at-spi2-atk.nm | 60 --- at-spi2-core/at-spi2-core.nm | 65 ---- clutter/clutter.nm | 70 ---- clutter/patches/clutter-1.13.4-xi23.patch | 65 ---- clutter/patches/oob-device-fix.patch | 33 -- cogl/cogl.nm | 82 ----- dejavu-fonts/dejavu-fonts.nm | 184 ---------- fontforge/fontforge.nm | 57 --- .../patches/fontforge-20090224-pythondl.patch | 41 --- .../fontforge-20100501-select-points-crash.patch | 11 - .../patches/fontforge-20110222-libpng15.patch | 176 --------- gnome-themes-standard/gnome-themes-standard.nm | 88 ----- gnome-themes-standard/settings.ini | 7 - gtk3/gtk3.nm | 89 ----- libICE/libICE.nm | 43 --- libSM/libSM.nm | 44 --- libX11/libX11.nm | 42 --- libXau/libXau.nm | 47 --- libXau/patches/xau-1.0.4-local.patch | 22 -- libXaw/libXaw.nm | 49 --- libXcomposite/libXcomposite.nm | 44 --- libXcursor/index.theme | 2 - libXcursor/libXcursor.nm | 55 --- libXdamage/libXdamage.nm | 44 --- libXdmcp/libXdmcp.nm | 42 --- libXext/libXext.nm | 44 --- libXfixes/libXfixes.nm | 43 --- libXfont/libXfont.nm | 46 --- libXft/libXft.nm | 45 --- libXi/libXi.nm | 45 --- libXinerama/libXinerama.nm | 43 --- libXmu/libXmu.nm | 48 --- libXpm/libXpm.nm | 51 --- libXrandr/libXrandr.nm | 45 --- libXrender/libXrender.nm | 45 --- libXres/libXres.nm | 47 --- libXt/libXt.nm | 47 --- libXtst/libXtst.nm | 45 --- libXv/libXv.nm | 45 --- libXvMC/libXvMC.nm | 45 --- libXxf86vm/libXxf86vm.nm | 44 --- libfontenc/libfontenc.nm | 43 --- libxcb/libxcb.nm | 58 --- libxkbfile/libxkbfile.nm | 40 -- makedepend/makedepend.nm | 35 -- mesa/mesa.nm | 149 -------- pango/pango.nm | 3 +- perl-Tk/patches/perl-Tk-debian.patch | 71 ---- perl-Tk/patches/perl-Tk-seg.patch | 33 -- perl-Tk/patches/perl-Tk-widget.patch0 | 26 -- perl-Tk/perl-Tk.nm | 74 ---- qemu/qemu.nm | 6 +- xcb-proto/xcb-proto.nm | 39 -- xcb-util/xcb-util.nm | 55 --- xclock/xclock.nm | 43 --- xkeyboard-config/xkeyboard-config.nm | 48 --- xorg-x11-drv-ati/xorg-x11-drv-ati.nm | 61 ---- xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm | 61 ---- xorg-x11-drv-intel/intel.xinf | 28 -- xorg-x11-drv-intel/xorg-x11-drv-intel.nm | 77 ---- xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm | 55 --- .../xorg-x11-drv-modesetting.nm | 58 --- xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm | 55 --- xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm | 64 ---- xorg-x11-drv-synaptics/50-synaptics.conf | 22 -- xorg-x11-drv-synaptics/70-touchpad-quirks.rules | 15 - xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm | 64 ---- xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm | 57 --- xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm | 58 --- xorg-x11-font-utils/xorg-x11-font-utils.nm | 91 ----- xorg-x11-font-utils/xorg-x11-fonts-update-dirs | 60 --- xorg-x11-fonts/xorg-x11-fonts.nm | 405 --------------------- xorg-x11-proto-devel/xorg-x11-proto-devel.nm | 91 ----- xorg-x11-server/10-quirks.conf | 20 - ...erver-1.12-Xext-fix-selinux-build-failure.patch | 52 --- .../patches/xserver-1.4.99-ssh-isnt-local.patch | 48 --- .../xserver-1.6.0-less-acpi-brokenness.patch | 25 -- .../patches/xserver-1.6.99-right-of.patch | 162 --------- .../patches/xserver-autobind-hotplug.patch | 106 ------ xorg-x11-server/xorg-x11-server.nm | 164 --------- xorg-x11-util-macros/xorg-x11-util-macros.nm | 41 --- .../patches/xinit-1.0.2-client-session.patch | 39 -- .../xorg-x11-xinit-1.3.2-systemd-logind.patch | 27 -- xorg-x11-xinit/xorg-x11-xinit.nm | 43 --- xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm | 72 ---- .../patches/xtrans-1.0.3-avoid-gethostname.patch | 11 - xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm | 34 -- xrandr/xrandr.nm | 44 --- xterm/patches/xterm-245-resources.patch | 17 - xterm/patches/xterm-256-man-page_paths.patch | 48 --- xterm/patches/xterm-261-desk.patch | 16 - xterm/xterm.nm | 55 --- zenity/zenity.nm | 54 --- 97 files changed, 4 insertions(+), 5546 deletions(-) delete mode 100644 SDL/SDL.nm delete mode 100644 X11vnc/X11vnc.nm delete mode 100644 X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch delete mode 100644 X11vnc/patches/x11vnc-0.9.8-disableRpath.patch delete mode 100644 at-spi2-atk/at-spi2-atk.nm delete mode 100644 at-spi2-core/at-spi2-core.nm delete mode 100644 clutter/clutter.nm delete mode 100644 clutter/patches/clutter-1.13.4-xi23.patch delete mode 100644 clutter/patches/oob-device-fix.patch delete mode 100644 cogl/cogl.nm delete mode 100644 dejavu-fonts/dejavu-fonts.nm delete mode 100644 fontforge/fontforge.nm delete mode 100644 fontforge/patches/fontforge-20090224-pythondl.patch delete mode 100644 fontforge/patches/fontforge-20100501-select-points-crash.patch delete mode 100644 fontforge/patches/fontforge-20110222-libpng15.patch delete mode 100644 gnome-themes-standard/gnome-themes-standard.nm delete mode 100644 gnome-themes-standard/settings.ini delete mode 100644 gtk3/gtk3.nm delete mode 100644 libICE/libICE.nm delete mode 100644 libSM/libSM.nm delete mode 100644 libX11/libX11.nm delete mode 100644 libXau/libXau.nm delete mode 100644 libXau/patches/xau-1.0.4-local.patch delete mode 100644 libXaw/libXaw.nm delete mode 100644 libXcomposite/libXcomposite.nm delete mode 100644 libXcursor/index.theme delete mode 100644 libXcursor/libXcursor.nm delete mode 100644 libXdamage/libXdamage.nm delete mode 100644 libXdmcp/libXdmcp.nm delete mode 100644 libXext/libXext.nm delete mode 100644 libXfixes/libXfixes.nm delete mode 100644 libXfont/libXfont.nm delete mode 100644 libXft/libXft.nm delete mode 100644 libXi/libXi.nm delete mode 100644 libXinerama/libXinerama.nm delete mode 100644 libXmu/libXmu.nm delete mode 100644 libXpm/libXpm.nm delete mode 100644 libXrandr/libXrandr.nm delete mode 100644 libXrender/libXrender.nm delete mode 100644 libXres/libXres.nm delete mode 100644 libXt/libXt.nm delete mode 100644 libXtst/libXtst.nm delete mode 100644 libXv/libXv.nm delete mode 100644 libXvMC/libXvMC.nm delete mode 100644 libXxf86vm/libXxf86vm.nm delete mode 100644 libfontenc/libfontenc.nm delete mode 100644 libxcb/libxcb.nm delete mode 100644 libxkbfile/libxkbfile.nm delete mode 100644 makedepend/makedepend.nm delete mode 100644 mesa/mesa.nm delete mode 100644 perl-Tk/patches/perl-Tk-debian.patch delete mode 100644 perl-Tk/patches/perl-Tk-seg.patch delete mode 100644 perl-Tk/patches/perl-Tk-widget.patch0 delete mode 100644 perl-Tk/perl-Tk.nm delete mode 100644 xcb-proto/xcb-proto.nm delete mode 100644 xcb-util/xcb-util.nm delete mode 100644 xclock/xclock.nm delete mode 100644 xkeyboard-config/xkeyboard-config.nm delete mode 100644 xorg-x11-drv-ati/xorg-x11-drv-ati.nm delete mode 100644 xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm delete mode 100644 xorg-x11-drv-intel/intel.xinf delete mode 100644 xorg-x11-drv-intel/xorg-x11-drv-intel.nm delete mode 100644 xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm delete mode 100644 xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm delete mode 100644 xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm delete mode 100644 xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm delete mode 100644 xorg-x11-drv-synaptics/50-synaptics.conf delete mode 100644 xorg-x11-drv-synaptics/70-touchpad-quirks.rules delete mode 100644 xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm delete mode 100644 xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm delete mode 100644 xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm delete mode 100644 xorg-x11-font-utils/xorg-x11-font-utils.nm delete mode 100644 xorg-x11-font-utils/xorg-x11-fonts-update-dirs delete mode 100644 xorg-x11-fonts/xorg-x11-fonts.nm delete mode 100644 xorg-x11-proto-devel/xorg-x11-proto-devel.nm delete mode 100644 xorg-x11-server/10-quirks.conf delete mode 100644 xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch delete mode 100644 xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch delete mode 100644 xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch delete mode 100644 xorg-x11-server/patches/xserver-1.6.99-right-of.patch delete mode 100644 xorg-x11-server/patches/xserver-autobind-hotplug.patch delete mode 100644 xorg-x11-server/xorg-x11-server.nm delete mode 100644 xorg-x11-util-macros/xorg-x11-util-macros.nm delete mode 100644 xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch delete mode 100644 xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch delete mode 100644 xorg-x11-xinit/xorg-x11-xinit.nm delete mode 100644 xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm delete mode 100644 xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch delete mode 100644 xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm delete mode 100644 xrandr/xrandr.nm delete mode 100644 xterm/patches/xterm-245-resources.patch delete mode 100644 xterm/patches/xterm-256-man-page_paths.patch delete mode 100644 xterm/patches/xterm-261-desk.patch delete mode 100644 xterm/xterm.nm delete mode 100644 zenity/zenity.nm
Difference in files: diff --git a/SDL/SDL.nm b/SDL/SDL.nm deleted file mode 100644 index 21fd5155f..000000000 --- a/SDL/SDL.nm +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = SDL -version = 1.2.15 -release = 1 - -groups = System/Libraries -url = http://www.libsdl.org/ -license = LGPLv2+ -summary = A cross-platform multimedia library. - -description - Simple DirectMedia Layer (SDL) is a cross-platform multimedia library - designed to provide fast access to the graphics frame buffer and audio - device. -end - -source_dl = http://www.libsdl.org/release/ - -build - requires - libusb-compat-devel - libX11-devel - libXext-devel - libXrandr-devel - libXrender-devel - mesa-devel - end - - if "%{DISTRO_PLATFORM}" == "x86" - requires += nasm - end - - configure_options += \ - --disable-video-svga \ - --disable-video-ggi \ - --disable-video-aalib \ - --disable-video-ps3 \ - --enable-sdl-dlopen -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - - requires - libX11-devel - libXext-devel - libXrandr-devel - libXrender-devel - mesa-devel - SDL = %{thisver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/X11vnc/X11vnc.nm b/X11vnc/X11vnc.nm deleted file mode 100644 index e38dd26e7..000000000 --- a/X11vnc/X11vnc.nm +++ /dev/null @@ -1,60 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = X11vnc -version = 0.9.12 -release = 0 - -groups = Development/Tools -url = http://www.karlrunge.com/x11vnc/ -license = GPLv2 -summary = VNC server for the current X11 session. - -description - X11vnc provides a VNC access to the current X11 session. -end - -source_dl = http://sourceforge.net/projects/libvncserver/files/x11vnc/%%7Bversion%7D/ -sources = x11vnc-%{version}.tar.gz - -build - requires - libX11-devel - libXdamage-devel - libXext-devel - libXi-devel - libXfixes-devel - libXtst-devel - libjpeg-devel - libVNCServer-devel - openssl-devel - xorg-x11-proto-devel - zlib-devel - end - - DIR_APP = %{DIR_SRC}/x11vnc-%{version} - - configure_options += \ - --mandir=/usr/share/man \ - --with-system-libvncserver \ - --without-tightvnc-filetransfer - - # Remove java executables - install_cmds - cd %{BUILDROOT} && find -name '*.jar' -exec rm {} ; - end -end - -packages - package %{name} - requires - xorg-x11-server - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch b/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch deleted file mode 100644 index 8ef1e3c92..000000000 --- a/X11vnc/patches/x11vnc-0.9.8-XShm-explicit-include.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/x11vnc/cleanup.c.orig 2009-06-14 19:29:17.000000000 +0400 -+++ b/x11vnc/cleanup.c 2009-08-07 02:44:14.000000000 +0400 -@@ -50,6 +50,7 @@ - #include "screen.h" - #include "xrecord.h" - #include "xevents.h" -+#include <X11/extensions/shmproto.h> // For X_ShmAttach in Fedora 12 - - /* - * Exiting and error handling routines diff --git a/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch b/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch deleted file mode 100644 index 81be9a769..000000000 --- a/X11vnc/patches/x11vnc-0.9.8-disableRpath.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- a/configure.orig 2009-06-19 18:44:21.000000000 +0400 -+++ b/configure 2009-07-29 16:01:13.000000000 +0400 -@@ -4183,7 +4183,7 @@ - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 - echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 -- ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" -+ ac_xsave_LIBS=$LIBS; LIBS="$LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4233,9 +4233,9 @@ - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 -- X_LIBS="$X_LIBS -R$x_libraries" -+ X_LIBS="$X_LIBS" - else -- LIBS="$ac_xsave_LIBS -R $x_libraries" -+ LIBS="$ac_xsave_LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -4285,7 +4285,7 @@ - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 - echo "${ECHO_T}yes" >&6 -- X_LIBS="$X_LIBS -R $x_libraries" -+ X_LIBS="$X_LIBS" - else - echo "$as_me:$LINENO: result: neither works" >&5 - echo "${ECHO_T}neither works" >&6 -@@ -6705,7 +6705,7 @@ - if test ! -z "$HAVE_LIBXFIXES" -o ! -z "$HAVE_LIBXDAMAGE"; then - # need /usr/sfw/lib in RPATH for Solaris 10 and later - case `(uname -sr) 2>/dev/null` in -- "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS -R/usr/sfw/lib" ;; -+ "SunOS 5"*) X_EXTRA_LIBS="$X_EXTRA_LIBS" ;; - esac - fi - if test ! -z "$HAVE_LIBXRANDR"; then -@@ -7026,9 +7026,9 @@ - if test "x$ld_minus_R" = "xno"; then - : - elif test "x$GCC" = "xyes"; then -- LDFLAGS="$LDFLAGS -Xlinker -R$with_ssl/lib" -+ LDFLAGS="$LDFLAGS -Xlinker" - else -- LDFLAGS="$LDFLAGS -R$with_ssl/lib" -+ LDFLAGS="$LDFLAGS" - fi - fi - echo "$as_me:$LINENO: checking for RAND_file_name in -lcrypto" >&5 -@@ -7910,13 +7910,6 @@ - fi - if test "x$with_system_libvncserver" != "xyes"; then - rflag="" -- if test "x$ld_minus_R" = "xno"; then -- : -- elif test "x$GCC" = "xyes"; then -- rflag="-Xlinker -R$with_system_libvncserver/lib" -- else -- rflag="-R$with_system_libvncserver/lib" -- fi - cmd="$with_system_libvncserver/bin/libvncserver-config" - if $cmd --version 1>/dev/null 2>&1; then - cvers=`$cmd --version 2>/dev/null` -@@ -7958,9 +7951,9 @@ - if test "x$ld_minus_R" = "xno"; then - : - elif test "x$GCC" = "xyes"; then -- rflag=" -Xlinker -R$rprefix/lib " -+ rflag=" -Xlinker " - else -- rflag=" -R$rprefix/lib " -+ rflag=" " - fi - cvers=`libvncserver-config --version 2>/dev/null` - cscore=`echo "$cvers" | tr '.' ' ' | awk '{print 10000 * $1 + 100 * $2 + $3}'` -@@ -8039,9 +8032,9 @@ - : - elif test "x$GCC" = "xyes"; then - # this is not complete... in general a rat's nest. -- LDFLAGS="$LDFLAGS -Xlinker -R$with_jpeg/lib" -+ LDFLAGS="$LDFLAGS -Xlinker" - else -- LDFLAGS="$LDFLAGS -R$with_jpeg/lib" -+ LDFLAGS="$LDFLAGS" - fi - fi - if test "${ac_cv_header_jpeglib_h+set}" = set; then -@@ -8320,9 +8313,9 @@ - if test "x$ld_minus_R" = "xno"; then - : - elif test "x$GCC" = "xyes"; then -- LDFLAGS="$LDFLAGS -Xlinker -R$with_zlib/lib" -+ LDFLAGS="$LDFLAGS -Xlinker" - else -- LDFLAGS="$LDFLAGS -R$with_zlib/lib" -+ LDFLAGS="$LDFLAGS" - fi - fi - if test "${ac_cv_header_zlib_h+set}" = set; then diff --git a/at-spi2-atk/at-spi2-atk.nm b/at-spi2-atk/at-spi2-atk.nm deleted file mode 100644 index 32a168efb..000000000 --- a/at-spi2-atk/at-spi2-atk.nm +++ /dev/null @@ -1,60 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = at-spi2-atk -version = %{ver_major}.%{ver_minor} -ver_major = 2.19 -ver_minor = 92 -release = 1 - -groups = System/Libraries -url = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus -license = LGPLv2+ -summary = A GTK+ module that bridges ATK to D-Bus at-spi. - -description - The ATK library provides a set of interfaces for adding accessibility - support to applications and graphical user interface toolkits. -end - -source_dl = http://download.gnome.org/sources/%%7Bname%7D/%%7Bver_major%7D/ -sources = %{thisapp}.tar.xz - -build - requires - at-spi2-core-devel >= 2.19 - atk-devel - dbus-devel >= 1.5 - dbus-glib-devel - glib2-devel - intltool - libxml2-devel - end - - configure_options += \ - --disable-gtk-doc-html \ - --disable-static - - install_cmds - # Remove unneedet files. - rm -rvf %{BUILDROOT}%{libdir}/gnome-settings* - rm -rvf %{BUILDROOT}%{libdir}/gtk-2* - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - - files += \ - %{datadir}/gir*/ - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/at-spi2-core/at-spi2-core.nm b/at-spi2-core/at-spi2-core.nm deleted file mode 100644 index 0d525aa8a..000000000 --- a/at-spi2-core/at-spi2-core.nm +++ /dev/null @@ -1,65 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = at-spi2-core -version = %{ver_major}.%{ver_minor} -ver_major = 2.19 -ver_minor = 92 -release = 2 - -groups = System/Libraries -url = http://www.linuxfoundation.org/en/AT-SPI_on_D-Bus -license = LGPLv2+ -summary = Protocol definitions and daemon for D-Bus at-spi. - -description - The ATK library provides a set of interfaces for adding accessibility - support to applications and graphical user interface toolkits. -end - -source_dl = http://download.gnome.org/sources/%%7Bname%7D/%%7Bver_major%7D/ -sources = %{thisapp}.tar.xz - -build - requires - dbus-devel - intltool - glib2-devel - gobject-introspection-devel - libXtst-devel - libXext-devel - libXi-devel - end - - export LD_LIBRARY_PATH = %{DIR_APP}/atspi/.libs - - configure_options += \ - --disable-gtk-doc-html \ - --disable-static - - install_cmds - # Remove unneeded files for xdg. - rm -rvf %{BUILDROOT}%{sysconfdir}/xdg - end -end - -packages - package %{name} - - package %{name}-libs - template LIBS - end - - package %{name}-devel - template DEVEL - - files += \ - %{datadir}/gir*/ - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/clutter/clutter.nm b/clutter/clutter.nm deleted file mode 100644 index 1d812b464..000000000 --- a/clutter/clutter.nm +++ /dev/null @@ -1,70 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = clutter -version = %{ver_maj}.%{ver_min} -ver_maj = 1.13 -ver_min = 4 -release = 2 - -groups = Development/Libraries -url = http://www.clutter-project.org/ -license = LGPLv2+ -summary = Open Source software library for creating rich graphical user \ - interfaces. - -description - Clutter is an open source software library for creating fast, - visually rich graphical user interfaces. The most obvious example - of potential usage is in media center type applications. - We hope however it can be used for a lot more. -end - -source_dl = http://download.gnome.org/sources/clutter/%%7Bver_maj%7D/ -sources = %{thisapp}.tar.xz - -build - requires - atk-devel - cairo-gobject-devel - gdk-pixbuf2-devel - glib2-devel - gobject-introspection-devel >= 0.9.6 - cogl-devel - gtk3-devel - json-glib-devel - libXcomposite-devel - libXdamage-devel - libXi-devel - libGL-devel - pango-devel - end - - export LD_LIBRARY_PATH = %{DIR_APP}/clutter/.libs - - configure_options += \ - --enable-xinput - - make_build_targets += V=1 -end - -packages - package %{name} - requires - libGL - end - end - - package %{name}-devel - template DEVEL - - files += \ - %{datadir}/gir*/ - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/clutter/patches/clutter-1.13.4-xi23.patch b/clutter/patches/clutter-1.13.4-xi23.patch deleted file mode 100644 index b11c80cba..000000000 --- a/clutter/patches/clutter-1.13.4-xi23.patch +++ /dev/null @@ -1,65 +0,0 @@ -From b58a1d66816c19eda079a1bd7cecd1ad03644e69 Mon Sep 17 00:00:00 2001 -From: "Jasper St. Pierre" jstpierre@mecheye.net -Date: Wed, 23 Jan 2013 17:09:59 -0500 -Subject: [PATCH] x11: Always request XI2.2 - -The X server should fill in the minor version that it supports in the -case where it only supports the older version. We should not get a -BadRequest or fail the version check if we pass something higher. - -https://bugzilla.gnome.org/show_bug.cgi?id=692466 ---- - clutter/x11/clutter-backend-x11.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c -index 2d8f4ba..26f9581 100644 ---- a/clutter/x11/clutter-backend-x11.c -+++ b/clutter/x11/clutter-backend-x11.c -@@ -239,12 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11) - { - #ifdef HAVE_XINPUT_2 - int major = 2; -- --#ifdef HAVE_XINPUT_2_2 - int minor = 2; --#else -- int minor = 0; --#endif /* HAVE_XINPUT_2_2 */ - - if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest) - { --- -1.8.1.2 - -From 3e1450ba17fce90a8034cc525c67a87ff3cdd53d Mon Sep 17 00:00:00 2001 -From: "Jasper St. Pierre" jstpierre@mecheye.net -Date: Wed, 23 Jan 2013 14:49:26 -0500 -Subject: [PATCH] clutter-backend: Request XI2.3 - -Since XIQueryVersion, the bad API that it is, chooses the first client -version that it gets, we need to ensure that we pass XIQueryVersion the -new XI2.3 version, knowing fully well that Clutter won't be confused -by the new features. - -https://bugzilla.gnome.org/show_bug.cgi?id=692466 ---- - clutter/x11/clutter-backend-x11.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c -index 26f9581..1015f4c 100644 ---- a/clutter/x11/clutter-backend-x11.c -+++ b/clutter/x11/clutter-backend-x11.c -@@ -239,7 +239,7 @@ clutter_backend_x11_create_device_manager (ClutterBackendX11 *backend_x11) - { - #ifdef HAVE_XINPUT_2 - int major = 2; -- int minor = 2; -+ int minor = 3; - - if (XIQueryVersion (backend_x11->xdpy, &major, &minor) != BadRequest) - { --- -1.8.1.2 - diff --git a/clutter/patches/oob-device-fix.patch b/clutter/patches/oob-device-fix.patch deleted file mode 100644 index cc5928273..000000000 --- a/clutter/patches/oob-device-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d5604be9e5a148ced73dee2ede49b38f97119baf Mon Sep 17 00:00:00 2001 -From: Yanko Kaneti yaneti@declera.com -Date: Mon, 28 Jan 2013 15:49:51 +0200 -Subject: [PATCH] xi2: Fix access beyond array boundaries - ---- - clutter/x11/clutter-device-manager-xi2.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c -index 616dee7..bd9473e 100644 ---- a/clutter/x11/clutter-device-manager-xi2.c -+++ b/clutter/x11/clutter-device-manager-xi2.c -@@ -94,13 +94,13 @@ translate_valuator_class (Display *xdisplay, - atoms_initialized = TRUE; - } - -- for (i = CLUTTER_INPUT_AXIS_IGNORE; -- i < CLUTTER_INPUT_AXIS_LAST; -+ for (i = 0; -+ i < N_AXIS_ATOMS; - i += 1) - { - if (clutter_input_axis_atoms[i] == class->label) - { -- axis = i; -+ axis = i + 1; - break; - } - } --- -1.8.1 - diff --git a/cogl/cogl.nm b/cogl/cogl.nm deleted file mode 100644 index af6285ade..000000000 --- a/cogl/cogl.nm +++ /dev/null @@ -1,82 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = cogl -version = %{ver_maj}.%{ver_min} -ver_maj = 1.13 -ver_min = 2 -release = 2 - -groups = Development/Libraries -url = http://www.clutter-project.org/ -license = LGPLv2+ -summary = A library for using 3D graphics hardware to draw pretty pictures - -description - Cogl is a small open source library for using 3D graphics hardware to draw - pretty pictures. The API departs from the flat state machine style of - OpenGL and is designed to make it easy to write orthogonal components that - can render without stepping on each others toes. - - As well aiming for a nice API, we think having a single library as opposed - to an API specification like OpenGL has a few advantages too; like being - able to paper over the inconsistencies/bugs of different OpenGL - implementations in a centralized place, not to mention the myriad of OpenGL - extensions. It also means we are in a better position to provide utility - APIs that help software developers since they only need to be implemented - once and there is no risk of inconsistency between implementations. - - Having other backends, besides OpenGL, such as drm, Gallium or D3D are - options we are interested in for the future. -end - -source_dl = http://download.gnome.org/sources/cogl/%%7Bver_maj%7D/ -sources = %{thisapp}.tar.xz - -build - requires - cairo-devel - gdk-pixbuf2-devel - glib2-devel - gobject-introspection-devel - libXcomposite-devel - libXdamage-devel - libXext-devel - libXfixes-devel - libGL-devel - pango-devel - end - - export LD_LIBRARY_PATH = %{DIR_APP}/cogl/.libs:%{DIR_APP}/cogl-pango/.libs - - configure_options += \ - --enable-cairo \ - --enable-gdk-pixbuf \ - --enable-cogl-pango \ - --enable-glx \ - --enable-introspection=yes \ - --disable-gtk-doc - - make_build_targets += V=1 - - install_cmds - rm -vf %{BUILDROOT}%{datadir}/cogl/examples-data/crate.jpg - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - - files += \ - %{datadir}/gir*/ - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/dejavu-fonts/dejavu-fonts.nm b/dejavu-fonts/dejavu-fonts.nm deleted file mode 100644 index 24a77fa79..000000000 --- a/dejavu-fonts/dejavu-fonts.nm +++ /dev/null @@ -1,184 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = dejavu-fonts -version = 2.33 -release = 1 -arch = noarch - -groups = System/Fonts -url = http://www.dejavu-fonts.org/ -license = Bitstream Vera and Public Domain -summary = DejaVu fonts. - -description - The DejaVu font set is based on the "Bitstream Vera" fonts, release 1.10. Its - purpose is to provide a wider range of characters, while maintaining the - original style, using an open collaborative development process. -end - -source_dl = http://sourceforge.net/projects/dejavu/files/dejavu/%%7Bversion%7D/ -sources = %{thisapp}.tar.bz2 - -fontname = dejavu -fontdir = %{datadir}/fonts/%{fontname}/ -fontconfig_templatedir = %{datadir}/fontconfig/conf.avail/ -fontconfig_confdir = %{sysconfdir}/fonts/conf.d/ - -build - requires - perl(Font::TTF) - bzip2 - fontforge - unicode-ucd - end - - make_build_targets += \ - VERSION=%{version} \ - FC-LANG="" \ - BLOCKS=/usr/share/unicode/ucd/Blocks.txt \ - UNICODEDATA=/usr/share/unicode/ucd/UnicodeData.txt - - test - make check - end - - install - # Compress the huge state.txt. - bzip2 -9 build/status.txt - - # Create directories and install font files. - install -m 0755 -d %{BUILDROOT}%{fontdir} - install -m 0644 -p build/*.ttf %{BUILDROOT}%{fontdir} - - # Create directories for configuration files. - install -m 0755 -d %{BUILDROOT}%{fontconfig_templatedir} \ - %{BUILDROOT}%{fontconfig_confdir} - - # Install config files and symlink them to /etc. - cd fontconfig - for fontconf in *conf; do - install -m 0644 -p $fontconf %{BUILDROOT}%{fontconfig_templatedir} - ln -s ../../..%{fontconfig_templatedir}$fontconf \ - %{BUILDROOT}%{fontconfig_confdir}/$fontconf - - done - end -end - -packages - # Template for fonts. - template FONT - requires - %{name} = %{thisver} - end - end - - package %{name} - - package %{name}-sans-fonts - template FONT - - summary = Variable-width sans-serif font faces. - description - This package consists of the DejaVu sans-serif variable-width font faces, in - their unabridged version. - end - - files - %{fontdir}DejaVuSans.ttf - %{fontdir}DejaVuSans-*.ttf - %{fontdir}DejaVuSansCondensed*.ttf - %{fontconfig_templatedir}*-sans.conf - %{fontconfig_confdir}*-sans.conf - end - end - - package %{name}-serif-fonts - template FONT - - summary = Variable-width serif font faces. - description - This package consists of the DejaVu serif variable-width font faces, in - their unabridged version. - end - - files - %{fontdir}DejaVuSerif.ttf - %{fontdir}DejaVuSerif-*.ttf - %{fontdir}DejaVuSerifCondensed*.ttf - %{fontconfig_templatedir}*-serif.conf - %{fontconfig_confdir}*-serif.conf - end - end - - package %{name}-sans-mono-fonts - template FONT - - summary = Monospace sans-serif fon faces. - description - This package consists of the DejaVu sans-serif monospace font faces, in their - unabridged version. - end - - files - %{fontdir}DejaVuSansMono.ttf - %{fontconfig_templatedir}*-sans-mono.conf - %{fontconfig_confdir}*-sans-mono.conf - end - end - - package %{name}-lgc-sans-fonts - template FONT - - summary = Variable-width sans-serif font faces, Latin-Greek-Cyrillic subset. - description - This package consists of the DejaVu sans-serif variable-width font faces, with - unicode coverage restricted to Latin, Greek and Cyrillic. - end - - files - %{fontdir}DejaVuLGCSans.ttf - %{fontdir}DejaVuLGCSans-*.ttf - %{fontdir}DejaVuLGCSansCondensed*.ttf - %{fontconfig_templatedir}*-lgc-sans.conf - %{fontconfig_confdir}*-lgc-sans.conf - end - end - - package %{name}-lgc-serif-fonts - template FONT - - summary = Variable-width serif font faces, Latin-Greek-Cyrillic subset. - description - This package consists of the DejaVu serif variable-width font faces, with - unicode coverage restricted to Latin, Greek and Cyrillic. - end - - files - %{fontdir}DejaVuLGCSerif.ttf - %{fontdir}DejaVuLGCSerif-*.ttf - %{fontdir}DejaVuLGCSerifCondensed*.ttf - %{fontconfig_templatedir}*-lgc-serif.conf - %{fontconfig_confdir}*-lgc-serif.conf - end - end - - package %{name}-lgc-sans-mono-fonts - template FONT - - summary = Monospace sans-serif font faces, Latin-Greek-Cyrillic subset. - description - This package consists of the DejaVu sans-serif monospace font faces, with - unicode coverage restricted to Latin, Greek and Cyrillic. - end - - files - %{fontdir}DejaVuLGCSansMono*.ttf - %{fontconfig_templatedir}*-lgc-sans-mono.conf - %{fontconfig_confdir}*-lgc-sans-mono.conf - end - end -end diff --git a/fontforge/fontforge.nm b/fontforge/fontforge.nm deleted file mode 100644 index 75984edaa..000000000 --- a/fontforge/fontforge.nm +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = fontforge -version = 20110222 -release = 2 - -groups = Applications/Publishing -url = http://fontforge.sourceforge.net/ -license = BSD -summary = Outline and bitmap font editor. - -description - FontForge (former PfaEdit) is a font editor for outline and bitmap - fonts. It supports a range of font formats, including PostScript - (ASCII and binary Type 1, some Type 3 and Type 0), TrueType, OpenType - (Type2) and CID-keyed fonts. -end - -source_dl = http://sourceforge.net/projects/fontforge/files/fontforge-source/ -sources = %{name}_full-%{version}.tar.bz2 - -build - requires - cairo-devel>=1.12.2 - freetype-devel - gettext - libjpeg-devel - libpng-devel - libtiff-devel - libXft-devel - libXt-devel - libxml2-devel - pango-devel>=1.29.5-2 - python-devel - xorg-x11-proto-devel - end - - configure_options += \ - --with-freetype-bytecode=no \ - --with-regular-link \ - --enable-pyextension -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/fontforge/patches/fontforge-20090224-pythondl.patch b/fontforge/patches/fontforge-20090224-pythondl.patch deleted file mode 100644 index 45e04bfc1..000000000 --- a/fontforge/patches/fontforge-20090224-pythondl.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nur fontforge-20090224.orig/configure fontforge-20090224/configure ---- fontforge-20090224.orig/configure 2008-12-24 14:04:18.000000000 -0700 -+++ fontforge-20090224/configure 2009-04-01 22:56:07.000000000 -0600 -@@ -26670,6 +26670,7 @@ - else - PYLIBS="" - fi -+ PYDEFINES="$PYDEFINES, ('SOLIBDIR','"$libdir/"')" - PY=pyhook/setup.py - fi - -diff -Nur fontforge-20090224.orig/pyhook/loadfontforge.h fontforge-20090224/pyhook/loadfontforge.h ---- fontforge-20090224.orig/pyhook/loadfontforge.h 2007-12-23 19:28:35.000000000 -0700 -+++ fontforge-20090224/pyhook/loadfontforge.h 2009-04-01 22:49:08.000000000 -0600 -@@ -11,7 +11,7 @@ - - if ( (lib = dlopen("libgunicode" SO_EXT,RTLD_LAZY))==NULL ) { - #ifdef PREFIX -- lib = dlopen( PREFIX "/lib/" "libgunicode" SO_EXT,RTLD_LAZY); -+ lib = dlopen( SOLIBDIR "libgunicode.so.3" ,RTLD_LAZY); - #endif - } - if ( lib==NULL ) { -@@ -21,7 +21,7 @@ - - if ( (lib = dlopen("libgutils" SO_EXT,RTLD_LAZY))==NULL ) { - #ifdef PREFIX -- lib = dlopen( PREFIX "/lib/" "libgutils" SO_EXT,RTLD_LAZY); -+ lib = dlopen( SOLIBDIR "libgutils.so.1" ,RTLD_LAZY); - #endif - } - if ( lib==NULL ) { -@@ -31,7 +31,7 @@ - - if ( (lib = dlopen("libfontforge" SO_EXT,RTLD_LAZY))==NULL ) { - #ifdef PREFIX -- lib = dlopen( PREFIX "/lib/" "libfontforge" SO_EXT,RTLD_LAZY); -+ lib = dlopen( SOLIBDIR "libfontforge.so.1" ,RTLD_LAZY); - #endif - } - if ( lib==NULL ) { diff --git a/fontforge/patches/fontforge-20100501-select-points-crash.patch b/fontforge/patches/fontforge-20100501-select-points-crash.patch deleted file mode 100644 index 90c9bde31..000000000 --- a/fontforge/patches/fontforge-20100501-select-points-crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- fontforge-20100501.orig/fontforge/charview.c 2010-04-15 03:26:28.000000000 +0100 -+++ fontforge-20100501/fontforge/charview.c 2011-03-01 15:09:22.821753002 +0000 -@@ -8597,7 +8597,7 @@ - static int CVNumForePointsSelected(CharView *cv, BasePoint **bp) { - SplineSet *spl; - SplinePoint *test, *first; -- BasePoint *bps[4]; -+ BasePoint *bps[5]; - int i, cnt; - - if ( cv->b.drawmode!=dm_fore ) diff --git a/fontforge/patches/fontforge-20110222-libpng15.patch b/fontforge/patches/fontforge-20110222-libpng15.patch deleted file mode 100644 index 156e3c186..000000000 --- a/fontforge/patches/fontforge-20110222-libpng15.patch +++ /dev/null @@ -1,176 +0,0 @@ -From e76a8a537dbf8c47024f5863f9f18ed55ad686d3 Mon Sep 17 00:00:00 2001 -From: michal-n michal-n@users.sourceforge.net -Date: Sat, 17 Dec 2011 15:24:12 +0100 -Subject: [PATCH] There was no need to panic... - The patch from Paul contained errant reference to 'png_color16'. - The correct form is 'png_color_16'. So, patch reapplied. - ---- - gutils/gimagewritepng.c | 100 +++++++++++++++++++++++----------------------- - 1 files changed, 50 insertions(+), 50 deletions(-) - -diff --git a/gutils/gimagewritepng.c b/gutils/gimagewritepng.c -index 43fa097..a88ec63 100644 ---- a/gutils/gimagewritepng.c -+++ b/gutils/gimagewritepng.c -@@ -236,6 +236,7 @@ return(false); - } - } else { - if ( base->trans!=-1 ) { -+ trans_color = galloc(sizeof(png_color_16)); - trans_color->red = COLOR_RED(base->trans); - trans_color->green = COLOR_GREEN(base->trans); - trans_color->blue = COLOR_BLUE(base->trans); -@@ -258,6 +259,7 @@ return(false); - _png_write_end(png_ptr, info_ptr); - - if ( trans_alpha!=NULL ) gfree(trans_alpha); -+ if ( trans_color!=NULL ) gfree(trans_color); - if ( palette!=NULL ) gfree(palette); - _png_destroy_write_struct(&png_ptr, &info_ptr); - gfree(rows); -@@ -296,7 +298,7 @@ static void user_error_fn(png_structp png_ptr, png_const_charp error_msg) { - #if (PNG_LIBPNG_VER < 10500) - longjmp(png_ptr->jmpbuf,1); - #else -- _png_longjmp (png_ptr, 1); -+ png_longjmp (png_ptr, 1); - #endif - } - -@@ -310,6 +312,12 @@ int GImageWrite_Png(GImage *gi, FILE *fp, int progressive) { - png_infop info_ptr; - png_byte **rows; - int i; -+ int bit_depth; -+ int color_type; -+ int num_palette; -+ png_bytep trans_alpha = NULL; -+ png_color_16p trans_color = NULL; -+ png_colorp palette = NULL; - - png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, - (void *)NULL, user_error_fn, user_warning_fn); -@@ -336,65 +344,60 @@ return(false); - - png_init_io(png_ptr, fp); - -- info_ptr->width = base->width; -- info_ptr->height = base->height; -- info_ptr->bit_depth = 8; -- info_ptr->valid = 0; -- info_ptr->interlace_type = progressive; -- if ( base->trans!=-1 ) { -- info_ptr->num_trans = 1; -- info_ptr->valid |= PNG_INFO_tRNS; -+ bit_depth = 8; -+ num_palette = base->clut==NULL?2:base->clut->clut_len; -+ if ( base->image_type==it_index || base->image_type==it_bitmap ) { -+ color_type = PNG_COLOR_TYPE_PALETTE; -+ if ( num_palette<=2 ) -+ bit_depth=1; -+ else if ( num_palette<=4 ) -+ bit_depth=2; -+ else if ( num_palette<=16 ) -+ bit_depth=4; -+ } else { -+ color_type = PNG_COLOR_TYPE_RGB; -+ if ( base->image_type == it_rgba ) -+ color_type = PNG_COLOR_TYPE_RGB_ALPHA; - } -+ -+ png_set_IHDR(png_ptr, info_ptr, base->width, base->height, -+ bit_depth, color_type, progressive, -+ PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); - if ( base->image_type==it_index || base->image_type==it_bitmap ) { -- info_ptr->color_type = PNG_COLOR_TYPE_PALETTE; -- info_ptr->valid |= PNG_INFO_PLTE; -- info_ptr->num_palette = base->clut==NULL?2:base->clut->clut_len; -- info_ptr->palette = (png_color *) galloc(info_ptr->num_palette*sizeof(png_color)); -+ palette = (png_color *) galloc(num_palette*sizeof(png_color)); - if ( base->clut==NULL ) { -- info_ptr->palette[0].red = info_ptr->palette[0].green = info_ptr->palette[0].blue = 0; -- info_ptr->palette[1].red = info_ptr->palette[1].green = info_ptr->palette[1].blue = 0xff; -+ palette[0].red = palette[0].green = palette[0].blue = 0; -+ palette[1].red = palette[1].green = palette[1].blue = 0xff; - } else { -- for ( i=0; i<info_ptr->num_palette; ++i ) { -+ for ( i=0; i<num_palette; ++i ) { - long col = base->clut->clut[i]; -- info_ptr->palette[i].red = COLOR_RED(col); -- info_ptr->palette[i].green = COLOR_GREEN(col); -- info_ptr->palette[i].blue = COLOR_BLUE(col); -+ palette[i].red = COLOR_RED(col); -+ palette[i].green = COLOR_GREEN(col); -+ palette[i].blue = COLOR_BLUE(col); - } - } -- if ( info_ptr->num_palette<=2 ) -- info_ptr->bit_depth=1; -- else if ( info_ptr->num_palette<=4 ) -- info_ptr->bit_depth=2; -- else if ( info_ptr->num_palette<=16 ) -- info_ptr->bit_depth=4; -- if ( info_ptr->num_palette<=16 ) -+ png_set_PLTE(png_ptr, info_ptr, palette, num_palette); -+ if ( num_palette<=16 ) - png_set_packing(png_ptr); -+ - if ( base->trans!=-1 ) { --#if ( PNG_LIBPNG_VER_MAJOR > 1 || PNG_LIBPNG_VER_MINOR > 2 ) -- info_ptr->trans_alpha = galloc(1); -- info_ptr->trans_alpha[0] = base->trans; --#else -- info_ptr->trans = galloc(1); -- info_ptr->trans[0] = base->trans; --#endif -+ trans_alpha = galloc(1); -+ trans_alpha[0] = base->trans; - } - } else { -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; - if ( base->trans!=-1 ) { --#if ( PNG_LIBPNG_VER_MAJOR > 1 || PNG_LIBPNG_VER_MINOR > 2 ) -- info_ptr->trans_color.red = COLOR_RED(base->trans); -- info_ptr->trans_color.green = COLOR_GREEN(base->trans); -- info_ptr->trans_color.blue = COLOR_BLUE(base->trans); --#else -- info_ptr->trans_values.red = COLOR_RED(base->trans); -- info_ptr->trans_values.green = COLOR_GREEN(base->trans); -- info_ptr->trans_values.blue = COLOR_BLUE(base->trans); --#endif -+ trans_color = galloc(sizeof(png_color_16)); -+ trans_color->red = COLOR_RED(base->trans); -+ trans_color->green = COLOR_GREEN(base->trans); -+ trans_color->blue = COLOR_BLUE(base->trans); - } - } -+ if ( base->trans!=-1 ) { -+ png_set_tRNS(png_ptr, info_ptr, trans_alpha, 1, trans_color); -+ } - png_write_info(png_ptr, info_ptr); - -- if (info_ptr->color_type == PNG_COLOR_TYPE_RGB) -+ if (color_type == PNG_COLOR_TYPE_RGB) - png_set_filler(png_ptr, '\0', PNG_FILLER_BEFORE); - - rows = galloc(base->height*sizeof(png_byte *)); -@@ -405,12 +408,9 @@ return(false); - - png_write_end(png_ptr, info_ptr); - --#if ( PNG_LIBPNG_VER_MAJOR > 1 || PNG_LIBPNG_VER_MINOR > 2 ) -- if ( info_ptr->trans_alpha!=NULL ) gfree(info_ptr->trans_alpha); --#else -- if ( info_ptr->trans!=NULL ) gfree(info_ptr->trans); --#endif -- if ( info_ptr->palette!=NULL ) gfree(info_ptr->palette); -+ if ( trans_alpha!=NULL ) gfree(trans_alpha); -+ if ( trans_color!=NULL ) gfree(trans_color); -+ if ( palette!=NULL ) gfree(palette); - png_destroy_write_struct(&png_ptr, &info_ptr); - gfree(rows); - return( 1 ); --- -1.7.4.1 - diff --git a/gnome-themes-standard/gnome-themes-standard.nm b/gnome-themes-standard/gnome-themes-standard.nm deleted file mode 100644 index e5f1fc282..000000000 --- a/gnome-themes-standard/gnome-themes-standard.nm +++ /dev/null @@ -1,88 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = gnome-themes-standard -ver_major = 3.20 -version = %{ver_major} -release = 1 - -groups = -url = http://git.gnome.org/browse/gnome-themes-standard -license = LGPLv2+ -summary = Standard themes for GNOME applications. - -description - The gnome-themes-standard package contains the standard theme for the GNOME - desktop, which provides default appearance for cursors, desktop background, - window borders and GTK+ applications. -end - -source_dl = http://download.gnome.org/sources/%%7Bname%7D/%%7Bver_major%7D/ -sources = %{thisapp}.tar.xz - -build - requires - /usr/bin/gtk-update-icon-cache - gtk3-devel >= 3.0.2 - librsvg2-devel - intltool - end - - configure_options += \ - --disable-static \ - --disable-gtk2-engine - - install_cmds - mkdir -pv %{BUILDROOT}%{sysconfdir}/gtk-3.0 - - install -m 0664 %{DIR_SOURCE}/settings.ini \ - %{BUILDROOT}%{sysconfdir}/gtk-3.0/ - end -end - -packages - package %{name} - requires - adwaita-cursor-theme = %{thisver} - adwaita-gtk3-theme = %{thisver} - end - end - - package adwaita-cursor-theme - arch = noarch - - summary = Adwaita cursor theme. - description - The adwaita-cursor-theme package contains a modern set of cursors originally - designed for the GNOME desktop. - end - - files - %{datadir}/icons/Adwaita - end - end - - package adwaita-gtk3-theme - summary = Adwaita gtk3 theme. - description - The adwaita-gtk3-theme package contains a gtk3 theme for presenting widgets - with a GNOME look and feel. - end - - files - %{libdir}/gtk-3.0/ - %{datadir}/themes/Adwaita/gtk-3.0 - %{sysconfdir}/gtk-3.0/settings.ini - end - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/gnome-themes-standard/settings.ini b/gnome-themes-standard/settings.ini deleted file mode 100644 index aa2354418..000000000 --- a/gnome-themes-standard/settings.ini +++ /dev/null @@ -1,7 +0,0 @@ -[Settings] -gtk-theme-name = Adwaita -gtk-icon-theme-name = gnome -gtk-cursor-theme-name = Adwaita -gtk-button-images = 0 -gtk-menu-images = 0 -gtk-auto-mnemonics = 0 diff --git a/gtk3/gtk3.nm b/gtk3/gtk3.nm deleted file mode 100644 index ff81f6d18..000000000 --- a/gtk3/gtk3.nm +++ /dev/null @@ -1,89 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = gtk3 -version = %{ver_major}.%{ver_minor} -ver_major = 3.20 -ver_minor = 0 -release = 2 - -groups = System/Libraries -url = http://www.gtk.org -license = LGPLv2+ -summary = The GIMP Toolkit, a library for creating GUIs for X. - -description - GTK+ is a multi-platform toolkit for creating graphical user - interfaces. -end - -thisapp = gtk+-%{version} - -source_dl = http://download.gnome.org/sources/gtk+/%%7Bver_major%7D/ -sources = %{thisapp}.tar.xz - -build - requires - atk-devel >= 2.7.5 - at-spi2-atk-devel - cairo-devel >= 1.14.0 - cairo-gobject-devel >= 1.14.0 - fontconfig-devel - gdk-pixbuf2-devel >= 2.30.0 - gettext-devel >= 0.18.3 - glib2-devel >= 2.35.3 - gobject-introspection-devel >= 1.39.0 - libepoxy-devel >= 1.0 - libXi-devel - libXrandr-devel - libXrender-devel - libXfixes-devel - libXdamage-devel - pango-devel >= 1.37.3 - end - - export LD_LIBRARY_PATH = %{DIR_APP}/gdk/.libs:%{DIR_APP}/gtk/.libs - - configure_options += \ - --enable-x11-backend \ - --enable-introspection=yes \ - --disable-gtk2-dependency \ - --disable-wayland-backend \ - --disable-gtk-doc-html \ - --disable-colord \ - --disable-cups \ - --disable-papi - - install_cmds - # Remove unneeded files. - rm -rvf %{BUILDROOT}%{datadir}/gtk-3.0/demo - rm -rvf %{BUILDROOT}%{bindir}/*demo* - end -end - -packages - package %{name} - - package %{name}-libs - template LIBS - end - - package %{name}-devel - template DEVEL - - requires - at-spi2-atk-devel - atk-devel - glib2-devel - end - - files += \ - %{datadir}/gir*/ - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libICE/libICE.nm b/libICE/libICE.nm deleted file mode 100644 index 0607f0a5c..000000000 --- a/libICE/libICE.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libICE -version = 1.0.9 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libICE runtime library. - -description - X.Org X11 libICE development package. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - pkg-config - xorg-x11-proto-devel - xorg-x11-xtrans-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libSM/libSM.nm b/libSM/libSM.nm deleted file mode 100644 index 8f0bcb8b7..000000000 --- a/libSM/libSM.nm +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libSM -version = 1.2.2 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libSM runtime library. - -description - X.Org X11 libSM development package. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libICE-devel - libuuid-devel - xorg-x11-proto-devel - xorg-x11-xtrans-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libX11/libX11.nm b/libX11/libX11.nm deleted file mode 100644 index 3975a98d6..000000000 --- a/libX11/libX11.nm +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libX11 -version = 1.5.0 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = System/Libraries -url = http://www.x.org/ -license = MIT -summary = X11 protocol client library. - -description - Client library for X.org X11 protocol. -end - -source_dl = ftp://ftp.x.org/pub/individual/lib/ -sources = %{thisapp}.tar.bz2 - -build - requires - libxcb-devel - pkg-config - xorg-x11-proto-devel - xorg-x11-xtrans-devel - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXau/libXau.nm b/libXau/libXau.nm deleted file mode 100644 index b23f5eb6d..000000000 --- a/libXau/libXau.nm +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXau -version = 1.0.7 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://xcb.freedesktop.org/ -license = MIT -summary = Sample Authorization Protocol for X. - -description - This is a very simple mechanism for providing individual access - to an X Window System display.It uses existing core protocol and - library hooks for specifying authorization data in the connection - setup block to restrict use of the display to only those clients - that show that they know a server-specific key called a - magic cookie. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - pkg-config - xorg-x11-proto-devel - end - - configure_options +=\ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXau/patches/xau-1.0.4-local.patch b/libXau/patches/xau-1.0.4-local.patch deleted file mode 100644 index 26b578bab..000000000 --- a/libXau/patches/xau-1.0.4-local.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/AuGetBest.c b/AuGetBest.c -index ae2b748..5d92dad 100644 ---- a/AuGetBest.c -+++ b/AuGetBest.c -@@ -120,7 +120,8 @@ XauGetBestAuthByAddr ( - * Match when: - * either family or entry->family are FamilyWild or - * family and entry->family are the same and -- * address and entry->address are the same -+ * address and entry->address are the same or -+ * family is FamilyLocal - * and - * either number or entry->number are empty or - * number and entry->number are the same -@@ -139,6 +140,7 @@ XauGetBestAuthByAddr ( - binaryEqual (entry->address, fully_qual_address, - (int) fully_qual_address_length)) - #endif -+ || (family == FamilyLocal) - ))) && - (number_length == 0 || entry->number_length == 0 || - (number_length == entry->number_length && diff --git a/libXaw/libXaw.nm b/libXaw/libXaw.nm deleted file mode 100644 index 7dd6b4e55..000000000 --- a/libXaw/libXaw.nm +++ /dev/null @@ -1,49 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXaw -version = 1.0.11 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X Athena Widget Set. - -description - Xaw is a widget set based on the X Toolkit Intrinsics (Xt) Library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libICE-devel - libSM-devel - libX11-devel - libXt-devel - libXmu-devel - libXpm-devel - libXext-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXcomposite/libXcomposite.nm b/libXcomposite/libXcomposite.nm deleted file mode 100644 index ad9734f6d..000000000 --- a/libXcomposite/libXcomposite.nm +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXcomposite -version = 0.4.4 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X Composite extension library. - -description - X.Org X11 libXcomposite runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXfixes-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXcursor/index.theme b/libXcursor/index.theme deleted file mode 100644 index cda0b19ae..000000000 --- a/libXcursor/index.theme +++ /dev/null @@ -1,2 +0,0 @@ -[Icon Theme] -Inherits=Adwaita diff --git a/libXcursor/libXcursor.nm b/libXcursor/libXcursor.nm deleted file mode 100644 index 7c4608627..000000000 --- a/libXcursor/libXcursor.nm +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXcursor -version = 1.1.13 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = Cursor management library. - -description - This is a simple library designed to help locate and load cursors. - Cursors can be loaded from files or memory. A library of common cursors - exists which map to the standard X cursor names.Cursors can exist in - several sizes and the library automatically picks the best size. -end - -source_dl = ftp://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXfixes-devel - libXrender-devel >= 0.8.2 - xorg-x11-proto-devel - xorg-x11-util-macros - end - - configure_options += \ - --disable-static - - install_cmds - # Install index.theme. - mkdir -pv %{BUILDROOT}%{datadir}/icons/default - install -m 644 -p %{DIR_SOURCE}/index.theme \ - %{BUILDROOT}%{datadir}/icons/default/index.theme - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXdamage/libXdamage.nm b/libXdamage/libXdamage.nm deleted file mode 100644 index 279b4b3e5..000000000 --- a/libXdamage/libXdamage.nm +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXdamage -version = 1.1.4 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X Damage extension library. - -description - X.Org X11 libXdamage runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXfixes-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXdmcp/libXdmcp.nm b/libXdmcp/libXdmcp.nm deleted file mode 100644 index f72ce5525..000000000 --- a/libXdmcp/libXdmcp.nm +++ /dev/null @@ -1,42 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXdmcp -version = 1.1.1 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X Display Manager Control Protocol library. - -description - X Display Manager Control Protocol library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXext/libXext.nm b/libXext/libXext.nm deleted file mode 100644 index 7109119a0..000000000 --- a/libXext/libXext.nm +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXext -version = 1.3.1 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXext runtime library. - -description - X.Org X11 libXext development package. -end - -source_dl = ftp://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXau-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXfixes/libXfixes.nm b/libXfixes/libXfixes.nm deleted file mode 100644 index 565807e9d..000000000 --- a/libXfixes/libXfixes.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXfixes -version = 5.0 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X Fixes library. - -description - X Fixes library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXfont/libXfont.nm b/libXfont/libXfont.nm deleted file mode 100644 index 55de1ee5c..000000000 --- a/libXfont/libXfont.nm +++ /dev/null @@ -1,46 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXfont -version = 1.4.5 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXfont runtime library. - -description - X.Org X11 libXfont development package. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - freetype-devel - libfontenc-devel - pkg-config - xorg-x11-proto-devel - xorg-x11-xtrans-devel - zlib-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXft/libXft.nm b/libXft/libXft.nm deleted file mode 100644 index bf726f435..000000000 --- a/libXft/libXft.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXft -version = 2.3.1 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXft runtime library. - -description - X.Org X11 libXft runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - fontconfig-devel - freetype-devel - libXrender-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXi/libXi.nm b/libXi/libXi.nm deleted file mode 100644 index 444e2c2ee..000000000 --- a/libXi/libXi.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXi -version = 1.6.2 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://xcb.freedesktop.org/ -license = MIT -summary = X.Org X11 libXi runtime library. - -description - X.Org X11 libXi runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXext-devel - pkg-config - xorg-x11-proto-devel - xorg-x11-util-macros - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXinerama/libXinerama.nm b/libXinerama/libXinerama.nm deleted file mode 100644 index c1afbbc9c..000000000 --- a/libXinerama/libXinerama.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXinerama -version = 1.1.2 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXinerama runtime library - -description - X.Org X11 libXinerama runtime library -end - -source_dl = ftp://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXext-devel - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXmu/libXmu.nm b/libXmu/libXmu.nm deleted file mode 100644 index 5b526350a..000000000 --- a/libXmu/libXmu.nm +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXmu -version = 1.1.1 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXmu/libXmuu runtime libraries. - -description - X.Org X11 libXmu/libXmuu runtime libraries. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libICE-devel - libSM-devel - libX11-devel - libXext-devel - libXt-devel - pkg-config - xorg-x11-util-macros - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXpm/libXpm.nm b/libXpm/libXpm.nm deleted file mode 100644 index 217320f10..000000000 --- a/libXpm/libXpm.nm +++ /dev/null @@ -1,51 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXpm -version = 3.5.10 -release = 2 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXpm runtime library. - -description - X.Org X11 libXpm runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - gettext - libICE-devel - libSM-devel - libX11-devel - libXau-devel - libXext-devel - libXt-devel - pkg-config - xorg-x11-proto-devel - xorg-x11-util-macros - end - - configure_options += \ - --disable-selective-werror \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXrandr/libXrandr.nm b/libXrandr/libXrandr.nm deleted file mode 100644 index 2522d905a..000000000 --- a/libXrandr/libXrandr.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXrandr -version = 1.4.0 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X11 libXrandr runtime library. - -description - X.Org X11 libXrandr runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXext-devel - libXrender-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXrender/libXrender.nm b/libXrender/libXrender.nm deleted file mode 100644 index c9ee5b430..000000000 --- a/libXrender/libXrender.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXrender -version = 0.9.6 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X11 libXrender runtime library. - -description - X.Org X11 libXrender runtime library. -end - -source_dl = -sources = %{thisapp}.tar.bz2 - -build - requires - libX11-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXres/libXres.nm b/libXres/libXres.nm deleted file mode 100644 index d84d1eece..000000000 --- a/libXres/libXres.nm +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXres -version = 1.0.6 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X-Resource extension client library. - -description - X-Resource is an extension that allows a client to query - the X server about its usage of various resources. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXext-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static - - make_install_targets += INSTALL="install -p" -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXt/libXt.nm b/libXt/libXt.nm deleted file mode 100644 index 949146521..000000000 --- a/libXt/libXt.nm +++ /dev/null @@ -1,47 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXt -version = 1.1.3 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXt runtime library. - -description - X.Org X11 libXt runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libICE-devel - libSM-devel - libX11-devel - pkg-config - xorg-x11-proto-devel - end - - CFLAGS += -fno-strict-aliasing - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXtst/libXtst.nm b/libXtst/libXtst.nm deleted file mode 100644 index d249ee853..000000000 --- a/libXtst/libXtst.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXtst -version = 1.2.1 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXtst runtime library. - -description - X.Org X11 libXtst development package. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXext-devel - libXi-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXv/libXv.nm b/libXv/libXv.nm deleted file mode 100644 index 011aed039..000000000 --- a/libXv/libXv.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXv -version = 1.0.7 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXv runtime library. - - -description - X.Org X11 libXv runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXext-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXvMC/libXvMC.nm b/libXvMC/libXvMC.nm deleted file mode 100644 index fb3bae7fd..000000000 --- a/libXvMC/libXvMC.nm +++ /dev/null @@ -1,45 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXvMC -version = 1.0.7 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXvMC runtime library. - -description - X.Org X11 libXvMC runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXext-devel - libXv-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libXxf86vm/libXxf86vm.nm b/libXxf86vm/libXxf86vm.nm deleted file mode 100644 index cbfdb62cb..000000000 --- a/libXxf86vm/libXxf86vm.nm +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libXxf86vm -version = 1.1.2 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libXxf86vm runtime library. - -description - X.Org X11 libXxf86vm runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - libXext-devel - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libfontenc/libfontenc.nm b/libfontenc/libfontenc.nm deleted file mode 100644 index 25577a0a1..000000000 --- a/libfontenc/libfontenc.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libfontenc -version = 1.1.3 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 libfontenc runtime library. - -description - X.Org X11 libfontenc runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - pkg-config - xorg-x11-proto-devel - zlib-devel - end - - configure_options += \ - --disable-static -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libxcb/libxcb.nm b/libxcb/libxcb.nm deleted file mode 100644 index c136327a9..000000000 --- a/libxcb/libxcb.nm +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libxcb -version = 1.9 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://xcb.freedesktop.org/ -license = MIT -summary = A C binding to the X11 protocol. - -description - The X protocol C-language Binding (XCB) is a replacement for Xlib - featuring a small footprint, latency hiding, direct access to the - protocol, improved threading support, and extensibility. -end - -source_dl = http://xcb.freedesktop.org/dist/ - -build - requires - autoconf - automake - libtool - libXau-devel - libxslt-devel - pkg-config - python-devel - xcb-proto >= 1.7 - xorg-x11-proto-devel - end - - configure_options += \ - --disable-static - - prepare_cmds - sed -e "s/pthread-stubs//g" -i configure.ac - autoreconf -f --install - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - - requires = libXau-devel - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/libxkbfile/libxkbfile.nm b/libxkbfile/libxkbfile.nm deleted file mode 100644 index 61c7119ee..000000000 --- a/libxkbfile/libxkbfile.nm +++ /dev/null @@ -1,40 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = libxkbfile -version = 1.0.8 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org -license = MIT -summary = X.Org X11 libxkbfile runtime library. - -description - X.Org X11 libxkbfile runtime library. -end - -source_dl = http://ftp.x.org/pub/individual/lib/ - -build - requires - libX11-devel - pkg-config - xorg-x11-proto-devel - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/makedepend/makedepend.nm b/makedepend/makedepend.nm deleted file mode 100644 index 7eca2cbbd..000000000 --- a/makedepend/makedepend.nm +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = makedepend -version = 1.0.4 -release = 1 - -groups = Development/Tools -url = http://www.x.org -license = MIT -summary = makedepend - create dependencies in makefiles. - -description - Makedepend automatically creates dependencies in makefiles. -end - -source_dl = ftp://ftp.x.org/pub/individual/util/ - -build - requires - pkg-config - xorg-x11-util-macros - xorg-x11-proto-devel - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/mesa/mesa.nm b/mesa/mesa.nm deleted file mode 100644 index 692cc51df..000000000 --- a/mesa/mesa.nm +++ /dev/null @@ -1,149 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = mesa -version = 9.0.2 -release = 4 - -groups = Development/Tools -url = http://www.mesa3d.org -license = MIT -summary = Mesa graphics libraries. - -description - Mesa libGL runtime libraries and DRI drivers. -end - -source_dl = ftp://ftp.freedesktop.org/pub/mesa/%{version}/ -sources = MesaLib-%{version}.tar.bz2 - -build - requires - autoconf - automake - bison - expat-devel - flex - gcc-c++ - pkg-config - libX11-devel - libXdamage-devel - libXext-devel - libXfixes-devel - libXxf86vm-devel - libdrm-devel >= 2.4.40 - libselinux-devel - libtool - libxcb-devel - libxml2-devel - makedepend - xorg-x11-proto-devel - end - - DIR_APP = %{DIR_SRC}/Mesa-%{version} - - if "%{DISTRO_PLATFORM}" == "x86" - platform_drivers = nouveau,radeon,i915,i965 - end - - configure_options += \ - --enable-pic \ - --enable-selinux \ - --enable-pic \ - --enable-dri \ - --enable-egl \ - --with-dri-drivers="%{platform_drivers}" \ - --with-gallium-drivers=swrast \ - --disable-asm \ - --disable-gallium-llvm \ - --disable-gallium-egl \ - --disable-static \ - --without-demos - - prepare_cmds - # Defaults to dri (not xlib) for libGL on all arches. - sed -i 's/^default_driver.*$/default_driver="dri"/' configure.ac - - # Regenerate build system. - autoreconf -vfi - end -end - -packages - package dri-drivers - summary = Mesa-based DRI drivers. - description - This package contains the Mesa-based DRI drivers. - end - - obsoletes - mesa <= 7.11.2-2 - end - - files - %{sysconfdir}/drirc - %{libdir}/libdri*.so.* - %{libdir}/dri/* - end - end - - package libEGL - summary = Mesa libEGL runtime library. - description - This package contains the Mesa libEGL runtime libraries. - end - - files - %{libdir}/libEGL.so.* - end - end - - package libGL - summary = Mesa libGL runtime library. - description - This package contains the Mesa libGL runtime libraries. - end - - obsoletes - mesa <= 7.11.2-2 - end - - files - %{libdir}/libGL.so.* - end - end - - package libglapi - summary = Mesa shared glapi. - description - This package contains the shared glapi of Mesa. - end - - obsoletes - mesa <= 7.11.2-2 - end - - files - %{libdir}/libglapi.so.* - end - end - - package %{name}-devel - template DEVEL - - provides - libEGL-devel = %{thisver} - libGL-devel = %{thisver} - end - - requires - libX11-devel - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/pango/pango.nm b/pango/pango.nm index ac79ceb71..dc14b5564 100644 --- a/pango/pango.nm +++ b/pango/pango.nm @@ -7,7 +7,7 @@ name = pango version = %{ver_major}.%{ver_minor} ver_major = 1.40 ver_minor = 3 -release = 1 +release = 2
groups = System/Libraries url = http://www.pango.org/ @@ -31,7 +31,6 @@ build glib2-devel gobject-introspection-devel harfbuzz-devel >= 0.9.9 - libXft-devel perl pkg-config end diff --git a/perl-Tk/patches/perl-Tk-debian.patch b/perl-Tk/patches/perl-Tk-debian.patch deleted file mode 100644 index 6b945b4b1..000000000 --- a/perl-Tk/patches/perl-Tk-debian.patch +++ /dev/null @@ -1,71 +0,0 @@ ---- perl-tk-804.027.orig/objGlue.c -+++ perl-tk-804.027/objGlue.c -@@ -529,6 +529,10 @@ - sv_utf8_upgrade(objPtr); - #endif - s = SvPV(objPtr, len); -+ if (!s) -+ { -+ return NULL; -+ } - #ifdef SvUTF8 - if (!is_utf8_string(s,len)) - { -@@ -555,6 +559,10 @@ - else - { - s = LangString(objPtr); -+ if (!s) -+ { -+ return NULL; -+ } - #ifdef SvUTF8 - if (!is_utf8_string(s,strlen(s))) - { ---- perl-tk-804.027.orig/pTk/mTk/generic/tkFont.c -+++ perl-tk-804.027/pTk/mTk/generic/tkFont.c -@@ -1044,6 +1044,7 @@ - TkFont *fontPtr, *firstFontPtr, *oldFontPtr; - int new, descent; - NamedFont *nfPtr; -+ char *fontString; - - fiPtr = ((TkWindow *) tkwin)->mainPtr->fontInfoPtr; - if (objPtr->typePtr != &tkFontObjType) { -@@ -1077,8 +1078,12 @@ - cacheHashPtr = oldFontPtr->cacheHashPtr; - FreeFontObjProc(objPtr); - } else { -+ fontString = Tcl_GetString(objPtr); -+ if (fontString == NULL) { -+ fontString = ""; -+ } - cacheHashPtr = Tcl_CreateHashEntry(&fiPtr->fontCache, -- Tcl_GetString(objPtr), &new); -+ fontString, &new); - } - firstFontPtr = (TkFont *) Tcl_GetHashValue(cacheHashPtr); - for (fontPtr = firstFontPtr; (fontPtr != NULL); -@@ -1095,8 +1100,12 @@ - * The desired font isn't in the table. Make a new one. - */ - -+ fontString = Tcl_GetString(objPtr); -+ if (fontString == NULL) { -+ fontString = ""; -+ } - namedHashPtr = Tcl_FindHashEntry(&fiPtr->namedTable, -- Tcl_GetString(objPtr)); -+ fontString); - if (namedHashPtr != NULL) { - /* - * Construct a font based on a named font. -@@ -1111,7 +1120,7 @@ - * Native font? - */ - -- fontPtr = TkpGetNativeFont(tkwin, Tcl_GetString(objPtr)); -+ fontPtr = TkpGetNativeFont(tkwin, fontString); - if (fontPtr == NULL) { - TkFontAttributes fa; - Tcl_Obj *dupObjPtr = Tcl_DuplicateObj(objPtr); diff --git a/perl-Tk/patches/perl-Tk-seg.patch b/perl-Tk/patches/perl-Tk-seg.patch deleted file mode 100644 index 26201fa3a..000000000 --- a/perl-Tk/patches/perl-Tk-seg.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up Tk-804.028/pTk/mTk/generic/tkConfig.c.seg Tk-804.028/pTk/mTk/generic/tkConfig.c ---- Tk-804.028/pTk/mTk/generic/tkConfig.c.seg 2008-03-11 23:29:39.000000000 -0400 -+++ Tk-804.028/pTk/mTk/generic/tkConfig.c 2008-03-11 23:28:09.000000000 -0400 -@@ -1210,11 +1210,11 @@ GetOptionFromObj(interp, objPtr, tablePt - * First, check to see if the object already has the answer cached. - */ - -- if (objPtr->typePtr == &tkOptionObjType) { -+/* if (objPtr->typePtr == &tkOptionObjType) { - if (objPtr->internalRep.twoPtrValue.ptr1 == (VOID *) tablePtr) { - return (Option *) objPtr->internalRep.twoPtrValue.ptr2; - } -- } -+ }*/ - - /* - * The answer isn't cached. -@@ -2277,9 +2277,15 @@ Tk_GetOptionValue(interp, recordPtr, opt - if (optionPtr == NULL) { - return NULL; - } -+ -+ if (optionPtr->specPtr == NULL) { -+ return NULL; -+ } -+ - if (optionPtr->specPtr->type == TK_OPTION_SYNONYM) { - optionPtr = optionPtr->extra.synonymPtr; - } -+ - if (optionPtr->specPtr->objOffset >= 0) { - resultPtr = *((Tcl_Obj **) (recordPtr + optionPtr->specPtr->objOffset)); - if (resultPtr == NULL) { diff --git a/perl-Tk/patches/perl-Tk-widget.patch0 b/perl-Tk/patches/perl-Tk-widget.patch0 deleted file mode 100644 index ec446586d..000000000 --- a/perl-Tk/patches/perl-Tk-widget.patch0 +++ /dev/null @@ -1,26 +0,0 @@ ---- demos/widget.orig 2008-01-02 13:24:14.000000000 +0100 -+++ demos/widget 2008-01-02 13:27:10.000000000 +0100 -@@ -3,7 +3,8 @@ - use 5.008; - use Config; - use Tk 804.000; --use lib Tk->findINC( 'demos/widget_lib' ); -+#use lib Tk->findINC( 'demos/widget_lib' ); -+use lib "@demopath@/widget_lib"; - use Tk::widgets qw/ DialogBox ErrorDialog LabEntry ROText /; - use Tk::Config (); - use WidgetDemo; -@@ -62,9 +63,11 @@ - $l->destroy; - } - --my $widget_lib = Tk->findINC('demos/widget_lib'); -+#my $widget_lib = Tk->findINC('demos/widget_lib'); -+my $widget_lib = "@demopath@/widget_lib"; - my $wd = "$widget_lib/WidgetDemo.pm"; --$WIDTRIB = Tk->findINC('demos/widtrib'); -+#$WIDTRIB = Tk->findINC('demos/widtrib'); -+$WIDTRIB = "@demopath@/widtrib"; - unless (Tk::tainting) { - $WIDTRIB = $ENV{WIDTRIB} if defined $ENV{WIDTRIB}; - $WIDTRIB = $ARGV[0] if defined $ARGV[0]; diff --git a/perl-Tk/perl-Tk.nm b/perl-Tk/perl-Tk.nm deleted file mode 100644 index 665335df2..000000000 --- a/perl-Tk/perl-Tk.nm +++ /dev/null @@ -1,74 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = perl-Tk -version = 804.033 -release = 1.1 -thisapp = Tk-%{version} - -groups = Development/Libraries -url = http://search.cpan.org/dist/Tk/ -license = GPL+ or Artistic -summary = Perl Graphical User Interface ToolKit. - -description - This a re-port of a perl interface to Tk8.4. - C code is derived from Tcl/Tk8.4.5. - It also includes all the C code parts of Tix8.1.4 from SourceForge. - The perl code corresponding to Tix's Tcl code is not fully implemented. - - Perl API is essentially the same as Tk800 series Tk800.025 but has not - been verified as compliant. There ARE differences see pod/804delta.pod. -end - -source_dl = http://cpan.org/modules/by-module/Tk/ - -build - requires - perl(ExtUtils::ParseXS) - perl(ExtUtils::MakeMaker) - perl-devel - libjpeg-devel - libpng-devel - libX11-devel - libXft-devel - pakfire >= 0.9.26-3.1 - end - - build - perl Makefile.PL INSTALLDIRS=vendor X11LIB=%{libdir} XFT=1 - make %{PARALLELISMFLAGS} - end - - install - make pure_install PERL_INSTALL_ROOT=%{BUILDROOT} - - # Remove interpreter in /usr/local... - sed -e "s@#!.*@#!/usr/bin/perl -w@g" \ - -i %{BUILDROOT}%{libdir}/perl5/vendor_perl/Tk/pTk/{Tcl-pTk,mkVFunc} - end -end - -packages - package %{name} - provides - perl(Tk::LabRadio) = 4.004 - perl(Tk::TextReindex) - perl(Tk) = %{version} - end - - requires - perl(:MODULE_COMPAT_%{perl_version}) - end - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/qemu/qemu.nm b/qemu/qemu.nm index c80c70d44..e16afe021 100644 --- a/qemu/qemu.nm +++ b/qemu/qemu.nm @@ -5,7 +5,7 @@
name = qemu version = 3.1.0 -release = 1 +release = 2
groups = Applications/Virtualization url = http://www.qemu.org @@ -23,7 +23,6 @@ sources = %{thisapp}.tar.xz
build requires - SDL-devel autoconf automake bison @@ -78,7 +77,8 @@ build --enable-vnc \ --enable-vnc-jpeg \ --enable-vnc-png \ - --disable-xen + --disable-xen \ + --disable-sdl
configure_cmds sed -e "s@-Wl,-rpath,%{libdir}@@g" -i config-host.mak diff --git a/xcb-proto/xcb-proto.nm b/xcb-proto/xcb-proto.nm deleted file mode 100644 index bddbaa098..000000000 --- a/xcb-proto/xcb-proto.nm +++ /dev/null @@ -1,39 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xcb-proto -version = 1.11 -release = 1 -arch = noarch - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Headers -url = http://xcb.freedesktop.org/ -license = MIT -summary = XCB protocol descriptions. - -description - XCB is a project to enable efficient language bindings to the X11 - protocol. This package contains the protocol descriptions themselves. - Language bindings use these protocol descriptions to generate code for marshalling the protocol. -end - -source_dl = http://xcb.freedesktop.org/dist/ - -build - requires - pkg-config - python-devel - end - - # Place the .pc files in /usr/share so they - # can be found on all architectures where libdir != /usr/lib. - configure_options += \ - --libdir=%{datadir} -end - -packages - package %{name} -end diff --git a/xcb-util/xcb-util.nm b/xcb-util/xcb-util.nm deleted file mode 100644 index 627ae35be..000000000 --- a/xcb-util/xcb-util.nm +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xcb-util -version = 0.3.6 -release = 2 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://xcb.freedesktop.org/ -license = MIT -summary = Convenience libraries sitting on top of libxcb. - -description - The xcb-util module provides a number of libraries which sit on top of \ - libxcb, the core X protocol library, and some of the extension \ - libraries. These experimental libraries provide convenience functions \ - and interfaces which make the raw X protocol more usable. -end - -source_dl = http://xcb.freedesktop.org/dist/ -sources = %{thisapp}.tar.bz2 - -build - requires - gperf - libxcb-devel - m4 - pkg-config - xorg-x11-proto-devel - end - - configure_options += \ - --with-pic \ - --disable-static - - test - export LD_LIBRARY_PATH=%{DIR_APP}/aux/.libs:%{DIR_APP}/image/.libs - make check - end -end - -packages - package %{name} - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xclock/xclock.nm b/xclock/xclock.nm deleted file mode 100644 index e4a710424..000000000 --- a/xclock/xclock.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xclock -version = 1.0.6 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Tools -url = http://www.x.org -license = MIT -summary = A classic X Window System clock utility. - -description - xclock is the classic X Window System clock utility. It displays - the time in analog or digital form, continuously updated at a - frequency which may be specified by the user. -end - -source_dl = http://ftp.x.org/pub/individual/app/ -sources = %{thisapp}.tar.bz2 - -build - requires - libX11-devel - libXaw-devel - libXft-devel - libXmu-devel - libXrender-devel - libxkbfile-devel - xorg-x11-util-macros - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xkeyboard-config/xkeyboard-config.nm b/xkeyboard-config/xkeyboard-config.nm deleted file mode 100644 index 504b7e8f7..000000000 --- a/xkeyboard-config/xkeyboard-config.nm +++ /dev/null @@ -1,48 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xkeyboard-config -version = 1.9 -release = 1 -arch = noarch - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Utils -url = http://www.x.org/ -license = MIT -summary = X Keyboard Extension configuration data. - -description - This package contains configuration data used by the X Keyboard - Extension (XKB), which allows selection of keyboard layouts when - using a graphical interface. -end - -source_dl = http://ftp.x.org/pub/individual/data/ -sources = %{thisapp}.tar.bz2 - -build - requires - gettext - intltool - pkg-config - perl-XML-Parser - xorg-x11-util-macros - xorg-x11-xkb-utils - end - - configure_options += \ - --disable-static \ - --with-xkb-base=/usr/share/X11/xkb \ - --disable-xkbcomp-symlink \ - --with-xkb-rules-symlink=xorg - - make_install_targets += INSTALL="install -p" -end - -packages - package %{name} - end -end diff --git a/xorg-x11-drv-ati/xorg-x11-drv-ati.nm b/xorg-x11-drv-ati/xorg-x11-drv-ati.nm deleted file mode 100644 index dec826189..000000000 --- a/xorg-x11-drv-ati/xorg-x11-drv-ati.nm +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-drv-ati -version = 7.1.0 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Driver -url = http://www.x.org/ -license = MIT -summary = Xorg X11 ati video driver. - -description - X.Org X11 ati video driver. -end - -# Specify the X Server version to build for. -x11_server_ver = 1.13.2 - -thisapp = xf86-video-ati-%{version} - -source_dl = http://ftp.x.org/pub/individual/driver/ - -build - requires - libdrm-devel - libpciaccess-devel - libX11-devel - mesa-devel >= 9.0.2 - pkg-config - xorg-x11-proto-devel - xorg-x11-server-devel >= %{x11_server_ver} - xorg-x11-util-macros - end - - CFLAGS += -Wl,-z,lazy - - configure_options += \ - --enable-dri \ - --disable-static -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - requires - dri-drivers >= 9.0.2 - xorg-x11-server >= %{x11_server_ver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm b/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm deleted file mode 100644 index a4da9c286..000000000 --- a/xorg-x11-drv-evdev/xorg-x11-drv-evdev.nm +++ /dev/null @@ -1,61 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-drv-evdev -version = 2.7.3 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Driver -url = http://www.x.org/ -license = MIT -summary = Xorg X11 evdev input driver. - -description - X.Org X11 evdev input driver. -end - -# Specify the X Server version to build for. -x11_server_ver = 1.13.2 - -thisapp = xf86-input-evdev-%{version} - -source_dl = http://ftp.x.org/pub/individual/driver/ - -build - requires - libudev-devel - libxkbfile-devel - pkg-config - xorg-x11-proto-devel - xorg-x11-server-devel >= %{x11_server_ver} - xorg-x11-util-macros - end - - CFLAGS += -Wl,-z,lazy - - configure_options += \ - --disable-static -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - requires - xorg-x11-server >= %{x11_server_ver} - end - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-drv-intel/intel.xinf b/xorg-x11-drv-intel/intel.xinf deleted file mode 100644 index 5867523c5..000000000 --- a/xorg-x11-drv-intel/intel.xinf +++ /dev/null @@ -1,28 +0,0 @@ -alias pcivideo:v00008086d00001132sv*sd*bc*sc*i* intel # i815 -alias pcivideo:v00008086d00002562sv*sd*bc*sc*i* intel # 845G -alias pcivideo:v00008086d00002572sv*sd*bc*sc*i* intel # 865G -alias pcivideo:v00008086d00002582sv*sd*bc*sc*i* intel # 915G -alias pcivideo:v00008086d0000258Asv*sd*bc*sc*i* intel # E7221G ("915G") -alias pcivideo:v00008086d00002592sv*sd*bc*sc*i* intel # 915GM -alias pcivideo:v00008086d00002772sv*sd*bc*sc*i* intel # 945G -alias pcivideo:v00008086d000027A2sv*sd*bc*sc*i* intel # 945GM -alias pcivideo:v00008086d000027AEsv*sd*bc*sc*i* intel # 945GME -alias pcivideo:v00008086d00002972sv*sd*bc*sc*i* intel # 946GZ, really a 965 -alias pcivideo:v00008086d00002982sv*sd*bc*sc*i* intel # 965G1 -alias pcivideo:v00008086d00002992sv*sd*bc*sc*i* intel # 965Q -alias pcivideo:v00008086d000029A2sv*sd*bc*sc*i* intel # 965G -alias pcivideo:v00008086d000029B2sv*sd*bc*sc*i* intel # Q35 -alias pcivideo:v00008086d000029C2sv*sd*bc*sc*i* intel # G33 -alias pcivideo:v00008086d000029D2sv*sd*bc*sc*i* intel # Q33 -alias pcivideo:v00008086d00002A02sv*sd*bc*sc*i* intel # 965GM -alias pcivideo:v00008086d00002A12sv*sd*bc*sc*i* intel # 965GME -alias pcivideo:v00008086d00002A42sv*sd*bc*sc*i* intel # GM45 -alias pcivideo:v00008086d00002e02sv*sd*bc*sc*i* intel # IGD_E_G -alias pcivideo:v00008086d00002e12sv*sd*bc*sc*i* intel # Q45 -alias pcivideo:v00008086d00002e22sv*sd*bc*sc*i* intel # G45 -alias pcivideo:v00008086d00002e32sv*sd*bc*sc*i* intel # G41 -alias pcivideo:v00008086d00003577sv*sd*bc*sc*i* intel # i830 -alias pcivideo:v00008086d00003582sv*sd*bc*sc*i* intel # 855GM -alias pcivideo:v00008086d00007121sv*sd*bc*sc*i* intel # i810 -alias pcivideo:v00008086d00007123sv*sd*bc*sc*i* intel # i810 DC100 -alias pcivideo:v00008086d00007125sv*sd*bc*sc*i* intel # i810E diff --git a/xorg-x11-drv-intel/xorg-x11-drv-intel.nm b/xorg-x11-drv-intel/xorg-x11-drv-intel.nm deleted file mode 100644 index f037878d4..000000000 --- a/xorg-x11-drv-intel/xorg-x11-drv-intel.nm +++ /dev/null @@ -1,77 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-drv-intel -version = 2.21.0 -release = 2 -sup_arches = x86_64 i686 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Driver -url = http://www.x.org/ -license = MIT -summary = Xorg X11 intel video driver. - -description - X.Org X11 intel video driver. -end - -# Specify the X Server version to build for. -x11_server_ver = 1.13.2 - -thisapp = xf86-video-intel-%{version} - -source_dl = http://ftp.x.org/pub/individual/driver/ - -build - requires - autoconf - automake - libdrm-devel - libudev-devel - libX11-devel - libXvMC-devel - libxcb-devel - libtool - mesa-devel >= 9.0.2 - pkg-config - xcb-util-devel - xorg-x11-proto-devel - xorg-x11-server-devel >= %{x11_server_ver} - xorg-x11-util-macros - end - - CFLAGS += -Wl,-z,lazy - - configure_options += \ - --enable-dri \ - --enable-xvmc \ - --disable-static - - prepare_cmds - autoreconf -vi - end - - install_cmds - install -Dm 0644 %{DIR_SOURCE}/intel.xinf %{BUILDROOT}/usr/share/hwdata/videoaliases/intel.xinf - end -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - requires - dri-drivers >= 9.0.2 - xorg-x11-server >= %{x11_server_ver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm deleted file mode 100644 index 091383dd5..000000000 --- a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-drv-keyboard -version = 1.6.2 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Driver -url = http://www.x.org/ -license = MIT -summary = Xorg X11 keyboard input driver. - -description - X.Org X11 keyboard input driver. -end - -# Specify the X Server version to build for. -x11_server_ver = 1.13.2 - -thisapp = xf86-input-keyboard-%{version} - -source_dl = http://ftp.x.org/pub/individual/driver/ - -build - requires - pkg-config - xorg-x11-server-devel >= %{x11_server_ver} - xorg-x11-proto-devel - xorg-x11-util-macros - end - - CFLAGS += -Wl,-z,lazy - - configure_options += \ - --disable-static -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - requires - xorg-x11-server >= %{x11_server_ver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm b/xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm deleted file mode 100644 index 8ce3bdde7..000000000 --- a/xorg-x11-drv-modesetting/xorg-x11-drv-modesetting.nm +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-drv-modesetting -version = 0.6.0 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Driver -url = http://www.x.org/ -license = MIT -summary = Xorg X11 modesetting video driver. - -description - X.Org X11 modesetting video driver. -end - -# Specify the X Server version to build for. -x11_server_ver = 1.13.2 - -thisapp = xf86-video-modesetting-%{version} - -source_dl = http://ftp.x.org/pub/individual/driver/ - -build - requires - libX11-devel - libdrm-devel - libudev-devel - pkg-config - xorg-x11-proto-devel - xorg-x11-server-devel >= %{x11_server_ver} - xorg-x11-util-macros - end - - CFLAGS += -Wl,-z,lazy - - configure_options += \ - --disable-static -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - requires - xorg-x11-server >= %{x11_server_ver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm b/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm deleted file mode 100644 index 38d9d5a13..000000000 --- a/xorg-x11-drv-mouse/xorg-x11-drv-mouse.nm +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-drv-mouse -version = 1.8.1 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Driver -url = http://www.x.org/ -license = MIT -summary = Xorg X11 mouse input driver. - -description - X.Org X11 mouse input driver. -end - -# Specify the X Server version to build for. -x11_server_ver = 1.13.2 - -thisapp = xf86-input-mouse-%{version} - -source_dl = http://ftp.x.org/pub/individual/driver/ - -build - requires - pkg-config - xorg-x11-proto-devel - xorg-x11-server-devel >= %{x11_server_ver} - xorg-x11-util-macros - end - - CFLAGS += -Wl,-z,lazy - - configure_options += \ - --disable-static -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - requires - xorg-x11-server >= %{x11_server_ver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm b/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm deleted file mode 100644 index 0a8c01a73..000000000 --- a/xorg-x11-drv-nouveau/xorg-x11-drv-nouveau.nm +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-drv-nouveau -version = 1.0.6 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Driver -url = http://www.x.org/ -license = MIT -summary = Xorg X11 nouveau video driver. - -description - X.Org X11 nv video driver. -end - -# Specify the X Server version to build for. -x11_server_ver = 1.13.2 - -thisapp = xf86-video-nouveau-%{version} - -source_dl = http://ftp.x.org/pub/individual/driver/ - -build - requires - libX11-devel - libdrm-devel - libudev-devel - mesa-devel >= 9.0.2 - pkg-config - xorg-x11-proto-devel - xorg-x11-server-devel >= %{x11_server_ver} - xorg-x11-util-macros - end - - CFLAGS += -Wl,-z,lazy - - configure_options += \ - --disable-static -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - obsoletes - xorg-x11-drv-nv - end - - requires - dri-drivers >= 9.0.2 - xorg-x11-server >= %{x11_server_ver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-drv-synaptics/50-synaptics.conf b/xorg-x11-drv-synaptics/50-synaptics.conf deleted file mode 100644 index 54979f0f0..000000000 --- a/xorg-x11-drv-synaptics/50-synaptics.conf +++ /dev/null @@ -1,22 +0,0 @@ -Section "InputClass" - Identifier "touchpad catchall" - Driver "synaptics" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" -EndSection - - -# Quirks for special touchpads - -# Some devices have the buttons as part of the lower edge of the -# touchpad. Pressing a button moves the cursor, causing cursor jumps and -# erroneous clicks. -# Use the synaptics area property to work around this, udev labels these -# devices for us as touchpad_button_overlap. -# Affected: Dell Mini -Section "InputClass" - Identifier "touchpad button overlap" - MatchIsTouchpad "on" - MatchTag "touchpad_button_overlap" - Option "AreaBottomEdge" "4000" -EndSection diff --git a/xorg-x11-drv-synaptics/70-touchpad-quirks.rules b/xorg-x11-drv-synaptics/70-touchpad-quirks.rules deleted file mode 100644 index 6c65c294e..000000000 --- a/xorg-x11-drv-synaptics/70-touchpad-quirks.rules +++ /dev/null @@ -1,15 +0,0 @@ -ACTION!="add|change", GOTO="touchpad_quirks_end" -KERNEL!="event*", GOTO="touchpad_quirks_end" - -ENV{ID_INPUT_TOUCHPAD}!="1", GOTO="touchpad_quirks_end" - -# model specific quirks - -# Dell Minis have a touchpad where the buttons and the touchpad area -# overlap. Clicking a button thus moves the pointer, this requires special -# Xorg configuration. - -ATTR{[dmi/id]product_name}=="Inspiron 1011|Inspiron 1012", \ - ENV{ID_INPUT.tags}="touchpad_button_overlap" - -LABEL="touchpad_quirks_end" diff --git a/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm b/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm deleted file mode 100644 index 87d378fae..000000000 --- a/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics.nm +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-drv-synaptics -version = 1.3.0 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Driver -url = http://www.x.org/ -license = MIT -summary = Xorg X11 synaptics input driver. - -description - This is the Synaptics touchpad driver for the X.Org X server. -end - -source_dl = http://ftp.x.org/pub/individual/driver/ -sources = xf86-input-synaptics-%{version}.tar.bz2 - -build - requires - libX11-devel - libXi-devel - pkg-config - xorg-x11-proto-devel - xorg-x11-server-devel - xorg-x11-util-macros - end - - DIR_APP = %{DIR_SRC}/xf86-input-synaptics-%{version} - - configure_options += \ - --disable-static - - configure_cmds - # Disable BIND_NOW for the X server module - sed -e "s/^CFLAGS.*/& -Wl,-z,lazy/" -i src/Makefile - end - - install_cmds - install -Dm 0664 %{DIR_SOURCE}/50-synaptics.conf %{BUILDROOT}/etc/X11/xorg.conf.d/50-synaptics.conf - install -Dm 0664 %{DIR_SOURCE}/70-touchpad-quirks.rules %{BUILDROOT}/lib/udev/rules.d/70-touchpad-quirks.rules - end -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - end - - package %{name}-devel - template DEVEL - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm b/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm deleted file mode 100644 index 4215f03ee..000000000 --- a/xorg-x11-drv-vesa/xorg-x11-drv-vesa.nm +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-drv-vesa -version = 2.3.2 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Driver -url = http://www.x.org/ -license = MIT -summary = Xorg X11 vesa video driver. - -description - X.Org X11 vesa video driver. -end - -# Specify the X Server version to build for. -x11_server_ver = 1.13.2 - -thisapp = xf86-video-vesa-%{version} - -source_dl = http://ftp.x.org/pub/individual/driver/ - -build - requires - libX11-devel - libpciaccess-devel >= 0.13.1 - pkg-config - xorg-x11-proto-devel - xorg-x11-server-devel >= %{x11_server_ver} - xorg-x11-util-macros - end - - CFLAGS += -Wl,-z,lazy - - configure_options += \ - --disable-static -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - requires - xorg-x11-server >= %{x11_server_ver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm b/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm deleted file mode 100644 index 795f7186c..000000000 --- a/xorg-x11-drv-vmware/xorg-x11-drv-vmware.nm +++ /dev/null @@ -1,58 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-drv-vmware -version = 13.0.0 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Driver -url = http://www.x.org/ -license = MIT -summary = Xorg X11 vmware video driver. - -description - X.Org X11 vmware video driver. -end - -# Specify the X Server version to build for. -x11_server_ver = 1.13.2 - -thisapp = xf86-video-vmware-%{version} - -source_dl = http://ftp.x.org/pub/individual/driver/ - -build - requires - libX11-devel - libdrm-devel - libpciaccess-devel - pkg-config - xorg-x11-proto-devel - xorg-x11-server-devel >= %{x11_server_ver} - xorg-x11-util-macros - end - - CFLAGS += -Wl,-z,lazy - - configure_options += \ - --disable-static -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - requires - xorg-x11-server >= %{x11_server_ver} - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-font-utils/xorg-x11-font-utils.nm b/xorg-x11-font-utils/xorg-x11-font-utils.nm deleted file mode 100644 index 651453102..000000000 --- a/xorg-x11-font-utils/xorg-x11-font-utils.nm +++ /dev/null @@ -1,91 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-font-utils -version = 7.4 -release = 3 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Fonts -url = http://www.x.org/ -license = MIT -summary = X.Org X11 font utilities. - -description - X.Org X11 font utilities required for font installation, conversion, - and generation. -end - -source_dl = http://ftp.x.org/pub/individual/app/ - -sources =\ - bdftopcf-1.0.1.tar.bz2 \ - fonttosfnt-1.0.3.tar.bz2 \ - mkfontdir-1.0.5.tar.bz2 \ - mkfontscale-1.0.7.tar.bz2 \ - font-util-1.1.0.tar.bz2 - -build - requires - autoconf - freetype-devel - libX11-devel - libXfont-devel - libfontenc-devel - pkg-config - xorg-x11-proto-devel - zlib-devel - end - - configure_options += \ - --with-mapdir=/usr/share/X11/fonts/util - - build - for object in %{sources}; do - dir=%{DIR_SRC}/${object%*.tar.bz2} - - if [ -d "${dir}" ]; then - cd ${dir} - autoconf - ./configure %{configure_options} - - make %{PARALLELISMFLAGS} - fi - done - end - - install - for object in %{sources}; do - dir=%{DIR_SRC}/${object%*.tar.bz2} - - if [ -d "${dir}" ]; then - cd ${dir} - - make install DESTDIR=%{BUILDROOT} - fi - done - - # Install xorg-x11-fonts-update-dirs - install -m 0744 %{DIR_SOURCE}/xorg-x11-fonts-update-dirs %{BUILDROOT}/usr/bin/ - sed -i "s:@DATADIR@:/usr/share:" %{BUILDROOT}/usr/bin/xorg-x11-fonts-update-dirs - end -end - -packages - package %{name} - end - - package %{name}-devel - template DEVEL - - requires - freetype-devel - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-font-utils/xorg-x11-fonts-update-dirs b/xorg-x11-font-utils/xorg-x11-fonts-update-dirs deleted file mode 100644 index 536bfe82b..000000000 --- a/xorg-x11-font-utils/xorg-x11-fonts-update-dirs +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh -# This script is used by the xorg-x11-fonts package in the %post stage for -# some fonts to generate the right encodings. - -fontdir="" -encodingsdir="@DATADIR@/X11/fonts/encodings" - -# some fonts need to skip mkfontscale, set to "yes" to skip -skip_fontscale="" -# some fonts need to run ttmkfdir, set to "yes" to run -need_ttmkfdir="" - -if [ $# -lt 1 ]; then - echo "Need at least one parameter for font dir." - exit 1 -fi - -while [ $# != 0 ]; do - case $1 in - --skip-fontscale) - skip_fontscale="yes" - ;; - --need-ttmkfdir) - need_ttmkfdir="yes" - ;; - --encodingsdir) - shift - encodingsdir="$1" - ;; - *) - fontdir="$1" - - if [ $# != 1 ]; then - echo "Too many parameters." - exit 1 - fi - ;; - esac - shift -done - -if [ "$skip_fontscale" != "yes" ]; then - mkfontscale $fontdir -fi -if [ "$need_ttmkfdir" = "yes" ]; then - ttmkfdir $fontdir -fi - -mkfontdir $fontdir -fc-cache $fontdir - -if ! [ -z "$encodingsdir" ]; then - [ -d "$encodingsdir" ] || mkdir -p "$encodingsdir" - oldpwd=$(pwd) - cd "$encodingsdir" - mkfontscale -n -e "$encodingsdir" -e "$encodingsdir/large" - cd ${oldpwd} -fi - - diff --git a/xorg-x11-fonts/xorg-x11-fonts.nm b/xorg-x11-fonts/xorg-x11-fonts.nm deleted file mode 100644 index c19caf737..000000000 --- a/xorg-x11-fonts/xorg-x11-fonts.nm +++ /dev/null @@ -1,405 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-fonts -version = 7.2 -release = 5 -arch = noarch - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Fonts -url = http://www.x.org/ -license = MIT -summary = X.Org X11 fonts. - -description - This package contains misc bitmap Chinese, Japanese, Korean, Indic, and - Arabic fonts for use with X Window System. -end - -source_dl = http://ftp.x.org/pub/individual/font/ -source_dl += http://unifoundry.com/ - -sources = \ - encodings-1.0.3.tar.bz2 \ - font-alias-1.0.2.tar.bz2 \ - font-adobe-100dpi-1.0.1.tar.bz2 \ - font-adobe-75dpi-1.0.1.tar.bz2 \ - font-adobe-utopia-100dpi-1.0.2.tar.bz2 \ - font-adobe-utopia-75dpi-1.0.2.tar.bz2 \ - font-adobe-utopia-type1-1.0.2.tar.bz2 \ - font-arabic-misc-1.0.1.tar.bz2 \ - font-bh-100dpi-1.0.1.tar.bz2 \ - font-bh-75dpi-1.0.1.tar.bz2 \ - font-bh-lucidatypewriter-100dpi-1.0.1.tar.bz2 \ - font-bh-lucidatypewriter-75dpi-1.0.1.tar.bz2 \ - font-bitstream-100dpi-1.0.1.tar.bz2 \ - font-bitstream-75dpi-1.0.1.tar.bz2 \ - font-bitstream-type1-1.0.1.tar.bz2 \ - font-cronyx-cyrillic-1.0.1.tar.bz2 \ - font-cursor-misc-1.0.1.tar.bz2 \ - font-daewoo-misc-1.0.1.tar.bz2 \ - font-dec-misc-1.0.1.tar.bz2 \ - font-isas-misc-1.0.1.tar.bz2 \ - font-jis-misc-1.0.1.tar.bz2 \ - font-micro-misc-1.0.1.tar.bz2 \ - font-misc-cyrillic-1.0.1.tar.bz2 \ - font-misc-misc-1.1.0.tar.bz2 \ - font-mutt-misc-1.0.1.tar.bz2 \ - font-schumacher-misc-1.1.0.tar.bz2 \ - font-screen-cyrillic-1.0.2.tar.bz2 \ - font-sony-misc-1.0.1.tar.bz2 \ - font-sun-misc-1.0.1.tar.bz2 \ - font-winitzki-cyrillic-1.0.1.tar.bz2 \ - font-xfree86-type1-1.0.2.tar.bz2 \ - unifont-5.1.20080820.pcf.gz - -build - requires - /usr/bin/mkfontscale - perl - pkg-config - xorg-x11-font-utils-devel - end - - configure_options += \ - --with-fontrootdir=/usr/share/X11/fonts \ - --disable-iso8859-3 \ - --disable-iso8859-4 \ - --disable-iso8859-6 \ - --disable-iso8859-10 \ - --disable-iso8859-11 \ - --disable-iso8859-12 \ - --disable-iso8859-13 \ - --disable-iso8859-16 - - prepare - # Extract all source tarballs. - for object in %{sources}; do - # Only extract tar.bz2 files - object=${object//*pcf.gz/} - if [ -n "${object}" ]; then - %{MACRO_EXTRACT} %{DIR_DL}/${object} - fi - done - - %{MACRO_FIX_AUTOTOOLS} - end - - build - for object in %{sources}; do - dir=%{DIR_SRC}/${object%*.tar.bz2} - - if [ -d "${dir}" ]; then - cd ${dir} - ./configure %{configure_options} - - make %{PARALLELISMFLAGS} - fi - done - end - - install - for object in %{sources}; do - dir=%{DIR_SRC}/${object%*.tar.bz2} - - if [ -d "${dir}" ]; then - cd ${dir} - - make install DESTDIR=%{BUILDROOT} - fi - done - - # Install unifont - mkdir -pv %{BUILDROOT}/usr/share/X11/fonts/misc - cp -vf %{DIR_DL}/unifont-5.1.20080820.pcf.gz \ - %{BUILDROOT}/usr/share/X11/fonts/misc/unifont.pcf.gz - - # XXX Do we need to create these symlinks to use the fonts - check this in a running X environment. - # Install catalogue symlinks - #mkdir -pv %{BUILDROOT}/etc/X11/fontpath.d - #ln -svf ../../../usr/share/X11/fonts/100dpi %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-100dpi - #ln -svf ../../../usr/share/X11/fonts/75dpi %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-75dpi - #ln -svf ../../../usr/share/X11/fonts/cyrillic %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-cyrillic - #ln -svf ../../../usr/share/X11/fonts/misc %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-misc - #ln -svf ../../../usr/share/X11/fonts/Type1 %{BUILDROOT}/etc/X11/fontpath.d/xorg-x11-fonts-Type1 - end -end - -packages - # Template for 75 DPI fonts - template 75DPI - requires - fontconfig - end - - #files - # /etc/X11/fontpath.d/xorg-x11-fonts-75dpi - #end - - prerequires = xorg-x11-font-utils - - script postin - /usr/bin/mkfontdir /usr/share/X11/fonts/75dpi - end - - script postun - /usr/bin/mkfontdir /usr/share/X11/fonts/75dpi - end - end - - # Template for 100 DPI fonts - template 100DPI - requires - fontconfig - end - - #files - # /etc/X11/fontpath.d/xorg-x11-fonts-100 - #end - - prerequires = xorg-x11-font-utils - - script postin - /usr/bin/mkfontdir /usr/share/X11/fonts/100dpi - end - - script postun - /usr/bin/mkfontdir /usr/share/X11/fonts/100dpi - end - end - - package %{name} - summary = Bitmap fonts for the X Window System. - description - This package contains misc bitmap Chinese, Japanese, Korean, Indic, and Arabic - fonts for use with X Window System. - end - - requires - fontconfig - end - - prerequires = xorg-x11-font-utils - - script postin - /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/misc - end - - script postun - /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/misc - end - end - - package %{name}-Type1 - summary = Type1 fonts provided by the X Window System. - description - A collection of Type1 fonts which are part of the core X Window System - distribution. - end - - requires - fontconfig - end - - files - /usr/share/X11/fonts/Type1/ - end - - prerequires = xorg-x11-font-utils - - script postin - /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/Type1 - end - - script postun - /usr/bin/xorg-x11-fonts-update-dirs --skip-fontscale /usr/share/X11/fonts/Type1 - end - end - - package %{name}-75dpi - template 75DPI - - summary = A set of 75dpi resolution fonts for the X Window System. - description - A set of 75 dpi fonts used by the X window system. - end - - files +=\ - /usr/share/X11/fonts/75dpi/ - end - - package %{name}-100dpi - template 100DPI - - summary = A set of 100dpi resolution fonts for the X Window System. - description - A set of 100 dpi fonts used by the X window system. - end - - files +=\ - /usr/share/X11/fonts/100dpi/ - end - - package %{name}-ISO8859-1-75dpi - template 75DPI - - summary = A set of 75dpi ISO-8859-1 fonts for X. - description - Contains a set of 75dpi fonts for ISO-8859-1. - end - - files +=\ - /usr/share/X11/fonts/75dpi/*ISO8859-1.* - end - - package %{name}-ISO8859-1-100dpi - template 100DPI - - summary = A set of 100dpi ISO-8859-1 fonts for X. - description - Contains a set of 100dpi fonts for ISO-8859-1. - end - - files +=\ - /usr/share/X11/fonts/100dpi/*ISO8859-1.* - end - - package %{name}-ISO8859-2-75dpi - template 75DPI - - summary = A set of 75dpi Central European language fonts for X. - description - Contains a set of 75dpi fonts for Central European languages. - end - - files +=\ - /usr/share/X11/fonts/75dpi/*ISO8859-2.* - end - - package %{name}-ISO8859-2-100dpi - template 100DPI - - summary = A set of 100dpi Central European language fonts for X. - description - Contains a set of 100dpi fonts for Central European languages. - end - - files +=\ - /usr/share/X11/fonts/100dpi/*ISO8859-2.* - end - - package %{name}-ISO8859-9-75dpi - template 75DPI - - summary = ISO8859-9-75dpi fonts. - description - Contains a set of 75dpi fonts for the Turkish language. - end - - files +=\ - /usr/share/X11/fonts/75dpi/*ISO8859-9.* - end - - package %{name}-ISO8859-9-100dpi - template 100DPI - - summary = ISO8859-9-100dpi fonts. - description - Contains a set of 100dpi fonts for the Turkish language. - end - - files +=\ - /usr/share/X11/fonts/100dpi/*ISO8859-9.* - end - - package %{name}-ISO8859-14-75dpi - template 75DPI - - summary = ISO8859-14-75dpi fonts. - description - Contains a set of 75dpi fonts in the ISO8859-14 encoding which - provide Welsh support. - end - - files +=\ - /usr/share/X11/fonts/75dpi/*ISO8859-14.* - end - - package %{name}-ISO8859-14-100dpi - template 100DPI - - summary = ISO8859-14-100dpi fonts. - description - Contains a set of 100dpi fonts in the ISO8859-14 encoding which - provide Welsh support. - end - - files +=\ - /usr/share/X11/fonts/100dpi/*ISO8859-14.* - end - - package %{name}-ISO8859-15-75dpi - template 75DPI - - summary = ISO8859-15-75dpi fonts. - description - Contains a set of 75dpi fonts in the ISO8859-15 encoding which - provide Euro support. - end - - files +=\ - /usr/share/X11/fonts/75dpi/*ISO8859-15.* - end - - package %{name}-ISO8859-15-100dpi - template 100DPI - - summary = ISO8859-15-100dpi fonts. - description - Contains a set of 100dpi fonts in the ISO8859-15 encoding which - provide Euro support. - end - - files +=\ - /usr/share/X11/fonts/100dpi/*ISO8859-15.* - end - - package %{name}-cyrillic - summary = Cyrillic fonts for X. - description - Contains a set of Cyrillic fonts. - end - - requires - fontconfig - end - - files - /usr/share/X11/fonts/cyrillic/ - end - - prerequires = xorg-x11-font-utils - - script postin - /usr/bin/mkfontdir /usr/share/X11/fonts/cyrillic - end - - script postun - /usr/bin/mkfontdir /usr/share/X11/fonts/cyrillic - end - end - - package %{name}-unifont - summary = The GNU unifont. - description - GNU Unifont, contains glyphs for every printable code point in the Unicode 5.1 Basic Multilingual Plane (BMP). - end - - files - /usr/share/X11/fonts/misc/unifont.pcf.gz - end - end -end diff --git a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm deleted file mode 100644 index 8f74bbd09..000000000 --- a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm +++ /dev/null @@ -1,91 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-proto-devel -version = 7.7 -release = 2 -arch = noarch - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = Development/System -url = http://www.x.org/ -license = MIT -summary = X11 potocol headers. - -description - Development headers for X.org X11 protocol. -end - -source_dl = http://ftp.x.org/pub/individual/proto/ -sources = \ - bigreqsproto-1.1.2.tar.bz2 \ - compositeproto-0.4.2.tar.bz2 \ - damageproto-1.2.1.tar.bz2 \ - dmxproto-2.3.1.tar.bz2 \ - dri2proto-2.8.tar.bz2 \ - evieext-1.1.1.tar.bz2 \ - fixesproto-5.0.tar.bz2 \ - fontsproto-2.1.2.tar.bz2 \ - glproto-1.4.16.tar.bz2 \ - inputproto-2.2.99.1.tar.bz2 \ - kbproto-1.0.6.tar.bz2 \ - randrproto-1.4.0.tar.bz2 \ - recordproto-1.14.2.tar.bz2 \ - renderproto-0.11.1.tar.bz2 \ - resourceproto-1.2.0.tar.bz2 \ - scrnsaverproto-1.2.2.tar.bz2 \ - videoproto-2.3.1.tar.bz2 \ - xcmiscproto-1.2.2.tar.bz2 \ - xextproto-7.2.1.tar.bz2 \ - xf86bigfontproto-1.2.0.tar.bz2 \ - xf86dgaproto-2.1.tar.bz2 \ - xf86driproto-2.1.1.tar.bz2 \ - xf86miscproto-0.9.3.tar.bz2 \ - xf86vidmodeproto-2.3.1.tar.bz2 \ - xineramaproto-1.2.1.tar.bz2 \ - xproto-7.0.23.tar.bz2 \ - xproxymanagementprotocol-1.0.3.tar.bz2 - -build - requires - pkg-config - xorg-x11-util-macros - end - - prepare - # Extract all source tarballs. - for object in %{sources}; do - %{MACRO_EXTRACT} %{DIR_DL}/${object} - done - - %{MACRO_FIX_AUTOTOOLS} - end - - # Place the .pc files in /usr/share so they - # can be found on all architectures where libdir != /usr/lib. - configure_options += \ - --libdir=%{datadir} - - build - for object in %{sources}; do - cd %{DIR_SRC}/${object%*.tar.bz2} - [ -e configure ] || ./autogen.sh - ./configure %{configure_options} - - make %{PARALLELISMFLAGS} - done - end - - install - for object in %{sources}; do - cd %{DIR_SRC}/${object%*.tar.bz2} - make install DESTDIR=%{BUILDROOT} - done - end -end - -packages - package %{name} -end diff --git a/xorg-x11-server/10-quirks.conf b/xorg-x11-server/10-quirks.conf deleted file mode 100644 index 82d3ec26c..000000000 --- a/xorg-x11-server/10-quirks.conf +++ /dev/null @@ -1,20 +0,0 @@ -# Collection of quirks and blacklist/whitelists for specific devices. - - -# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable -# http://bugs.freedesktop.org/show_bug.cgi?id=22442 -Section "InputClass" - Identifier "ThinkPad HDAPS accelerometer blacklist" - MatchProduct "ThinkPad HDAPS accelerometer data" - Option "Ignore" "on" -EndSection - -# https://bugzilla.redhat.com/show_bug.cgi?id=523914 -# Mouse does not move in PV Xen guest -# Explicitly tell evdev to not ignore the absolute axes. -Section "InputClass" - Identifier "Xen Virtual Pointer axis blacklist" - MatchProduct "Xen Virtual Pointer" - Option "IgnoreAbsoluteAxes" "off" - Option "IgnoreRelativeAxes" "off" -EndSection diff --git a/xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch b/xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch deleted file mode 100644 index a48a013c4..000000000 --- a/xorg-x11-server/patches/xserver-1.12-Xext-fix-selinux-build-failure.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 5d16c39108c72b08478b6bd548494d6c675495ee Mon Sep 17 00:00:00 2001 -From: Peter Hutterer peter.hutterer@who-t.net -Date: Wed, 4 Jan 2012 09:31:51 +1000 -Subject: [PATCH 6/7] Xext: fix selinux build failure - -The server builds with -Werror=missing-braces, causing - -xselinux_hooks.c: In function 'SELinuxFlaskInit': -xselinux_hooks.c:851:12: error: missing braces around initializer -[-Werror=missing-braces] -xselinux_hooks.c:851:12: error: (near initialization for -'avc_option.<anonymous>') [-Werror=missing-braces] -cc1: some warnings being treated as errors - -Source is libselinux' libselinux-rhat.patch which changes struct selinux_opt -from { int, char * } to { int, union { char*, char** }}. - -Signed-off-by: Peter Hutterer peter.hutterer@who-t.net ---- - Xext/xselinux_hooks.c | 2 +- - Xext/xselinux_label.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Xext/xselinux_hooks.c b/Xext/xselinux_hooks.c -index e9c7e93..0302f2f 100644 ---- a/Xext/xselinux_hooks.c -+++ b/Xext/xselinux_hooks.c -@@ -851,7 +851,7 @@ SELinuxFlaskReset(void) - void - SELinuxFlaskInit(void) - { -- struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, (char *) 0 }; -+ struct selinux_opt avc_option = { AVC_OPT_SETENFORCE, { (char *) 0 } }; - security_context_t ctx; - int ret = TRUE; - -diff --git a/Xext/xselinux_label.c b/Xext/xselinux_label.c -index 2c33d1c..81f2f36 100644 ---- a/Xext/xselinux_label.c -+++ b/Xext/xselinux_label.c -@@ -361,7 +361,7 @@ SELinuxDefaultClientLabel(void) - void - SELinuxLabelInit(void) - { -- struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, (char *) 1 }; -+ struct selinux_opt selabel_option = { SELABEL_OPT_VALIDATE, { (char *)1 } }; - - label_hnd = selabel_open(SELABEL_CTX_X, &selabel_option, 1); - if (!label_hnd) --- -1.7.10.1 - diff --git a/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch b/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch deleted file mode 100644 index 2d33bed94..000000000 --- a/xorg-x11-server/patches/xserver-1.4.99-ssh-isnt-local.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 66a3b14e118e90db80f96fcab52af4df35bc2377 Mon Sep 17 00:00:00 2001 -From: Adam Jackson ajax@redhat.com -Date: Mon, 10 Dec 2007 11:26:57 -0500 -Subject: [PATCH] Hack for proper MIT-SHM rejection for ssh-forwarded clients. - ---- - Xext/shm.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/Xext/shm.c b/Xext/shm.c -index de48020..c011210 100644 ---- a/Xext/shm.c -+++ b/Xext/shm.c -@@ -321,8 +321,21 @@ shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly) - mode_t mask; - int uidset = 0, gidset = 0; - LocalClientCredRec *lcc; -+ Bool is_ssh = FALSE; - - if (GetLocalClientCreds(client, &lcc) != -1) { -+#ifdef linux -+ if (lcc->fieldsSet & LCC_PID_SET) { -+ /* ssh isn't actually a local client */ -+ char exe[64], buf[64]; -+ -+ memset(buf, 0, 64); -+ snprintf(exe, 64, "/proc/%d/exe", lcc->pid); -+ readlink(exe, buf, 63); -+ if (strstr(buf, "/ssh")) -+ is_ssh = TRUE; -+ } -+#endif - - if (lcc->fieldsSet & LCC_UID_SET) { - uid = lcc->euid; -@@ -342,6 +355,9 @@ shm_access(ClientPtr client, SHMPERM_TYPE * perm, int readonly) - #endif - FreeLocalClientCreds(lcc); - -+ if (is_ssh) -+ return -1; -+ - if (uidset) { - /* User id 0 always gets access */ - if (uid == 0) { --- -1.7.10.1 - diff --git a/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch b/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch deleted file mode 100644 index b42c2d7c8..000000000 --- a/xorg-x11-server/patches/xserver-1.6.0-less-acpi-brokenness.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 0002cde5312e785529b2901d7f8a82d5623e4ca7 Mon Sep 17 00:00:00 2001 -From: Adam Jackson ajax@redhat.com -Date: Wed, 9 Nov 2011 11:52:06 +1000 -Subject: [PATCH 2/7] Don't build the ACPI code. - -No good can come of this. ---- - configure.ac | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a12783c..54f4464 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1620,7 +1620,6 @@ if test "x$XORG" = xyes; then - linux_alpha=yes - ;; - i*86|amd64*|x86_64*|ia64*) -- linux_acpi="yes" - ;; - *) - ;; --- -1.7.10.1 - diff --git a/xorg-x11-server/patches/xserver-1.6.99-right-of.patch b/xorg-x11-server/patches/xserver-1.6.99-right-of.patch deleted file mode 100644 index bf7e7c87f..000000000 --- a/xorg-x11-server/patches/xserver-1.6.99-right-of.patch +++ /dev/null @@ -1,162 +0,0 @@ -From 291bc9f827188461ff9717efccec1e350db537e8 Mon Sep 17 00:00:00 2001 -From: Adam Jackson ajax@redhat.com -Date: Tue, 28 Jul 2009 11:07:13 -0400 -Subject: [PATCH 3/7] RANDR: right-of placement by default - -[Enhanced to add a new prefer clone option for drivers. This -allows for servers like RN50 where two heads are disjoint. - airlied] ---- - hw/xfree86/common/xf86str.h | 8 ++++- - hw/xfree86/modes/xf86Crtc.c | 76 ++++++++++++++++++++++++++++++++++++++----- - 2 files changed, 75 insertions(+), 9 deletions(-) - -diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h -index 0590262..d246634 100644 ---- a/hw/xfree86/common/xf86str.h -+++ b/hw/xfree86/common/xf86str.h -@@ -508,10 +508,13 @@ typedef struct _confdrirec { - } confDRIRec, *confDRIPtr; - - /* These values should be adjusted when new fields are added to ScrnInfoRec */ --#define NUM_RESERVED_INTS 16 -+#define NUM_RESERVED_INTS 15 - #define NUM_RESERVED_POINTERS 14 - #define NUM_RESERVED_FUNCS 10 - -+/* let clients know they can use this */ -+#define XF86_SCRN_HAS_PREFER_CLONE 1 -+ - typedef pointer (*funcPointer) (void); - - /* flags for depth 24 pixmap options */ -@@ -769,6 +772,9 @@ typedef struct _ScrnInfoRec { - ClockRangePtr clockRanges; - int adjustFlags; - -+ /* initial rightof support disable */ -+ int preferClone; -+ - /* - * These can be used when the minor ABI version is incremented. - * The NUM_* parameters must be reduced appropriately to keep the -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 154f684..c58088d 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1130,6 +1130,15 @@ xf86InitialOutputPositions(ScrnInfoPtr scrn, DisplayModePtr * modes) - int o; - int min_x, min_y; - -+ /* check for initial right-of heuristic */ -+ for (o = 0; o < config->num_output; o++) -+ { -+ xf86OutputPtr output = config->output[o]; -+ -+ if (output->initial_x || output->initial_y) -+ return TRUE; -+ } -+ - for (o = 0; o < config->num_output; o++) { - xf86OutputPtr output = config->output[o]; - -@@ -1998,6 +2007,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect) - return match; - } - -+static int -+numEnabledOutputs(xf86CrtcConfigPtr config, Bool *enabled) -+{ -+ int i = 0, p; -+ -+ for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ; -+ -+ return i; -+} -+ -+static Bool -+xf86TargetRightOf(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, -+ DisplayModePtr *modes, Bool *enabled, -+ int width, int height) -+{ -+ int o; -+ int w = 0; -+ -+ if (scrn->preferClone) -+ return FALSE; -+ -+ if (numEnabledOutputs(config, enabled) < 2) -+ return FALSE; -+ -+ for (o = -1; nextEnabledOutput(config, enabled, &o); ) { -+ DisplayModePtr mode = -+ xf86OutputHasPreferredMode(config->output[o], width, height); -+ -+ if (!mode) -+ return FALSE; -+ -+ w += mode->HDisplay; -+ } -+ -+ if (w > width) -+ return FALSE; -+ -+ w = 0; -+ for (o = -1; nextEnabledOutput(config, enabled, &o); ) { -+ DisplayModePtr mode = -+ xf86OutputHasPreferredMode(config->output[o], width, height); -+ -+ config->output[o]->initial_x = w; -+ w += mode->HDisplay; -+ -+ modes[o] = mode; -+ } -+ -+ return TRUE; -+} -+ - static Bool - xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, - DisplayModePtr * modes, Bool *enabled, -@@ -2074,14 +2134,10 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, - */ - if (!ret) - do { -- int i = 0; - float aspect = 0.0; - DisplayModePtr a = NULL, b = NULL; - -- /* count the number of enabled outputs */ -- for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++); -- -- if (i != 1) -+ if (numEnabledOutputs(config, enabled) != 1) - break; - - p = -1; -@@ -2385,6 +2441,8 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow) - else { - if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) - xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); -+ else if (xf86TargetRightOf(scrn, config, modes, enabled, width, height)) -+ xf86DrvMsg(i, X_INFO, "Using spanning desktop for initial modes\n"); - else if (xf86TargetPreferred - (scrn, config, modes, enabled, width, height)) - xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); -@@ -2404,9 +2462,11 @@ xf86InitialConfiguration(ScrnInfoPtr scrn, Bool canGrow) - "Output %s enabled but has no modes\n", - config->output[o]->name); - else -- xf86DrvMsg(scrn->scrnIndex, X_INFO, -- "Output %s using initial mode %s\n", -- config->output[o]->name, modes[o]->name); -+ xf86DrvMsg (scrn->scrnIndex, X_INFO, -+ "Output %s using initial mode %s +%d+%d\n", -+ config->output[o]->name, modes[o]->name, -+ config->output[o]->initial_x, -+ config->output[o]->initial_y); - } - - /* --- -1.7.10.4 - diff --git a/xorg-x11-server/patches/xserver-autobind-hotplug.patch b/xorg-x11-server/patches/xserver-autobind-hotplug.patch deleted file mode 100644 index 7d05f27ae..000000000 --- a/xorg-x11-server/patches/xserver-autobind-hotplug.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 536626891b60039c0f3f9b4cd96156e9fe810f39 Mon Sep 17 00:00:00 2001 -From: Dave Airlie airlied@redhat.com -Date: Fri, 17 Aug 2012 09:49:24 +1000 -Subject: [PATCH] autobind GPUs to the screen, (v2) - -this is racy and really not what we want for hotplug going forward, -but until DE support is in GNOME its probably for the best. - -v2: fix if config or slave config is NULL -DO NOT UPSTREAM. ---- - hw/xfree86/common/xf86Init.c | 12 ++++++++++++ - hw/xfree86/common/xf86platformBus.c | 3 +++ - hw/xfree86/modes/xf86Crtc.c | 28 ++++++++++++++++++++++++++++ - 3 files changed, 43 insertions(+) - -diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index d231ced..89629c1 100644 ---- a/hw/xfree86/common/xf86Init.c -+++ b/hw/xfree86/common/xf86Init.c -@@ -361,6 +361,16 @@ xf86CreateRootWindow(WindowPtr pWin) - return ret; - } - -+extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); -+static void -+xf86AutoConfigOutputDevices(void) -+{ -+ int i; -+ -+ for (i = 0; i < xf86NumGPUScreens; i++) -+ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); -+} -+ - static void - InstallSignalHandlers(void) - { -@@ -926,6 +936,8 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char **argv) - for (i = 0; i < xf86NumGPUScreens; i++) - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); - -+ xf86AutoConfigOutputDevices(); -+ - xf86VGAarbiterWrapFunctions(); - if (sigio_blocked) - OsReleaseSIGIO(); -diff --git a/hw/xfree86/common/xf86platformBus.c b/hw/xfree86/common/xf86platformBus.c -index a73aea2..3810076 100644 ---- a/hw/xfree86/common/xf86platformBus.c -+++ b/hw/xfree86/common/xf86platformBus.c -@@ -387,6 +387,8 @@ xf86platformProbeDev(DriverPtr drvp) - return foundScreen; - } - -+extern void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master); -+ - int - xf86platformAddDevice(int index) - { -@@ -446,6 +448,7 @@ xf86platformAddDevice(int index) - - /* attach unbound to 0 protocol screen */ - AttachUnboundGPU(xf86Screens[0]->pScreen, xf86GPUScreens[i]->pScreen); -+ xf86AutoConfigOutputDevice(xf86GPUScreens[i], xf86Screens[0]); - - return 0; - } -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 8f05c53..ba84e6b 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -3321,3 +3321,31 @@ xf86DetachAllCrtc(ScrnInfoPtr scrn) - crtc->x = crtc->y = 0; - } - } -+ -+ -+void xf86AutoConfigOutputDevice(ScrnInfoPtr pScrn, ScrnInfoPtr master) -+{ -+ RRProviderPtr master_provider; -+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(master); -+ xf86CrtcConfigPtr slave_config = XF86_CRTC_CONFIG_PTR(pScrn); -+ -+ if (!config || !slave_config) -+ return; -+ -+ master_provider = config->randr_provider; -+ -+ if ((master->capabilities & RR_Capability_SinkOffload) && -+ pScrn->capabilities & RR_Capability_SourceOffload) { -+ /* source offload */ -+ -+ DetachUnboundGPU(pScrn->pScreen); -+ AttachOffloadGPU(master->pScreen, pScrn->pScreen); -+ slave_config->randr_provider->offload_sink = master_provider; -+ } else if ((master->capabilities & RR_Capability_SourceOutput) && -+ pScrn->capabilities & RR_Capability_SinkOutput) { -+ /* sink offload */ -+ DetachUnboundGPU(pScrn->pScreen); -+ AttachOutputGPU(master->pScreen, pScrn->pScreen); -+ slave_config->randr_provider->output_source = master_provider; -+ } -+} --- -1.7.10.2 - diff --git a/xorg-x11-server/xorg-x11-server.nm b/xorg-x11-server/xorg-x11-server.nm deleted file mode 100644 index f2d933c4e..000000000 --- a/xorg-x11-server/xorg-x11-server.nm +++ /dev/null @@ -1,164 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-server -version = 1.13.2 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Server -url = http://www.x.org -license = MIT -summary = X.Org X11 X server. - -description - X.org X11 is an open source implementation of the X Window System. - It provides the basic low level functionality which full fledged - graphical user interfaces (GUIs) such as GNOME and KDE are designed - upon. -end - -thisapp = xorg-server-%{version} - -source_dl = http://ftp.x.org/pub/individual/xserver/ - -build - requires - audit-devel - autoconf - automake - libcap - libX11-devel - libXau-devel - libXdmcp-devel - libXext-devel - libXfixes-devel - libXfont-devel - libXmu-devel - libXrender-devel - libXres-devel - libXt-devel - libdrm-devel - libfontenc-devel - libpciaccess-devel - libselinux-devel - libtool - libudev-devel - libxcb-devel - libxkbfile-devel - mesa-devel >= 9.0.2 - openssl-devel - pixman-devel - pkg-config - xorg-x11-font-utils-devel - xorg-x11-util-macros - xorg-x11-proto-devel >= 7.7 - xorg-x11-xtrans-devel - end - - CFLAGS += -Wstrict-overflow -rdynamic - - configure_options += \ - --enable-xvfb \ - --enable-xfake \ - --enable-xfbdev \ - --enable-xorg \ - --disable-static \ - --disable-xnest \ - --disable-xephyr \ - --with-pic \ - --enable-maintainer-mode \ - --enable-xselinux \ - --with-int10=x86emu \ - --with-default-font-path="catalogue:/etc/X11/fontpath.d,built-ins" \ - --with-module-dir=%{libdir}/xorg/modules \ - --with-builderstring="Build ID: %{name} %{version}-%{release}" \ - --with-os-name="$(hostname -s) $(uname -r)" \ - --with-vendor-name="$(DISTRO_NAME) Project" \ - --with-vendor-web="http://www.ipfire.org" \ - --with-xkb-output=/var/lib/xkb \ - --enable-install-libxf86config \ - --localstatedir=/var \ - --disable-screensaver \ - --disable-config-dbus \ - --disable-config-hal \ - --enable-config-udev - - prepare_cmds - autoreconf -vfi - end - - configure_cmds - # Remove BIND_NOW flag from server modules to provide autoloading of them if needed - # by the server itself. - sed -i -e "s/^CFLAGS.*/& -Wl,-z,lazy/" \ - -e "s/^CCASFLAGS.*/& -Wl,-z,lazy/" \ - \ - hw/xfree86/dixmods/Makefile \ - hw/xfree86/dri/Makefile \ - hw/xfree86/dri2/Makefile \ - hw/xfree86/exa/Makefile \ - hw/xfree86/fbdevhw/Makefile \ - hw/xfree86/i2c/Makefile \ - hw/xfree86/int10/Makefile \ - hw/xfree86/shadowfb/Makefile \ - hw/xfree86/vbe/Makefile \ - hw/xfree86/vgahw/Makefile \ - end - - make_install_targets += \ - moduledir=%{libdir}/xorg/modules - - install_cmds - rm -vf %{BUILDROOT}%{libdir}/xorg/modules/libxf8_16bpp.so - rm -vrf %{BUILDROOT}/var/log - - mkdir -pv %{BUILDROOT}/etc/X11/xorg.conf.d %{BUILDROOT}/usr/share/xorg - install -m 0444 hw/xfree86/common/{vesa,extra}modes %{BUILDROOT}/usr/share/xorg/ - install -m 644 %{DIR_SOURCE}/10-quirks.conf %{BUILDROOT}/usr/share/X11/xorg.conf.d - end -end - -quality-agent - permit_not_full_relro = yes -end - -packages - package %{name} - requires - pixman - udev - xkeyboard-config - end - - recommends - xorg-x11-drv-ati - xorg-x11-drv-evdev - xorg-x11-drv-intel - xorg-x11-drv-keyboard - xorg-x11-drv-modesetting - xorg-x11-drv-mouse - xorg-x11-drv-nouveau - xorg-x11-drv-vesa - xorg-x11-drv-vmware - xorg-x11-fonts - xorg-x11-font-utils - xorg-x11-xkb-utils - end - end - - package %{name}-devel - template DEVEL - - requires - libpciaccess-devel - pixman-devel - end - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-util-macros/xorg-x11-util-macros.nm b/xorg-x11-util-macros/xorg-x11-util-macros.nm deleted file mode 100644 index 121c2c195..000000000 --- a/xorg-x11-util-macros/xorg-x11-util-macros.nm +++ /dev/null @@ -1,41 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-util-macros -version = 1.19.0 -release = 1 -arch = noarch - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X.Org X11 Autotools macros. - -description - X.Org X11 autotools macros required for building the various - packages that comprise the X Window System. -end - -thisapp = util-macros-%{version} - -source_dl = http://ftp.x.org/pub/individual/util/ - - -build - requires - pkg-config - end - - configure_options += \ - --disable-static - - make_install_target += \ - INSTALL="install -p" -end - -packages - package %{name} -end diff --git a/xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch b/xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch deleted file mode 100644 index a38c883b8..000000000 --- a/xorg-x11-xinit/patches/xinit-1.0.2-client-session.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: xinit-1.3.1/xinit.c -=================================================================== ---- xinit-1.3.1.orig/xinit.c -+++ xinit-1.3.1/xinit.c -@@ -91,6 +91,8 @@ char xserverrcbuf[256]; - - #define TRUE 1 - #define FALSE 0 -+#define OK_EXIT 0 -+#define ERR_EXIT 1 - - static char *default_server = "X"; - static char *default_display = ":0"; /* choose most efficient */ -@@ -561,6 +563,7 @@ startClient(char *client[]) - { - clientpid = fork(); - if (clientpid == 0) { -+ int fd; - set_environment(); - setWindowPath(); - -@@ -568,7 +571,16 @@ startClient(char *client[]) - Error("cannot change uid"); - _exit(EXIT_FAILURE); - } -- setpgid(0, getpid()); -+ fd = open ("/dev/null", O_RDONLY); -+ -+ if (fd < 0) { -+ Error("cannot open /dev/null: %s\n", strerror(errno)); -+ _exit(ERR_EXIT); -+ } -+ close (STDIN_FILENO); -+ dup2 (fd, STDIN_FILENO); -+ close (fd); -+ setsid(); - Execute(client); - Error("Unable to run program "%s"", client[0]); - diff --git a/xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch b/xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch deleted file mode 100644 index 85261da5e..000000000 --- a/xorg-x11-xinit/patches/xorg-x11-xinit-1.3.2-systemd-logind.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -Nur xinit-1.3.2.orig/startx.cpp xinit-1.3.2/startx.cpp ---- xinit-1.3.2.orig/startx.cpp 2012-09-29 11:55:06.661264745 -0600 -+++ xinit-1.3.2/startx.cpp 2012-09-29 11:56:24.849771316 -0600 -@@ -80,6 +80,7 @@ - defaultdisplay=":0" - clientargs="" - serverargs="" -+tty_num=$(tty | grep -oE '[0-9]+$') - - #ifdef __APPLE__ - -@@ -135,6 +136,15 @@ - enable_xauth=1 - #endif - -+if [ x"$tty_num" != x ]; then -+ # Specify TTY number directly to avoid recognizing startx session as -+ # inactive: RHBZ#820675 -+ serverargs=${serverargs}" vt"${tty_num} -+else -+ echo "Error getting tty num" -+ exit 1 -+fi -+ - XCOMM Automatically determine an unused $DISPLAY - d=0 - while true ; do diff --git a/xorg-x11-xinit/xorg-x11-xinit.nm b/xorg-x11-xinit/xorg-x11-xinit.nm deleted file mode 100644 index c3ad69098..000000000 --- a/xorg-x11-xinit/xorg-x11-xinit.nm +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-xinit -version = 1.3.2 -release = 1 -thisapp = xinit-%{version} - -groups = X/Server -url = http://www.x.org -license = MIT -summary = X.Org X11 X Window System xinit startup scripts. - -description - X.Org X11 X Window System xinit startup scripts. -end - -source_dl = http://ftp.x.org/pub/individual/app/ - -build - requires - autoconf - automake - libX11-devel - libtool - xorg-x11-util-macros - end - - prepare_cmds - # Regenerate build system. - autoreconf -vfi - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm b/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm deleted file mode 100644 index 2b5c14dd0..000000000 --- a/xorg-x11-xkb-utils/xorg-x11-xkb-utils.nm +++ /dev/null @@ -1,72 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-xkb-utils -version = 7.4 -release = 1 - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Fonts -url = http://www.x.org/ -license = MIT -summary = X.Org X11 xkb utilities. - -description - X.Org X11 xkb utilities. -end - -configure_options += \ - --mandir=/usr/share/man - -CFLAGS += -DHAVE_STRCASECMP - -source_dl = http://ftp.x.org/pub/individual/app/ -sources = \ - xkbcomp-1.1.1.tar.bz2 \ - xkbutils-1.0.3.tar.bz2 \ - xkbevd-1.1.1.tar.bz2 \ - xkbprint-1.0.1.tar.bz2 \ - setxkbmap-1.2.0.tar.bz2 - -build - requires - bison - libICE-devel - libSM-devel - libX11-devel - libXaw-devel - libXmu-devel - libXt-devel - libxkbfile-devel - pkg-config - xorg-x11-proto-devel - end - - build - for object in %{sources}; do - cd %{DIR_SRC}/${object%*.tar.bz2} - rm -vf xkbparse.c # force regen - ./configure %{configure_options} - - make %{PARALLELISMFLAGS} - done - end - - install - for object in %{sources}; do - cd %{DIR_SRC}/${object%*.tar.bz2} - make install DESTDIR=%{BUILDROOT} - done - end -end - -packages - package %{name} - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch b/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch deleted file mode 100644 index 5d474d5d9..000000000 --- a/xorg-x11-xtrans-devel/patches/xtrans-1.0.3-avoid-gethostname.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up xtrans-1.0.3/Xtransutil.c.jx xtrans-1.0.3/Xtransutil.c ---- xtrans-1.0.3/Xtransutil.c.jx 2006-12-06 11:08:53.000000000 -0500 -+++ xtrans-1.0.3/Xtransutil.c 2007-10-01 14:53:43.000000000 -0400 -@@ -271,6 +271,7 @@ TRANS(GetMyNetworkId) (XtransConnInfo ci - case AF_UNIX: - { - struct sockaddr_un *saddr = (struct sockaddr_un *) addr; -+ strcpy(hostnamebuf, "unix"); - networkId = (char *) xalloc (3 + strlen (transName) + - strlen (hostnamebuf) + strlen (saddr->sun_path)); - sprintf (networkId, "%s/%s:%s", transName, diff --git a/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm b/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm deleted file mode 100644 index cf8f83f39..000000000 --- a/xorg-x11-xtrans-devel/xorg-x11-xtrans-devel.nm +++ /dev/null @@ -1,34 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xorg-x11-xtrans-devel -version = 1.2.5 -release = 2 -thisapp = xorg-xtrans-%{version} -arch = noarch - -maintainer = Stefan Schantl stefan.schantl@ipfire.org -groups = X/Libraries -url = http://www.x.org/ -license = MIT -summary = X11 transport library. - -description - Transprot library for X.org X11 protocol. -end - -sources = xtrans-%{version}.tar.bz2 - -build - requires - pkg-config - end - - DIR_APP = %{DIR_SRC}/xtrans-%{version} -end - -packages - package %{name} -end diff --git a/xrandr/xrandr.nm b/xrandr/xrandr.nm deleted file mode 100644 index eebec73e8..000000000 --- a/xrandr/xrandr.nm +++ /dev/null @@ -1,44 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xrandr -version = 1.3.3 -release = 1 - -groups = X/Tools -url = http://www.x.org/ -license = MIT -summary = Primitive command line interface to RandR extension. - -description - Xrandr is used to set the screen size, orientation and/or \ - reflection using the RandR extension. -end - -source_dl = http://ftp.x.org/pub/individual/app -sources = %{thisapp}.tar.bz2 - -build - requires - libX11-devel - libXrandr-devel - libXrender-devel - pkg-config - end - - install_cmds - # Remove xkeystone, it has a bad interpreter and we don't need it. - rm -vf %{BUILDROOT}/usr/bin/xkeystone - end -end - -packages - package %{name} - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/xterm/patches/xterm-245-resources.patch b/xterm/patches/xterm-245-resources.patch deleted file mode 100644 index f3be10ae7..000000000 --- a/xterm/patches/xterm-245-resources.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up xterm-245/XTerm.ad.resources xterm-245/XTerm.ad ---- xterm-245/XTerm.ad.resources 2009-02-13 01:14:13.000000000 +0100 -+++ xterm-245/XTerm.ad 2009-08-13 12:28:59.000000000 +0200 -@@ -210,3 +210,13 @@ - !*allowTcapOps: false - !*allowTitleOps: false - !*allowWindowOps: false -+ -+! Red Hat Defaults: -+*allowFontOps: false -+*allowTcapOps: false -+*allowWindowOps: false -+*VT100*eightBitInput: false -+*VT100*metaSendsEscape: true -+*VT100*backarrowKey: false -+*VT100*scrollBar: true -+*VT100*utf8Title: true diff --git a/xterm/patches/xterm-256-man-page_paths.patch b/xterm/patches/xterm-256-man-page_paths.patch deleted file mode 100644 index 6bfd46def..000000000 --- a/xterm/patches/xterm-256-man-page_paths.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up xterm-256/minstall.sh.man-page_paths xterm-256/minstall.sh ---- xterm-256/minstall.sh.man-page_paths 2010-03-04 00:44:49.000000000 +0100 -+++ xterm-256/minstall.sh 2010-03-09 12:11:26.000000000 +0100 -@@ -109,6 +109,10 @@ WTMP_PATH=$WTMP_PATH/$WTMP_NAME - X_MANSECT=`man X 2>&1 | tr '\012' '\020' | sed -e 's/^[^0123456789]*([^) ][^) ]*).*/\1/'` - test -z "$X_MANSECT" && X_MANSECT=$suffix - -+fontpath=/usr/share/X11/fonts -+xorgcfgdir=/etc/X11 -+xorgcfgfil=xorg.conf -+X_MANSECT=7 - sed -e 's%__vendorversion__%"X Window System"%' \ - -e s%__apploaddir__%$APPS_DIR% \ - -e s%__mansuffix__%$MY_MANSECT%g \ -@@ -117,6 +121,9 @@ sed -e 's%__vendorversion__%"X Window Sy - -e s%/etc/utmp%$UTMP_PATH%g \ - -e s%fIwtmp'\%fI'$WTMP_NAME'\%g' \ - -e s%/etc/wtmp%$WTMP_PATH%g \ -+ -e s%__fontpath__%$fontpath%g \ -+ -e s%__xorgcfgdir__%$xorgcfgdir%g \ -+ -e s%__xorgcfgfil__%$xorgcfgfil%g \ - $OLD_FILE >$NEW_FILE - - echo "$MINSTALL $OLD_FILE $END_FILE" -diff -up xterm-256/xterm.man.man-page_paths xterm-256/xterm.man ---- xterm-256/xterm.man.man-page_paths 2010-03-03 23:30:35.000000000 +0100 -+++ xterm-256/xterm.man 2010-03-09 12:11:26.000000000 +0100 -@@ -1699,17 +1699,17 @@ Since X11R6, bitmap fonts have been scal - The font server claims to provide the bold font that \fIxterm\fP requests, - but the result is not always readable. - XFree86 provides a feature which can be used to suppress the scaling. --In the X server's configuration file (e.g., "/etc/X11/XFree86"), you -+In the X server's configuration file (e.g., __xorgcfgdir__/__xorgcfgfil__), you - can add ":unscaled" to the end of the directory specification for the - "misc" fonts, which comprise the fixed-pitch fonts that are used by \fIxterm\fP. - For example - .RS -- FontPath "/usr/lib/X11/fonts/misc/" -+ FontPath "__fontpath__" - .RE - .IP - would become - .RS -- FontPath "/usr/lib/X11/fonts/misc/:unscaled" -+ FontPath "__fontpath__/misc/:unscaled" - .RE - .IP - Depending on your configuration, the font server may have its own configuration diff --git a/xterm/patches/xterm-261-desk.patch b/xterm/patches/xterm-261-desk.patch deleted file mode 100644 index b6483289f..000000000 --- a/xterm/patches/xterm-261-desk.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up xterm-261/xterm.desktop.desk xterm-261/xterm.desktop ---- xterm-261/xterm.desktop.desk 2010-06-15 12:58:13.000000000 +0200 -+++ xterm-261/xterm.desktop 2010-07-02 13:02:56.000000000 +0200 -@@ -32,10 +32,11 @@ - # ----------------------------------------------------------------------------- - [Desktop Entry] - Name=XTerm -+GenericName=Terminal - Comment=standard terminal emulator for the X window system - Exec=xterm - Terminal=false - Type=Application - Encoding=UTF-8 --Icon=xterm-color_48x48 -+Icon=gnome-xterm - Categories=System;TerminalEmulator; diff --git a/xterm/xterm.nm b/xterm/xterm.nm deleted file mode 100644 index 52b824ad6..000000000 --- a/xterm/xterm.nm +++ /dev/null @@ -1,55 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = xterm -version = 262 -release = 1 - -groups = X/Application -url = http://invisible-island.net/xterm/ -license = MIT -summary = Terminal emulator for the X Window System. - -description - The xterm program is a terminal emulator for the X Window System. It \ - provides DEC VT102 and Tektronix 4014 compatible terminals for \ - programs that can't use the window system directly. -end - -source_dl = ftp://invisible-island.net/xterm/ - -sources = %{thisapp}.tgz - -build - requires - libSM-devel - libXft-devel - libXaw-devel - libXext-devel - libxkbfile-devel - ncurses-devel - pkg-config - end - - configure_options += \ - --mandir=/usr/share/man \ - --enable-256-color \ - --enable-exec-xterm \ - --enable-luit \ - --enable-warnings \ - --enable-wide-chars \ - --with-tty-group=tty \ - --disable-full-tgetent -end - -packages - package %{name} - requires = xorg-x11-server - end - - package %{name}-debuginfo - template DEBUGINFO - end -end diff --git a/zenity/zenity.nm b/zenity/zenity.nm deleted file mode 100644 index 4ce567bce..000000000 --- a/zenity/zenity.nm +++ /dev/null @@ -1,54 +0,0 @@ -############################################################################### -# IPFire.org - An Open Source Firewall Solution # -# Copyright (C) - IPFire Development Team info@ipfire.org # -############################################################################### - -name = zenity -version = %{ver_maj}.%{ver_min} -ver_maj = 3.7 -ver_min = 2 -release = 1 - -groups = Applications/System -url = http://directory.fsf.org/zenity.html -license = LGPLv2+ -summary = Display dialog boxes from shell scripts - -description - Zenity lets you display Gtk+ dialog boxes from the command line and through - shell scripts. It is similar to gdialog, but is intended to be saner. It comes - from the same family as dialog, Xdialog, and cdialog. -end - -source_dl = http://download.gnome.org/sources/%%7Bname%7D/%%7Bver_maj%7D/ -sources = %{thisapp}.tar.xz - -build - requires - gettext - gtk3-devel - intltool - which - end - - configure_options += \ - --disable-scrollkeeper \ - --disable-webkitgtk \ - ITSTOOL=true - - install_cmds - # we don't want a perl dependency just for this - rm -vf %{BUILDROOT}%{bindir}/gdialog - - # Remove help documents. - rm -rvf %{BUILDROOT}%{datadir}/help - end -end - -packages - package %{name} - - package %{name}-debuginfo - template DEBUGINFO - end -end
hooks/post-receive -- IPFire 3.x development tree
-
Michael Tremer