summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--community/balsa/balsa-2.4.8-libnotify-0.7.patch51
-rw-r--r--community/epdfview/0001-r329.patch79
-rw-r--r--community/epdfview/0002-r354.patch77
-rw-r--r--community/epdfview/0003-r357.patch134
-rw-r--r--community/epdfview/m_Linearized.patch24
-rw-r--r--community/gimmie/ChangeLog2
-rw-r--r--community/gimmie/PKGBUILD44
-rw-r--r--community/gimmie/gimmie.install22
-rw-r--r--community/nbd/nbd.conf.d8
-rw-r--r--community/python-sympy/PKGBUILD27
-rw-r--r--community/python-sympy/test.patch11
-rw-r--r--community/wine/PKGBUILD144
-rw-r--r--community/wine/wine.install12
-rw-r--r--core/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch453
-rw-r--r--core/udev/01-settle.patch68
-rw-r--r--core/udev/02-settle.patch29
-rwxr-xr-xcore/udev/cdsymlinks.sh44
-rw-r--r--extra/xorg-server/glx-pixmap-crash.patch85
18 files changed, 0 insertions, 1314 deletions
diff --git a/community/balsa/balsa-2.4.8-libnotify-0.7.patch b/community/balsa/balsa-2.4.8-libnotify-0.7.patch
deleted file mode 100644
index 0cef7f54a..000000000
--- a/community/balsa/balsa-2.4.8-libnotify-0.7.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- libbalsa/information.c
-+++ libbalsa/information.c
-@@ -27,6 +27,9 @@
-
- #ifdef HAVE_NOTIFY
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
- #include <gtk/gtk.h>
- #endif
- #include <string.h>
-@@ -122,7 +125,11 @@
- g_free(msg);
-
- note =
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+ notify_notification_new("Balsa", escaped->str, icon_str);
-+#else
- notify_notification_new("Balsa", escaped->str, icon_str, NULL);
-+#endif
- g_string_free(escaped, TRUE);
-
- notify_notification_set_timeout(note, 7000); /* 7 seconds */
---- src/main-window.c
-+++ src/main-window.c
-@@ -85,6 +85,12 @@
-
- #define MAILBOX_DATA "mailbox_data"
-
-+#ifdef HAVE_NOTIFY
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+#endif
-+
- enum {
- OPEN_MAILBOX_NODE,
- CLOSE_MAILBOX_NODE,
-@@ -3406,7 +3412,11 @@
- } else {
- num_total = num_new;
- balsa_app.main_window->new_mail_note =
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+ notify_notification_new("Balsa", NULL, NULL);
-+#else
- notify_notification_new("Balsa", NULL, NULL, NULL);
-+#endif
- g_object_add_weak_pointer(G_OBJECT(balsa_app.main_window->
- new_mail_note),
- (gpointer) & balsa_app.main_window->
diff --git a/community/epdfview/0001-r329.patch b/community/epdfview/0001-r329.patch
deleted file mode 100644
index ae6e4a3a1..000000000
--- a/community/epdfview/0001-r329.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From dc6c25e8f1a7a3845fa7d14b9dfbd22deb9dd6ef Mon Sep 17 00:00:00 2001
-From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e>
-Date: Fri, 20 Mar 2009 08:06:32 +0000
-Subject: [PATCH 1/3] I had to change the return valud of MainView's scroll-event handler, since Gtk+ expects a gboolean that tells whether to propagate the event. Since we didn't return any value, depending on the compilation flags the mouse wheel didn't work at all.
-
-This closes #118.
-
-git-svn-id: svn://svn.emma-soft.com/epdfview@329 cb4bfb15-1111-0410-82e2-95233c8f1c7e
----
- trunk/src/gtk/MainView.cxx | 21 ++++++++++++++-------
- trunk/src/gtk/PageView.cxx | 7 -------
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/trunk/src/gtk/MainView.cxx b/trunk/src/gtk/MainView.cxx
-index b983bff..4a52cd3 100644
---- a/trunk/src/gtk/MainView.cxx
-+++ b/trunk/src/gtk/MainView.cxx
-@@ -77,7 +77,7 @@ static void main_window_zoom_in_cb (GtkWidget *, gpointer);
- static void main_window_zoom_out_cb (GtkWidget *, gpointer);
- static void main_window_zoom_width_cb (GtkToggleAction *, gpointer);
- static void main_window_set_page_mode (GtkRadioAction *, GtkRadioAction *, gpointer);
--static void main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
-+static gboolean main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data);
-
- #if defined (HAVE_CUPS)
- static void main_window_print_cb (GtkWidget *, gpointer);
-@@ -1479,18 +1479,25 @@ main_window_set_page_mode (GtkRadioAction *action, GtkRadioAction *current, gpoi
- pter->setPageMode (mode);
- }
-
--void
-+gboolean
- main_window_page_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
- {
- g_assert ( NULL != data && "The data parameter is NULL.");
-
- MainPter *pter = (MainPter *)data;
- // Only zoom when the CTRL-Button is down...
-- if ( !(event->state & GDK_CONTROL_MASK) ) return;
-- if ( event->direction == GDK_SCROLL_UP ) {
-- pter->zoomInActivated ();
-- } else if ( event->direction == GDK_SCROLL_DOWN ) {
-- pter->zoomOutActivated ();
-+ if ( GDK_CONTROL_MASK == (event->state & GDK_CONTROL_MASK) )
-+ {
-+ if ( event->direction == GDK_SCROLL_UP )
-+ {
-+ pter->zoomInActivated ();
-+ }
-+ else if ( event->direction == GDK_SCROLL_DOWN )
-+ {
-+ pter->zoomOutActivated ();
-+ }
-+ return TRUE;
- }
-+ return FALSE;
- }
-
-diff --git a/trunk/src/gtk/PageView.cxx b/trunk/src/gtk/PageView.cxx
-index 0546561..adaa823 100644
---- a/trunk/src/gtk/PageView.cxx
-+++ b/trunk/src/gtk/PageView.cxx
-@@ -527,13 +527,6 @@ page_view_scrolled_cb (GtkWidget *widget, GdkEventScroll *event, gpointer data)
- {
- g_assert ( NULL != data && "The data parameter is NULL.");
-
-- // don't scroll when the CRTL-Button is down, because then the page should
-- // actually be zoomed and not scrolled. Zooming is handelt by the MainView
-- // class.
-- if ( event->state & GDK_CONTROL_MASK )
-- {
-- return FALSE;
-- }
- PagePter *pter = (PagePter *)data;
- GtkAdjustment *adjustment =
- gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (widget));
---
-1.7.4
-
diff --git a/community/epdfview/0002-r354.patch b/community/epdfview/0002-r354.patch
deleted file mode 100644
index 771b93a01..000000000
--- a/community/epdfview/0002-r354.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d8d3dac5fc3fe519b443d22f74258af4aaf48d0c Mon Sep 17 00:00:00 2001
-From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e>
-Date: Mon, 11 Oct 2010 15:53:47 +0000
-Subject: [PATCH 2/3] Added support for poppler's API changes in 0.15.0 by Michal Schmidt.
-
-git-svn-id: svn://svn.emma-soft.com/epdfview@354 cb4bfb15-1111-0410-82e2-95233c8f1c7e
----
- trunk/configure.ac | 16 ++++++++++------
- trunk/src/PDFDocument.cxx | 12 +++++++++++-
- 2 files changed, 21 insertions(+), 7 deletions(-)
-
-diff --git a/trunk/configure.ac b/trunk/configure.ac
-index 7ce0ddc..6cbd0e2 100644
---- a/trunk/configure.ac
-+++ b/trunk/configure.ac
-@@ -40,18 +40,22 @@ PKG_CHECK_MODULES([POPPLER], [poppler-glib >= $POPPLER_REQUIRED gdk-2.0 >= $GTK2
- AC_SUBST([POPPLER_CFLAGS])
- AC_SUBST([POPPLER_LIBS])
- dnl Check if we have poppler version 0.5.2 or higher.
--PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_052=yes])
--if test "x$have_poppler_052" = "xyes"; then
-+PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_poppler_0_5_2=yes])
-+if test "x$have_poppler_0_5_2" = "xyes"; then
- AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
- fi
--PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_060=yes])
--if test "x$have_poppler_060" = "xyes"; then
-+PKG_CHECK_EXISTS([poppler-glib >= 0.6], [have_poppler_0_6_0=yes])
-+if test "x$have_poppler_0_6_0" = "xyes"; then
- AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
- fi
--PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
--if test "x$have_poppler_080" = "xyes"; then
-+PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_0_8_0=yes])
-+if test "x$have_poppler_0_8_0" = "xyes"; then
- AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
- fi
-+PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes])
-+if test "x$have_poppler_0_15_0" = "xyes"; then
-+ AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
-+fi
-
- EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
- AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")
-diff --git a/trunk/src/PDFDocument.cxx b/trunk/src/PDFDocument.cxx
-index 6567e9b..a590a20 100644
---- a/trunk/src/PDFDocument.cxx
-+++ b/trunk/src/PDFDocument.cxx
-@@ -678,14 +678,24 @@ PDFDocument::setTextSelection (DocumentRectangle *rect)
- gdouble pageWidth, pageHeight;
- poppler_page_get_size(page, &pageWidth, &pageHeight);
-
-+#if defined (HAVE_POPPLER_0_15_0)
-+ PopplerRectangle textRect = { rect->getX1() / getZoom(),
-+ rect->getY1() / getZoom(),
-+ rect->getX2() / getZoom(),
-+ rect->getY2() / getZoom()};
-+#else // !HAVE_POPPLER_0_15_0
- //for get text we must exchange y coordinate, don't ask me where logic here.
- PopplerRectangle textRect = { rect->getX1() / getZoom(),
- (pageHeight - rect->getY2() / getZoom()),
- rect->getX2() * getZoom() / getZoom(),
- (pageHeight - rect->getY1() / getZoom())};
-+#endif // HAVE_POPPLER_0_15_0
- repairEmpty(textRect);
-
--#if defined (HAVE_POPPLER_0_6_0)
-+#if defined (HAVE_POPPLER_0_15_0)
-+ gchar *text = poppler_page_get_selected_text(page, POPPLER_SELECTION_GLYPH,
-+ &textRect);
-+#elif defined (HAVE_POPPLER_0_6_0)
- gchar *text = poppler_page_get_text(page, POPPLER_SELECTION_GLYPH,
- &textRect);
- #else // !HAVE_POPPLER_0_6_0
---
-1.7.4
-
diff --git a/community/epdfview/0003-r357.patch b/community/epdfview/0003-r357.patch
deleted file mode 100644
index c1aa9a1a6..000000000
--- a/community/epdfview/0003-r357.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-From 951a8f66463c0dc38fa05931bd8df7b45707f6e8 Mon Sep 17 00:00:00 2001
-From: jordi <jordi@cb4bfb15-1111-0410-82e2-95233c8f1c7e>
-Date: Wed, 17 Nov 2010 16:02:45 +0000
-Subject: [PATCH 3/3] Applied patch by Dennis Sheil <dennis-poppler@vartmp.com> to use the correct variable type for linearization since poppler version 0.15.1.
-
-git-svn-id: svn://svn.emma-soft.com/epdfview@357 cb4bfb15-1111-0410-82e2-95233c8f1c7e
----
- trunk/THANKS | 1 +
- trunk/configure.ac | 5 +++++
- trunk/src/IDocument.cxx | 15 ++++++++++++++-
- trunk/src/IDocument.h | 8 ++++++++
- trunk/src/PDFDocument.cxx | 4 ++++
- 5 files changed, 32 insertions(+), 1 deletions(-)
-
-diff --git a/trunk/THANKS b/trunk/THANKS
-index 48dcb2b..7888d1a 100644
---- a/trunk/THANKS
-+++ b/trunk/THANKS
-@@ -4,6 +4,7 @@ contributions:
- - Alain Mendizabal <alainmendi@gmail.com>, for his Basque translation.
- - Alex Dedul <rotmer@gmail.com>, for his patch.
- - Alexander <lothalev@gmail.com>, for corrections in the Polish translation.
-+ - Dennis Sheil <dennis-poppler@vartmp.com>, for his patch.
- - Enrico Tröger <enrico.troeger@uvena.de>, for his full screen patch and others.
- - Daniel Nylander <po@danielnylander.se>, for his Swedish translation.
- - Daniel Pielmeie <daniel.pielmeie@googlemail.com>, for his patches.
-diff --git a/trunk/configure.ac b/trunk/configure.ac
-index 6cbd0e2..f8316b0 100644
---- a/trunk/configure.ac
-+++ b/trunk/configure.ac
-@@ -56,6 +56,11 @@ PKG_CHECK_EXISTS([poppler-glib >= 0.15], [have_poppler_0_15_0=yes])
- if test "x$have_poppler_0_15_0" = "xyes"; then
- AC_DEFINE([HAVE_POPPLER_0_15_0], [1], [Define to 1 if you have Poppler version 0.15.0 or higher.])
- fi
-+PKG_CHECK_EXISTS([poppler-glib >= 0.15.1], [have_poppler_0_15_1=yes])
-+if test "x$have_poppler_0_15_1" = "xyes"; then
-+ AC_DEFINE([HAVE_POPPLER_0_15_1], [1], [Define to 1 if you have Poppler version 0.15.1 or higher.])
-+fi
-+
-
- EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])
- AM_CONDITIONAL(cups_printing, test "x$have_cups" = "xyes")
-diff --git a/trunk/src/IDocument.cxx b/trunk/src/IDocument.cxx
-index f1b71c5..f560f34 100644
---- a/trunk/src/IDocument.cxx
-+++ b/trunk/src/IDocument.cxx
-@@ -755,11 +755,16 @@ IDocument::setFormat (gchar *format)
- const gchar *
- IDocument::getLinearized ()
- {
-+#if defined (HAVE_POPPLER_0_15_1)
-+ if ( m_Linearized ) return "Yes";
-+ else return "No";
-+#else
- if ( NULL == m_Linearized )
- {
- return "No";
- }
- return m_Linearized;
-+#endif
- }
-
- ///
-@@ -768,14 +773,22 @@ IDocument::getLinearized ()
- /// @param linearized Set to "Yes" if the document is linearized. "No"
- /// otherwise. IDocument will free it.
- ///
-+#if defined (HAVE_POPPLER_0_15_1)
- void
--IDocument::setLinearized (gchar *linearized)
-+IDocument::setLinearized (gboolean *linearized)
-+{
-+ m_Linearized = linearized;
-+}
-+#else
-+void
-+ IDocument::setLinearized (gchar *linearized)
- {
- gchar *oldLinearized = m_Linearized;
- m_Linearized = g_strdup (linearized);
- g_free (oldLinearized);
- g_free (linearized);
- }
-+#endif
-
- ///
- /// @brief Gets the document's creation date.
-diff --git a/trunk/src/IDocument.h b/trunk/src/IDocument.h
-index fbb3954..32aadf2 100644
---- a/trunk/src/IDocument.h
-+++ b/trunk/src/IDocument.h
-@@ -306,7 +306,11 @@ namespace ePDFView
- const gchar *getFormat (void);
- void setFormat (gchar *format);
- const gchar *getLinearized (void);
-+#if defined (HAVE_POPPLER_0_15_1)
-+ void setLinearized (gboolean *linearized);
-+#else
- void setLinearized (gchar *linearized);
-+#endif
- const gchar *getCreationDate (void);
- void setCreationDate (gchar *date);
- const gchar *getModifiedDate (void);
-@@ -382,7 +386,11 @@ namespace ePDFView
- /// The document's keyword.
- gchar *m_Keywords;
- /// Tells if the document is linearized or not.
-+#if defined (HAVE_POPPLER_0_15_1)
-+ gboolean *m_Linearized;
-+#else
- gchar *m_Linearized;
-+#endif
- /// The document's modification date and time.
- gchar *m_ModifiedDate;
- /// @brief The list of classes that will receive notifications
-diff --git a/trunk/src/PDFDocument.cxx b/trunk/src/PDFDocument.cxx
-index a590a20..4d425cd 100644
---- a/trunk/src/PDFDocument.cxx
-+++ b/trunk/src/PDFDocument.cxx
-@@ -324,7 +324,11 @@ PDFDocument::loadMetadata (void)
- gchar *format = NULL;
- gchar *keywords = NULL;
- PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET;
-+#if defined (HAVE_POPPLER_0_15_1)
-+ gboolean *linearized = NULL;
-+#else
- gchar *linearized = NULL;
-+#endif
- GTime modDate;
- PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET;
- gchar *producer = NULL;
---
-1.7.4
-
diff --git a/community/epdfview/m_Linearized.patch b/community/epdfview/m_Linearized.patch
deleted file mode 100644
index 7cad8d9c6..000000000
--- a/community/epdfview/m_Linearized.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/IDocument.cxx 2011-02-06 14:45:34.173334040 +0100
-+++ src/IDocument.cxx 2011-02-06 14:51:23.173334040 +0100
-@@ -135,7 +135,11 @@
- m_FindPage = 0;
- m_Format = NULL;
- m_Keywords = NULL;
-+#if defined (HAVE_POPPLER_0_15_1)
-+ m_Linearized = FALSE;
-+#else
- m_Linearized = NULL;
-+#endif
- m_ModifiedDate = NULL;
- m_PageCache = NULL;
- m_PageCacheAge = 0;
-@@ -164,7 +168,9 @@
- g_free (m_FileName);
- g_free (m_Format);
- g_free (m_Keywords);
-+#if !defined (HAVE_POPPLER_0_15_1)
- g_free (m_Linearized);
-+#endif
- g_free (m_ModifiedDate);
- g_free (m_Password);
- g_free (m_Producer);
diff --git a/community/gimmie/ChangeLog b/community/gimmie/ChangeLog
deleted file mode 100644
index 7fd5bbf99..000000000
--- a/community/gimmie/ChangeLog
+++ /dev/null
@@ -1,2 +0,0 @@
-2007-06-26 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
diff --git a/community/gimmie/PKGBUILD b/community/gimmie/PKGBUILD
deleted file mode 100644
index 601d39576..000000000
--- a/community/gimmie/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 44484 2011-04-07 20:23:57Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: György Balló <ballogy@freestart.hu>
-
-pkgname=gimmie
-pkgver=0.2.8
-pkgrel=16
-pkgdesc="desktop organizer which allows interaction with applications, contacts, documents, etc"
-arch=('i686' 'x86_64')
-url="http://beatniksoftware.com/gimmie/"
-license=('LGPL')
-depends=('libgnomecups' 'dbus-python' 'python2-gconf' 'python-gnomeapplet'
- 'python-gnomedesktop' 'python2-libgnome' 'python-wnck' 'pyxdg'
- 'hicolor-icon-theme' 'xdg-utils')
-makedepends=('findutils' 'perlxml' 'krb5')
-options=(!libtool)
-install=$pkgname.install
-source=(http://www.beatniksoftware.com/gimmie/releases/$pkgname-$pkgver.tar.gz)
-md5sums=('721b8ec80f0247e1281aeb4aa5614c2f')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- sed -i 's@^#!.*python$@#!/usr/bin/python2@' gimmie/gimmie_{threads,bar}.py
-
- export CFLAGS="$CFLAGS `pkg-config --cflags glib-2.0`"
- export LDFLAGS="$LDFLAGS `pkg-config --libs glib-2.0`"
-
- export CFLAGS="$CFLAGS `pkg-config --cflags gtk+-2.0`"
- export LDFLAGS="$LDFLAGS `pkg-config --libs gtk+-2.0`"
-
- export CFLAGS="$CFLAGS `pkg-config --cflags pygtk-2.0`"
- export LDFLAGS="$LDFLAGS `pkg-config --libs pygtk-2.0`"
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var --libexecdir="/usr/lib/$pkgname" \
- --disable-static --disable-schemas-install \
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas \
- PYTHON=/usr/bin/python2
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
-}
diff --git a/community/gimmie/gimmie.install b/community/gimmie/gimmie.install
deleted file mode 100644
index 015be0a4d..000000000
--- a/community/gimmie/gimmie.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=gimmie
-
-post_install() {
- gconfpkg --install $pkgname
- xdg-icon-resource forceupdate
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
- xdg-icon-resource forceupdate
-}
diff --git a/community/nbd/nbd.conf.d b/community/nbd/nbd.conf.d
deleted file mode 100644
index d89ca09b1..000000000
--- a/community/nbd/nbd.conf.d
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Configuration for network block device (nbd) daemon
-#
-
-NBD_PORT=2000
-NBD_DEV="/srv/http/sysrcd.dat"
-NBD_ARGS="-r"
-
diff --git a/community/python-sympy/PKGBUILD b/community/python-sympy/PKGBUILD
deleted file mode 100644
index de482e0e5..000000000
--- a/community/python-sympy/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Peter Garceau <RockyChimp@gmail.com>
-pkgname=python-sympy
-pkgver=0.6.7
-pkgrel=2
-pkgdesc="Symbolic manipulation package (Computer Algebra System), written in pure Python"
-url="http://code.google.com/p/sympy"
-license=('BSD')
-depends=('python2')
-conflicts=('sympy')
-provides=('sympy')
-arch=('i686' 'x86_64' 'mips64el')
-source=(http://sympy.googlecode.com/files/sympy-${pkgver}.tar.gz)
-md5sums=('d73e0a5a128f38f930d566110f4b668b')
-
-build() {
- cd "${srcdir}/sympy-${pkgver}"
-
- # python2 fix
- for file in sympy/galgebra/GA.py sympy/galgebra/tests/test_GA.py; do
- sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
- done
- sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' sympy/mpmath/tests/runtests.py
-
- python2 setup.py install --root "${pkgdir}"
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community/python-sympy/test.patch b/community/python-sympy/test.patch
deleted file mode 100644
index 81e00f2db..000000000
--- a/community/python-sympy/test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -216,7 +216,7 @@ setup(
- license = 'BSD',
- url = 'http://code.google.com/p/sympy',
- packages = ['sympy'] + modules + tests + pyglet_packages,
-- scripts = ['bin/isympy', 'bin/test', 'bin/doctest'],
-+ scripts = ['bin/isympy'],
- ext_modules = [],
- package_data = { 'sympy.utilities.mathml' : ['data/*.xsl'] },
- data_files = [('share/man/man1', ['doc/man/isympy.1'])],
diff --git a/community/wine/PKGBUILD b/community/wine/PKGBUILD
deleted file mode 100644
index c9bc1dae8..000000000
--- a/community/wine/PKGBUILD
+++ /dev/null
@@ -1,144 +0,0 @@
-# $Id: PKGBUILD 48061 2011-05-27 19:54:08Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Eduardo Romero <eduardo@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=wine
-pkgver=1.3.21
-pkgrel=1
-
-_pkgbasever=${pkgver/rc/-rc}
-
-source=(http://ibiblio.org/pub/linux/system/emulators/$pkgname/$pkgname-$_pkgbasever.tar.bz2)
-md5sums=('dfcefe48a9aae82f7f1aa4d2c6617961')
-
-pkgdesc="A compatibility layer for running Windows programs"
-url="http://www.winehq.com"
-arch=(i686 x86_64)
-license=(LGPL)
-install=wine.install
-
-depends=(
- fontconfig lib32-fontconfig
- mesa lib32-mesa
- libxcursor lib32-libxcursor
- libxrandr lib32-libxrandr
- libxdamage lib32-libxdamage
- libxxf86dga lib32-libxxf86dga
- alsa-lib lib32-alsa-lib
- desktop-file-utils
-)
-
-makedepends=(autoconf ncurses bison perl fontforge flex prelink
- 'gcc>=4.5.0-2' 'gcc-multilib>=4.5.0-2'
- giflib lib32-giflib
- libxpm lib32-libxpm
- libpng lib32-libpng
- libxinerama lib32-libxinerama
- libxcomposite lib32-libxcomposite
- libxmu lib32-libxmu
- libxxf86vm lib32-libxxf86vm
- libxml2 lib32-libxml2
- libxslt lib32-libxslt
- libldap lib32-libldap
- lcms lib32-lcms
- mpg123 lib32-mpg123
- openal lib32-openal
- jack lib32-jack
- libcups lib32-libcups
- gnutls lib32-gnutls
- v4l-utils lib32-v4l-utils
- oss
-)
-
-optdepends=(
- giflib lib32-giflib
- libpng lib32-libpng
- libldap lib32-libldap
- lcms lib32-lcms
- libxml2 lib32-libxml2
- mpg123 lib32-mpg123
- openal lib32-openal
- jack lib32-jack
- libcups lib32-libcups
- gnutls lib32-gnutls
- v4l-utils lib32-v4l-utils
- oss
-)
-
-if [[ $CARCH == i686 ]]; then
- # Strip lib32 etc. on i686
- depends=(${depends[@]/*32-*/})
- makedepends=(${makedepends[@]/*32-*/})
- makedepends=(${makedepends[@]/*-multilib*/})
- optdepends=(${optdepends[@]/*32-*/})
-else
- provides=("bin32-wine=$pkgver" "wine-wow64=$pkgver")
- conflicts=('bin32-wine' 'wine-wow64')
- replaces=('bin32-wine')
-fi
-
-build() {
- cd "$srcdir"
-
- # Allow ccache to work
- mv $pkgname-$_pkgbasever $pkgname
-
- # Get rid of old build dirs
- rm -rf $pkgname-{32,64}-build
- mkdir $pkgname-32-build
-
- if [[ $CARCH == x86_64 ]]; then
- msg2 "Building Wine-64..."
-
- mkdir $pkgname-64-build
- cd "$srcdir/$pkgname-64-build"
- ../$pkgname/configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --libdir=/usr/lib \
- --with-x \
- --enable-win64
-
- make
-
- _wine32opts=(
- --libdir=/usr/lib32
- --with-wine64="$srcdir/$pkgname-64-build"
- )
-
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- fi
-
- msg2 "Building Wine-32..."
- cd "$srcdir/$pkgname-32-build"
- ../$pkgname/configure \
- --prefix=/usr \
- --sysconfdir=/etc \
- --with-x \
- "${_wine32opts[@]}"
-
- make
-}
-
-package() {
- msg2 "Packaging Wine-32..."
- cd "$srcdir/$pkgname-32-build"
-
- if [[ $CARCH == i686 ]]; then
- make prefix="$pkgdir/usr" install
- else
- make prefix="$pkgdir/usr" \
- libdir="$pkgdir/usr/lib32" \
- dlldir="$pkgdir/usr/lib32/wine" install
-
- msg2 "Packaging Wine-64..."
- cd "$srcdir/$pkgname-64-build"
- make prefix="$pkgdir/usr" \
- libdir="$pkgdir/usr/lib" \
- dlldir="$pkgdir/usr/lib/wine" install
- fi
-}
-
-# vim:set ts=8 sts=2 sw=2 et:
diff --git a/community/wine/wine.install b/community/wine/wine.install
deleted file mode 100644
index f71262186..000000000
--- a/community/wine/wine.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- echo "This wine package is wow64 enabled. This means it can run 32bit/64bit Windows apps on x86_64."
- echo "If you are on x86_64, the default WINEARCH will be win64."
- echo "This will cause a lot of Windows applications to malfunction even if they usually work in wine."
- echo "Please create your ~/.wine with 'WINEARCH=win32 winecfg' if you are unsure and on x86_64."
- echo "See the Arch wiki on wine for more information."
-}
-
-post_remove() {
- update-desktop-database -q
-}
diff --git a/core/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch b/core/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch
deleted file mode 100644
index a7592de09..000000000
--- a/core/mkinitcpio-busybox/loadfont-setfont-optional-psf2-font-support.patch
+++ /dev/null
@@ -1,453 +0,0 @@
-From 8ce1dc03c1b2b61e51527b987579c09c991cc4b2 Mon Sep 17 00:00:00 2001
-From: Harald Becker <ralda@gmx.de>
-Date: Sun, 21 Feb 2010 12:10:26 +0000
-Subject: loadfont/setfont: optional PSF2 font support
-
-Signed-off-by: Harald Becker <ralda@gmx.de>
-Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
----
-diff --git a/console-tools/Config.in b/console-tools/Config.in
-index cd0a931..195685b 100644
---- a/console-tools/Config.in
-+++ b/console-tools/Config.in
-@@ -135,4 +135,21 @@ config SHOWKEY
- help
- Shows keys pressed.
-
-+comment "Common options for loadfont and setfont"
-+ depends on LOADFONT || SETFONT
-+
-+config FEATURE_LOADFONT_PSF2
-+ bool "Support for PSF2 console fonts"
-+ default n
-+ depends on LOADFONT || SETFONT
-+ help
-+ Support PSF2 console fonts.
-+
-+config FEATURE_LOADFONT_RAW
-+ bool "Support for old (raw) console fonts"
-+ default n
-+ depends on LOADFONT || SETFONT
-+ help
-+ Support old (raw) console fonts.
-+
- endmenu
-diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
-index e833474..e51142c 100644
---- a/console-tools/loadfont.c
-+++ b/console-tools/loadfont.c
-@@ -13,7 +13,7 @@
- #include <sys/kd.h>
-
- #ifndef KDFONTOP
--#define KDFONTOP 0x4B72
-+# define KDFONTOP 0x4B72
- struct console_font_op {
- unsigned op; /* KD_FONT_OP_* */
- unsigned flags; /* KD_FONT_FLAG_* */
-@@ -21,91 +21,137 @@ struct console_font_op {
- unsigned charcount;
- unsigned char *data; /* font data with height fixed to 32 */
- };
--
--#define KD_FONT_OP_SET 0 /* Set font */
--#define KD_FONT_OP_GET 1 /* Get font */
--#define KD_FONT_OP_SET_DEFAULT 2 /* Set font to default,
-- data points to name / NULL */
--#define KD_FONT_OP_COPY 3 /* Copy from another console */
--
--#define KD_FONT_FLAG_OLD 0x80000000 /* Invoked via old interface */
--#define KD_FONT_FLAG_DONT_RECALC 1 /* Don't call adjust_height() */
-+# define KD_FONT_OP_SET 0 /* Set font */
-+# define KD_FONT_OP_GET 1 /* Get font */
-+# define KD_FONT_OP_SET_DEFAULT 2 /* Set font to default, data points to name / NULL */
-+# define KD_FONT_OP_COPY 3 /* Copy from another console */
-+# define KD_FONT_FLAG_OLD 0x80000000 /* Invoked via old interface */
-+# define KD_FONT_FLAG_DONT_RECALC 1 /* Don't call adjust_height() */
- /* (Used internally for PIO_FONT support) */
- #endif /* KDFONTOP */
-
-
- enum {
-- PSF_MAGIC1 = 0x36,
-- PSF_MAGIC2 = 0x04,
--
-- PSF_MODE512 = 0x01,
-- PSF_MODEHASTAB = 0x02,
-- PSF_MAXMODE = 0x03,
-- PSF_SEPARATOR = 0xffff
-+ PSF1_MAGIC0 = 0x36,
-+ PSF1_MAGIC1 = 0x04,
-+ PSF1_MODE512 = 0x01,
-+ PSF1_MODEHASTAB = 0x02,
-+ PSF1_MODEHASSEQ = 0x04,
-+ PSF1_MAXMODE = 0x05,
-+ PSF1_STARTSEQ = 0xfffe,
-+ PSF1_SEPARATOR = 0xffff,
- };
-
--struct psf_header {
-- unsigned char magic1, magic2; /* Magic number */
-+struct psf1_header {
-+ unsigned char magic[2]; /* Magic number */
- unsigned char mode; /* PSF font mode */
- unsigned char charsize; /* Character size */
- };
-
--#define PSF_MAGIC_OK(x) ((x)->magic1 == PSF_MAGIC1 && (x)->magic2 == PSF_MAGIC2)
-+#define psf1h(x) ((struct psf1_header*)(x))
-+
-+#define PSF1_MAGIC_OK(x) ( \
-+ (x)->magic[0] == PSF1_MAGIC0 \
-+ && (x)->magic[1] == PSF1_MAGIC1 \
-+)
-+
-+#if ENABLE_FEATURE_LOADFONT_PSF2
-+enum {
-+ PSF2_MAGIC0 = 0x72,
-+ PSF2_MAGIC1 = 0xb5,
-+ PSF2_MAGIC2 = 0x4a,
-+ PSF2_MAGIC3 = 0x86,
-+ PSF2_HAS_UNICODE_TABLE = 0x01,
-+ PSF2_MAXVERSION = 0,
-+ PSF2_STARTSEQ = 0xfe,
-+ PSF2_SEPARATOR = 0xff
-+};
-+
-+struct psf2_header {
-+ unsigned char magic[4];
-+ unsigned int version;
-+ unsigned int headersize; /* offset of bitmaps in file */
-+ unsigned int flags;
-+ unsigned int length; /* number of glyphs */
-+ unsigned int charsize; /* number of bytes for each character */
-+ unsigned int height; /* max dimensions of glyphs */
-+ unsigned int width; /* charsize = height * ((width + 7) / 8) */
-+};
-+
-+#define psf2h(x) ((struct psf2_header*)(x))
-+
-+#define PSF2_MAGIC_OK(x) ( \
-+ (x)->magic[0] == PSF2_MAGIC0 \
-+ && (x)->magic[1] == PSF2_MAGIC1 \
-+ && (x)->magic[2] == PSF2_MAGIC2 \
-+ && (x)->magic[3] == PSF2_MAGIC3 \
-+)
-+#endif /* ENABLE_FEATURE_LOADFONT_PSF2 */
-
--static void do_loadfont(int fd, unsigned char *inbuf, int unit, int fontsize)
-+
-+static void do_loadfont(int fd, unsigned char *inbuf, int height, int width, int charsize, int fontsize)
- {
-- char *buf;
-+ unsigned char *buf;
-+ int charwidth = 32 * ((width+7)/8);
- int i;
-
-- if (unit < 1 || unit > 32)
-- bb_error_msg_and_die("bad character size %d", unit);
-+ if (height < 1 || height > 32 || width < 1 || width > 32)
-+ bb_error_msg_and_die("bad character size %dx%d", height, width);
-
-- buf = xzalloc(16 * 1024);
-+ buf = xzalloc(charwidth * ((fontsize < 128) ? 128 : fontsize));
- for (i = 0; i < fontsize; i++)
-- memcpy(buf + (32 * i), inbuf + (unit * i), unit);
-+ memcpy(buf + (i*charwidth), inbuf + (i*charsize), charsize);
-
- { /* KDFONTOP */
- struct console_font_op cfo;
--
- cfo.op = KD_FONT_OP_SET;
- cfo.flags = 0;
-- cfo.width = 8;
-- cfo.height = unit;
-+ cfo.width = width;
-+ cfo.height = height;
- cfo.charcount = fontsize;
-- cfo.data = (void*)buf;
--#if 0
-- if (!ioctl_or_perror(fd, KDFONTOP, &cfo, "KDFONTOP ioctl failed (will try PIO_FONTX)"))
-- goto ret; /* success */
--#else
-+ cfo.data = buf;
- xioctl(fd, KDFONTOP, &cfo);
--#endif
- }
-
--#if 0
--/* These ones do not honour -C tty (they set font on current tty regardless)
-- * On x86, this distinction is visible on framebuffer consoles
-- * (regular character consoles may have only one shared font anyway)
-- */
--#if defined(PIO_FONTX) && !defined(__sparc__)
-- {
-- struct consolefontdesc cfd;
--
-- cfd.charcount = fontsize;
-- cfd.charheight = unit;
-- cfd.chardata = buf;
--
-- if (!ioctl_or_perror(fd, PIO_FONTX, &cfd, "PIO_FONTX ioctl failed (will try PIO_FONT)"))
-- goto ret; /* success */
-- }
--#endif
-- xioctl(fd, PIO_FONT, buf);
-- ret:
--#endif /* 0 */
- free(buf);
- }
-
--static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
-+/*
-+ * Format of the Unicode information:
-+ *
-+ * For each font position <uc>*<seq>*<term>
-+ * where <uc> is a 2-byte little endian Unicode value (PSF1)
-+ * or an UTF-8 coded value (PSF2),
-+ * <seq> = <ss><uc><uc>*, <ss> = psf1 ? 0xFFFE : 0xFE,
-+ * <term> = psf1 ? 0xFFFF : 0xFF.
-+ * and * denotes zero or more occurrences of the preceding item.
-+ *
-+ * Semantics:
-+ * The leading <uc>* part gives Unicode symbols that are all
-+ * represented by this font position. The following sequences
-+ * are sequences of Unicode symbols - probably a symbol
-+ * together with combining accents - also represented by
-+ * this font position.
-+ *
-+ * Example:
-+ * At the font position for a capital A-ring glyph, we
-+ * may have:
-+ * 00C5,212B,FFFE,0041,030A,FFFF
-+ * Some font positions may be described by sequences only,
-+ * namely when there is no precomposed Unicode value for the glyph.
-+ */
-+#if !ENABLE_FEATURE_LOADFONT_PSF2
-+#define do_loadtable(fd, inbuf, tailsz, fontsize, psf2) \
-+ do_loadtable(fd, inbuf, tailsz, fontsize)
-+#endif
-+static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize, int psf2)
- {
-+#if !ENABLE_FEATURE_LOADFONT_PSF2
-+/* gcc 4.3.1 code size: */
-+# define psf2 0 /* +0 bytes */
-+// const int psf2 = 0; /* +8 bytes */
-+// enum { psf2 = 0 }; /* +13 bytes */
-+#endif
- struct unimapinit advice;
- struct unimapdesc ud;
- struct unipair *up;
-@@ -114,15 +160,48 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
- uint16_t unicode;
-
- maxct = tailsz; /* more than enough */
-- up = xmalloc(maxct * sizeof(struct unipair));
-+ up = xmalloc(maxct * sizeof(*up));
-
- for (glyph = 0; glyph < fontsize; glyph++) {
-- while (tailsz >= 2) {
-- unicode = (((uint16_t) inbuf[1]) << 8) + inbuf[0];
-- tailsz -= 2;
-- inbuf += 2;
-- if (unicode == PSF_SEPARATOR)
-- break;
-+ while (tailsz > 0) {
-+ if (!psf2) { /* PSF1 */
-+ unicode = (((uint16_t) inbuf[1]) << 8) + inbuf[0];
-+ tailsz -= 2;
-+ inbuf += 2;
-+ if (unicode == PSF1_SEPARATOR)
-+ break;
-+ } else { /* PSF2 */
-+#if ENABLE_FEATURE_LOADFONT_PSF2
-+ --tailsz;
-+ unicode = *inbuf++;
-+ if (unicode == PSF2_SEPARATOR) {
-+ break;
-+ } else if (unicode == PSF2_STARTSEQ) {
-+ bb_error_msg_and_die("unicode sequences not implemented");
-+ } else if (unicode >= 0xC0) {
-+ if (unicode >= 0xFC)
-+ unicode &= 0x01, maxct = 5;
-+ else if (unicode >= 0xF8)
-+ unicode &= 0x03, maxct = 4;
-+ else if (unicode >= 0xF0)
-+ unicode &= 0x07, maxct = 3;
-+ else if (unicode >= 0xE0)
-+ unicode &= 0x0F, maxct = 2;
-+ else
-+ unicode &= 0x1F, maxct = 1;
-+ do {
-+ if (tailsz <= 0 || *inbuf < 0x80 || *inbuf > 0xBF)
-+ bb_error_msg_and_die("illegal UTF-8 character");
-+ --tailsz;
-+ unicode = (unicode << 6) + (*inbuf++ & 0x3F);
-+ } while (--maxct > 0);
-+ } else if (unicode >= 0x80) {
-+ bb_error_msg_and_die("illegal UTF-8 character");
-+ }
-+#else
-+ return;
-+#endif
-+ }
- up[ct].unicode = unicode;
- up[ct].fontpos = glyph;
- ct++;
-@@ -139,58 +218,78 @@ static void do_loadtable(int fd, unsigned char *inbuf, int tailsz, int fontsize)
- ud.entry_ct = ct;
- ud.entries = up;
- xioctl(fd, PIO_UNIMAP, &ud);
-+#undef psf2
- }
-
--static void do_load(int fd, struct psf_header *psfhdr, size_t len)
-+static void do_load(int fd, unsigned char *buffer, size_t len)
- {
-- int unit;
-- int fontsize;
-- int hastable;
-- unsigned head0, head = head;
--
-- /* test for psf first */
-- if (len >= sizeof(struct psf_header) && PSF_MAGIC_OK(psfhdr)) {
-- if (psfhdr->mode > PSF_MAXMODE)
-+ int height;
-+ int width = 8;
-+ int charsize;
-+ int fontsize = 256;
-+ int has_table = 0;
-+ unsigned char *font = buffer;
-+ unsigned char *table;
-+
-+ if (len >= sizeof(struct psf1_header) && PSF1_MAGIC_OK(psf1h(buffer))) {
-+ if (psf1h(buffer)->mode > PSF1_MAXMODE)
- bb_error_msg_and_die("unsupported psf file mode");
-- fontsize = ((psfhdr->mode & PSF_MODE512) ? 512 : 256);
--#if !defined(PIO_FONTX) || defined(__sparc__)
-- if (fontsize != 256)
-- bb_error_msg_and_die("only fontsize 256 supported");
-+ if (psf1h(buffer)->mode & PSF1_MODE512)
-+ fontsize = 512;
-+ if (psf1h(buffer)->mode & PSF1_MODEHASTAB)
-+ has_table = 1;
-+ height = charsize = psf1h(buffer)->charsize;
-+ font += sizeof(struct psf1_header);
-+ } else
-+#if ENABLE_FEATURE_LOADFONT_PSF2
-+ if (len >= sizeof(struct psf2_header) && PSF2_MAGIC_OK(psf2h(buffer))) {
-+ if (psf2h(buffer)->version > PSF2_MAXVERSION)
-+ bb_error_msg_and_die("unsupported psf file version");
-+ fontsize = psf2h(buffer)->length;
-+ if (psf2h(buffer)->flags & PSF2_HAS_UNICODE_TABLE)
-+ has_table = 2;
-+ charsize = psf2h(buffer)->charsize;
-+ height = psf2h(buffer)->height;
-+ width = psf2h(buffer)->width;
-+ font += psf2h(buffer)->headersize;
-+ } else
- #endif
-- hastable = (psfhdr->mode & PSF_MODEHASTAB);
-- unit = psfhdr->charsize;
-- head0 = sizeof(struct psf_header);
--
-- head = head0 + fontsize * unit;
-- if (head > len || (!hastable && head != len))
-- bb_error_msg_and_die("input file: bad length");
-- } else {
-- /* file with three code pages? */
-- if (len == 9780) {
-- head0 = 40;
-- unit = 16;
-- } else {
-- /* bare font */
-- if (len & 0377)
-- bb_error_msg_and_die("input file: bad length");
-- head0 = 0;
-- unit = len / 256;
-- }
-- fontsize = 256;
-- hastable = 0;
-+#if ENABLE_FEATURE_LOADFONT_RAW
-+ if (len == 9780) { /* file with three code pages? */
-+ charsize = height = 16;
-+ font += 40;
-+ } else if ((len & 0377) == 0) { /* bare font */
-+ charsize = height = len / 256;
-+ } else
-+#endif
-+ {
-+ bb_error_msg_and_die("input file: bad length or unsupported font type");
- }
-
-- do_loadfont(fd, (unsigned char *)psfhdr + head0, unit, fontsize);
-- if (hastable)
-- do_loadtable(fd, (unsigned char *)psfhdr + head, len - head, fontsize);
-+#if !defined(PIO_FONTX) || defined(__sparc__)
-+ if (fontsize != 256)
-+ bb_error_msg_and_die("only fontsize 256 supported");
-+#endif
-+
-+ table = font + fontsize * charsize;
-+ buffer += len;
-+
-+ if (table > buffer || (!has_table && table != buffer))
-+ bb_error_msg_and_die("input file: bad length");
-+
-+ do_loadfont(fd, font, height, width, charsize, fontsize);
-+
-+ if (has_table)
-+ do_loadtable(fd, table, buffer - table, fontsize, has_table - 1);
- }
-
-+
- #if ENABLE_LOADFONT
- int loadfont_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int loadfont_main(int argc UNUSED_PARAM, char **argv)
- {
- size_t len;
-- struct psf_header *psfhdr;
-+ unsigned char *buffer;
-
- // no arguments allowed!
- opt_complementary = "=0";
-@@ -202,11 +301,11 @@ int loadfont_main(int argc UNUSED_PARAM, char **argv)
- * just read the entire file.
- */
- len = 32*1024; // can't be larger
-- psfhdr = xmalloc_read(STDIN_FILENO, &len);
-+ buffer = xmalloc_read(STDIN_FILENO, &len);
- // xmalloc_open_zipped_read_close(filename, &len);
-- if (!psfhdr)
-+ if (!buffer)
- bb_perror_msg_and_die("error reading input font");
-- do_load(get_console_fd_or_die(), psfhdr, len);
-+ do_load(get_console_fd_or_die(), buffer, len);
-
- return EXIT_SUCCESS;
- }
-@@ -269,7 +368,7 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
- size_t len;
- unsigned opts;
- int fd;
-- struct psf_header *psfhdr;
-+ unsigned char *buffer;
- char *mapfilename;
- const char *tty_name = CURRENT_TTY;
-
-@@ -287,10 +386,10 @@ int setfont_main(int argc UNUSED_PARAM, char **argv)
- }
- // load font
- len = 32*1024; // can't be larger
-- psfhdr = xmalloc_open_zipped_read_close(*argv, &len);
-- if (!psfhdr)
-+ buffer = xmalloc_open_zipped_read_close(*argv, &len);
-+ if (!buffer)
- bb_simple_perror_msg_and_die(*argv);
-- do_load(fd, psfhdr, len);
-+ do_load(fd, buffer, len);
-
- // load the screen map, if any
- if (opts & 1) { // -m
---
-cgit v0.8.2.1
diff --git a/core/udev/01-settle.patch b/core/udev/01-settle.patch
deleted file mode 100644
index 88e23d2a2..000000000
--- a/core/udev/01-settle.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 2738ec2cf721db0c0deac2ba0abdc73cf7739e9f Mon Sep 17 00:00:00 2001
-From: Kay Sievers <kay.sievers@vrfy.org>
-Date: Mon, 16 May 2011 13:17:48 +0200
-Subject: [PATCH 1/7] udevd: create queue file before daemonizing to reliably
- block 'settle'
-
----
- udev/udevd.c | 22 ++++++++++++----------
- 1 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/udev/udevd.c b/udev/udevd.c
-index be4b071..258d787 100644
---- a/udev/udevd.c
-+++ b/udev/udevd.c
-@@ -1408,6 +1408,13 @@ int main(int argc, char *argv[])
-
- udev_monitor_set_receive_buffer_size(monitor, 128*1024*1024);
-
-+ /* create queue file before signalling 'ready', to make sure we block 'settle' */
-+ udev_queue_export = udev_queue_export_new(udev);
-+ if (udev_queue_export == NULL) {
-+ err(udev, "error creating queue file\n");
-+ goto exit;
-+ }
-+
- if (daemonize) {
- pid_t pid;
- int fd;
-@@ -1421,8 +1428,8 @@ int main(int argc, char *argv[])
- rc = 4;
- goto exit;
- default:
-- rc = 0;
-- goto exit;
-+ rc = EXIT_SUCCESS;
-+ goto exit_keep_queue;
- }
-
- setsid();
-@@ -1521,12 +1528,6 @@ int main(int argc, char *argv[])
- goto exit;
- }
-
-- udev_queue_export = udev_queue_export_new(udev);
-- if (udev_queue_export == NULL) {
-- err(udev, "error creating queue file\n");
-- goto exit;
-- }
--
- memset(&ep_ctrl, 0, sizeof(struct epoll_event));
- ep_ctrl.events = EPOLLIN;
- ep_ctrl.data.fd = fd_ctrl;
-@@ -1708,9 +1709,10 @@ int main(int argc, char *argv[])
- }
- }
-
-- udev_queue_export_cleanup(udev_queue_export);
-- rc = 0;
-+ rc = EXIT_SUCCESS;
- exit:
-+ udev_queue_export_cleanup(udev_queue_export);
-+exit_keep_queue:
- if (fd_ep >= 0)
- close(fd_ep);
- worker_list_cleanup(udev);
---
-1.7.5.1
-
diff --git a/core/udev/02-settle.patch b/core/udev/02-settle.patch
deleted file mode 100644
index 4bcb7fdde..000000000
--- a/core/udev/02-settle.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 12f79fb0b9c919787d8a7d4307895d3d6b4b029b Mon Sep 17 00:00:00 2001
-From: Nix <nix@esperi.org.uk>
-Date: Mon, 16 May 2011 22:51:38 +0200
-Subject: [PATCH 7/7] libudev: queue - accept NULL passed into
- udev_queue_export_cleanup()
-
----
- libudev/libudev-queue-private.c | 3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/libudev/libudev-queue-private.c b/libudev/libudev-queue-private.c
-index 0dcf9b0..6e13d8a 100644
---- a/libudev/libudev-queue-private.c
-+++ b/libudev/libudev-queue-private.c
-@@ -104,9 +104,10 @@ void udev_queue_export_cleanup(struct udev_queue_export *udev_queue_export)
- {
- char filename[UTIL_PATH_SIZE];
-
-+ if (udev_queue_export == NULL)
-+ return;
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.tmp", NULL);
- unlink(filename);
--
- util_strscpyl(filename, sizeof(filename), udev_get_run_path(udev_queue_export->udev), "/queue.bin", NULL);
- unlink(filename);
- }
---
-1.7.5.1
-
diff --git a/core/udev/cdsymlinks.sh b/core/udev/cdsymlinks.sh
deleted file mode 100755
index 498abda4a..000000000
--- a/core/udev/cdsymlinks.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-# Creates cdsymlinks in /dev
-# for Archlinux by Tobias Powalowski <tpowa@archlinux.org>
-
-# check on cd/dvd drives and if persistant rules file is used
-if [ -d /dev/cd -a ! -e /etc/udev/rules.d/75-persistent-cd.rules ]; then
- # remove existing device files
- rm /dev/cdrom*
- rm /dev/cdrw*
- rm /dev/dvd*
- rm /dev/dvdrw*
- # start creating symlinks
- for i in /dev/cd/cdrom-*; do
- if [ -h $i ]; then
- [ "$CD_NUMBER" = "" ] && ln -s $i /dev/cdrom
- [ "$CD_NUMBER" = "" ] && CD_NUMBER="-1"
- ! [ "$CD_NUMBER" = "" ] && CD_NUMBER="$((CD_NUMBER+1))" && ln -s $i /dev/cdrom$CD_NUMBER
- fi
- done
-
- for i in /dev/cd/cdrw-*; do
- if [ -h $i ]; then
- [ "$CDRW_NUMBER" = "" ] && ln -s $i /dev/cdrw
- [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="-1"
- ! [ "$CDRW_NUMBER" = "" ] && CDRW_NUMBER="$((CDRW_NUMBER+1))" && ln -s $i /dev/cdrw$CDRW_NUMBER
- fi
- done
-
- for i in /dev/cd/dvd-*; do
- if [ -h $i ]; then
- [ "$DVD_NUMBER" = "" ] && ln -s $i /dev/dvd
- [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="-1"
- ! [ "$DVD_NUMBER" = "" ] && DVD_NUMBER="$((DVD_NUMBER+1))" && ln -s $i /dev/dvd$DVD_NUMBER
- fi
- done
-
- for i in /dev/cd/dvdrw-*; do
- if [ -h $i ]; then
- [ "$DVDRW_NUMBER" = "" ] && ln -s $i /dev/dvdrw
- [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="-1"
- ! [ "$DVDRW_NUMBER" = "" ] && DVDRW_NUMBER="$((DVDRW_NUMBER+1))" && ln -s $i /dev/dvdrw$DVDRW_NUMBER
- fi
- done
-fi
diff --git a/extra/xorg-server/glx-pixmap-crash.patch b/extra/xorg-server/glx-pixmap-crash.patch
deleted file mode 100644
index 48f258eb5..000000000
--- a/extra/xorg-server/glx-pixmap-crash.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 390ba6686d1baf80627c01d4a4273981d6606cc9 Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Mon, 28 Mar 2011 16:30:09 +0000
-Subject: glx: Fix lifetime tracking for pixmaps
-
-GLX pixmaps take a reference on the underlying pixmap; X and GLX pixmap
-IDs can be destroyed in either order with no error. Only windows need
-to be tracked under both XIDs.
-
-Fixes piglit/glx-pixmap-life.
-
-Reviewed-by: Michel Dänzer <michel@daenzer.net>
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
-diff --git a/glx/glxcmds.c b/glx/glxcmds.c
-index 66d4c7e..d5b764f 100644
---- a/glx/glxcmds.c
-+++ b/glx/glxcmds.c
-@@ -1127,10 +1127,11 @@ DoCreateGLXDrawable(ClientPtr client, __GLXscreen *pGlxScreen,
- return BadAlloc;
- }
-
-- /* Add the glx drawable under the XID of the underlying X drawable
-- * too. That way we'll get a callback in DrawableGone and can
-- * clean up properly when the drawable is destroyed. */
-- if (drawableId != glxDrawableId &&
-+ /*
-+ * Windows aren't refcounted, so track both the X and the GLX window
-+ * so we get called regardless of destruction order.
-+ */
-+ if (drawableId != glxDrawableId && type == GLX_DRAWABLE_WINDOW &&
- !AddResource(pDraw->id, __glXDrawableRes, pGlxDraw)) {
- pGlxDraw->destroy (pGlxDraw);
- return BadAlloc;
-@@ -1161,6 +1162,8 @@ DoCreateGLXPixmap(ClientPtr client, __GLXscreen *pGlxScreen, __GLXconfig *config
- err = DoCreateGLXDrawable(client, pGlxScreen, config, pDraw, drawableId,
- glxDrawableId, GLX_DRAWABLE_PIXMAP);
-
-+ ((PixmapPtr)pDraw)->refcnt++;
-+
- return err;
- }
-
-diff --git a/glx/glxext.c b/glx/glxext.c
-index 3f3dd79..9cfc096 100644
---- a/glx/glxext.c
-+++ b/glx/glxext.c
-@@ -118,15 +118,15 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
- {
- __GLXcontext *c, *next;
-
-- /* If this drawable was created using glx 1.3 drawable
-- * constructors, we added it as a glx drawable resource under both
-- * its glx drawable ID and it X drawable ID. Remove the other
-- * resource now so we don't a callback for freed memory. */
-- if (glxPriv->drawId != glxPriv->pDraw->id) {
-- if (xid == glxPriv->drawId)
-- FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE);
-- else
-- FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
-+ if (glxPriv->type == GLX_DRAWABLE_WINDOW) {
-+ /* If this was created by glXCreateWindow, free the matching resource */
-+ if (glxPriv->drawId != glxPriv->pDraw->id) {
-+ if (xid == glxPriv->drawId)
-+ FreeResourceByType(glxPriv->pDraw->id, __glXDrawableRes, TRUE);
-+ else
-+ FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
-+ }
-+ /* otherwise this window was implicitly created by MakeCurrent */
- }
-
- for (c = glxAllContexts; c; c = next) {
-@@ -143,6 +143,10 @@ static Bool DrawableGone(__GLXdrawable *glxPriv, XID xid)
- c->readPriv = NULL;
- }
-
-+ /* drop our reference to any backing pixmap */
-+ if (glxPriv->type == GLX_DRAWABLE_PIXMAP)
-+ glxPriv->pDraw->pScreen->DestroyPixmap((PixmapPtr)glxPriv->pDraw);
-+
- glxPriv->destroy(glxPriv);
-
- return True;
---
-cgit v0.8.3-6-g21f6
generated by cgit v1.2.3-54-g00ecf (git 2.45.2) at 2024-11-23 17:05:22 +0000