diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2011-08-11 14:14:47 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2011-08-11 14:14:47 +0000 |
commit | 1a6b0f4a655e1fbda776cbb34f56a5fa061c27c7 (patch) | |
tree | 85cd7d8ae544be369cd00c35bac95c6ee2564dbc | |
parent | e81c6fe4fb38144709923b2da3ab68a01712a26b (diff) |
Thu Aug 11 14:14:47 UTC 2011
-rw-r--r-- | community-staging/ruby-atk/PKGBUILD | 26 | ||||
-rw-r--r-- | community-staging/ruby-gdkpixbuf2/PKGBUILD | 27 | ||||
-rw-r--r-- | community-staging/ruby-gio2/PKGBUILD | 24 | ||||
-rw-r--r-- | community-staging/ruby-glib2/PKGBUILD | 26 | ||||
-rw-r--r-- | community-staging/ruby-pango/PKGBUILD | 26 | ||||
-rw-r--r-- | community-testing/fpc/Makefile-mk382.diff | 174 | ||||
-rw-r--r-- | community-testing/fpc/PKGBUILD | 58 | ||||
-rw-r--r-- | community/java-oracle/java-control-panel.desktop | 12 | ||||
-rw-r--r-- | community/java-oracle/java-web-start.desktop | 13 | ||||
-rw-r--r-- | community/ruby-gtk2/mkmf-gnome2.patch | 31 | ||||
-rw-r--r-- | extra/aterm/ChangeLog | 6 | ||||
-rw-r--r-- | extra/flac/ChangeLog | 5 | ||||
-rw-r--r-- | extra/glib/ChangeLog | 11 | ||||
-rw-r--r-- | extra/nedit/ChangeLog | 5 | ||||
-rw-r--r-- | extra/rubberband/rubberband.changelog | 11 | ||||
-rw-r--r-- | extra/vamp-plugin-sdk/vamp-plugin-sdk.changelog | 11 | ||||
-rw-r--r-- | extra/xorg-server/git-fixes.patch | 318 | ||||
-rw-r--r-- | extra/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch | 16 |
18 files changed, 0 insertions, 800 deletions
diff --git a/community-staging/ruby-atk/PKGBUILD b/community-staging/ruby-atk/PKGBUILD deleted file mode 100644 index 2787f8556..000000000 --- a/community-staging/ruby-atk/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 53612 2011-08-07 01:11:19Z bfanella $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -# Contributor: kritoke <kritoke@nospam.gmail.com> - -pkgname=ruby-atk -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Ruby bindings for atk." -arch=('i686' 'x86_64') -url="http://ruby-gnome2.sourceforge.jp" -license=('LGPL') -depends=('ruby-glib2') -makedepends=('ruby-glib2' 'atk' 'ruby-pkgconfig') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') - -build() { - cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb atk --topdir=$pkgdir - make -} -package() { - cd "$srcdir/ruby-gtk2-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/ruby-gdkpixbuf2/PKGBUILD b/community-staging/ruby-gdkpixbuf2/PKGBUILD deleted file mode 100644 index 7298e2339..000000000 --- a/community-staging/ruby-gdkpixbuf2/PKGBUILD +++ /dev/null @@ -1,27 +0,0 @@ -# $Id: PKGBUILD 53620 2011-08-07 02:18:34Z bfanella $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -# Contributor: kritoke <kritoke@nospam.gmail.com> - -pkgname=ruby-gdkpixbuf2 -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Ruby bindings for gdkpixbuf2." -arch=('i686' 'x86_64') -url="http://ruby-gnome2.sourceforge.jp" -license=('LGPL') -depends=('ruby-glib2' 'gtk2') -makedepends=('ruby-glib2' 'ruby-pkgconfig') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') - -build() { - cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb gdk_pixbuf2 --topdir=$pkgdir - make -} -package() { - cd "$srcdir/ruby-gtk2-$pkgver" - mkdir -p $pkgdir/usr/lib/pkgconfig - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/ruby-gio2/PKGBUILD b/community-staging/ruby-gio2/PKGBUILD deleted file mode 100644 index 297f60085..000000000 --- a/community-staging/ruby-gio2/PKGBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# $Id: PKGBUILD 31087 2010-10-27 01:37:14Z bfanella $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> - -pkgname=ruby-gio2 -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Ruby bindings for gio2." -arch=('i686' 'x86_64') -url="http://ruby-gnome2.sourceforge.jp" -license=('LGPL') -depends=('ruby-glib2') -makedepends=('ruby-pkgconfig') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') - -build() { - cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb gio2 --topdir=$pkgdir - make -} -package() { - cd "$srcdir/ruby-gtk2-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/ruby-glib2/PKGBUILD b/community-staging/ruby-glib2/PKGBUILD deleted file mode 100644 index fb2a1fac3..000000000 --- a/community-staging/ruby-glib2/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 53576 2011-08-05 22:47:58Z bfanella $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -# Contributor: kritoke <kritoke@nospam.gmail.com> - -pkgname=ruby-glib2 -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Ruby bindings for glib2." -arch=('i686' 'x86_64') -url="http://ruby-gnome2.sourceforge.jp" -license=('LGPL') -depends=('ruby') -makedepends=('ruby-pkgconfig') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') - -build() { - cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb glib2 --topdir=$pkgdir - make -} -package() { - cd "$srcdir/ruby-gtk2-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-staging/ruby-pango/PKGBUILD b/community-staging/ruby-pango/PKGBUILD deleted file mode 100644 index 1f20c7a3d..000000000 --- a/community-staging/ruby-pango/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# $Id: PKGBUILD 53626 2011-08-07 02:29:56Z bfanella $ -# Maintainer: Brad Fanella <bradfanella@archlinux.us> -# Contributor: Bjorn Lindeijer <bjorn@lindeijer.nl> -# Contributor: kritoke <kritoke@nospam.gmail.com> - -pkgname=ruby-pango -pkgver=1.0.0 -pkgrel=1 -pkgdesc="Ruby bindings for pango." -arch=('i686' 'x86_64') -url="http://ruby-gnome2.sourceforge.jp" -license=('LGPL') -depends=('ruby-glib2' 'ruby-cairo') -makedepends=('ruby-glib2' 'pango' 'ruby-pkgconfig' 'ruby-cairo') -source=(http://downloads.sourceforge.net/ruby-gnome2/ruby-gtk2-$pkgver.tar.gz) -md5sums=('e9711eb5bd88debda90a920deb96d7d0') - -build() { - cd "$srcdir/ruby-gtk2-$pkgver" - ruby extconf.rb pango --topdir=$pkgdir - make -} -package() { - cd "$srcdir/ruby-gtk2-$pkgver" - make DESTDIR="$pkgdir" install -} diff --git a/community-testing/fpc/Makefile-mk382.diff b/community-testing/fpc/Makefile-mk382.diff deleted file mode 100644 index 00909766d..000000000 --- a/community-testing/fpc/Makefile-mk382.diff +++ /dev/null @@ -1,174 +0,0 @@ ---- Makefile.fpc.orig 2011-04-02 01:15:34.000000000 +0400 -+++ Makefile.fpc 2011-08-05 22:29:44.000000000 +0400 -@@ -4,7 +4,7 @@ - - [package] - name=compiler --version=2.4.4 -+version=2.5.1 - - [target] - programs=pp -@@ -32,7 +32,7 @@ - unexport FPC_VERSION FPC_COMPILERINFO - - # Which platforms are ready for inclusion in the cycle --CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb # mipsel mips -+CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr - - # All supported targets used for clean - ALLTARGETS=$(CYCLETARGETS) -@@ -148,6 +148,12 @@ - ifeq ($(CPC_TARGET),arm) - CPUSUF=arm - endif -+ifeq ($(CPC_TARGET),mips) -+CPUSUF=mips -+endif -+ifeq ($(CPC_TARGET),mipsel) -+CPUSUF=mipsel -+endif - - # Do not define the default -d$(CPU_TARGET) because that - # will conflict with our -d$(CPC_TARGET) -@@ -224,12 +230,39 @@ - override LOCALOPT+= - endif - -+# mipsel specific -+ifeq ($(PPC_TARGET),mipsel) -+override LOCALOPT+=-Fumips -+endif -+ -+ -+OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo -+OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo -+# symbol liveness WPO requires nm, smart linking and no stripping (the latter -+# is forced by the Makefile when necessary) -+ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),) -+ifdef LINKSMART -+ifdef CREATESMART -+OPTWPOCOLLECT+=-OWsymbolliveness -Xs- -+OPTWPOPERFORM+=-Owsymbolliveness -+endif -+endif -+endif -+ -+ - [rules] - ##################################################################### - # Setup Targets - ##################################################################### - - ifeq ($(OS_TARGET),win32) -+USE_CMP_FOR_DIFF=1 -+endif -+ifeq ($(OS_TARGET),win64) -+USE_CMP_FOR_DIFF=1 -+endif -+ -+ifdef USE_CMP_FOR_DIFF - ifdef CMP - override DIFF:=$(CMP) -i218 - endif -@@ -267,6 +300,8 @@ - TEMPNAME1=ppc1$(EXEEXT) - TEMPNAME2=ppc2$(EXEEXT) - TEMPNAME3=ppc3$(EXEEXT) -+TEMPWPONAME1=ppcwpo1$(EXEEXT) -+TEMPWPONAME2=ppcwpo2$(EXEEXT) - MAKEDEP=ppdep$(EXEEXT) - MSG2INC=./msg2inc$(EXEEXT) - ifdef CROSSINSTALL -@@ -327,15 +362,15 @@ - -$(DEL) $(addsuffix /*$(PPUEXT),$(COMPILERSOURCEDIR)) - - tempclean: -- -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) -+ -$(DEL) $(PPCROSSNAME) $(TEMPNAME) $(TEMPNAME1) $(TEMPNAME2) $(TEMPNAME3) $(MSG2INC) pp1.wpo pp2.wpo - - execlean : -- -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME) -+ -$(DEL) ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME) $(TEMPWPONAME1) $(TEMPWPONAME2) - - $(addsuffix _clean,$(ALLTARGETS)): - -$(DELTREE) $(addprefix $(subst _clean,,$@),/units) - -$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)) -- -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME)) -+ -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) ppcppc64$(EXEEXT) ppcarm$(EXEEXT) ppcmips$(EXEEXT) ppcmipsel$(EXEEXT) $(EXENAME)) - - cycleclean: cleanall $(addsuffix _clean,$(CPC_TARGET)) - -$(DEL) $(EXENAME) -@@ -444,6 +479,28 @@ - # Normal cycle - # - -+ifndef NOWPOCYCLE -+ifdef RELEASE -+DOWPOCYCLE=1 -+# Two WPO cycles in case of RELEASE=1 -+wpocycle: -+# don't use cycle_clean, it will delete the compiler utilities again -+ $(RM) $(EXENAME) -+ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOCOLLECT)' compiler -+ $(RM) $(EXENAME) -+ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(RTLOPT) $(OPTWPOPERFORM)' rtlclean rtl -+ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OPT=$(LOCALOPT) $(OPTWPOPERFORM) $(subst pp1.wpo,pp2.wpo,$(OPTWPOCOLLECT))' $(addsuffix _clean,$(ALLTARGETS)) compiler -+ $(MOVE) $(EXENAME) $(TEMPWPONAME1) -+ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(RTLOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' rtlclean rtl -+ $(MAKE) 'FPC=$(BASEDIR)/$(TEMPWPONAME1)' 'OPT=$(LOCALOPT) $(subst pp1.wpo,pp2.wpo,$(OPTWPOPERFORM))' $(addsuffix _clean,$(ALLTARGETS)) compiler -+ $(COPY) $(EXENAME) $(TEMPWPONAME2) -+endif -+endif -+ -+ifndef DOWPOCYCLE -+wpocycle: -+endif -+ - # Used to avoid unnecessary steps - ifdef DIFF - ifdef OLDFPC -@@ -490,6 +547,7 @@ - $(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME3)' 'OLDFPC=$(BASEDIR)/$(TEMPNAME2)' next - $(DIFF) $(TEMPNAME3) $(EXENAME) - $(MAKE) $(addsuffix _all,$(TARGET_DIRS)) 'FPC=$(BASEDIR)/$(EXENAME)' -+ $(MAKE) wpocycle - $(MAKE) echotime - - else -@@ -508,8 +566,11 @@ - # ppc<ARCH> (target native) - ifndef CROSSINSTALL - $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl -+# building a native compiler for embedded targets is not possible -+ifneq ($(OS_TARGET),embedded) - $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler - endif -+endif - - endif - -@@ -523,10 +584,10 @@ - # ppc3/ppcXXX = native (skipped for cross installation) - # - -+cycle: override FPC= - cycle: - # ppc (source native) - # Clear detected compiler binary, because it can be existing crosscompiler binary, but we need native compiler here --override FPC= - $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 rtlclean rtl - $(MAKE) OS_TARGET=$(OS_SOURCE) CPU_TARGET=$(CPU_SOURCE) EXENAME=$(TEMPNAME) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 cycleclean compiler - # ppcross<ARCH> (source native) -@@ -535,8 +596,11 @@ - # ppc<ARCH> (target native) - ifndef CROSSINSTALL - $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' rtlclean rtl -+# building a native compiler for embedded targets is not possible -+ifneq ($(OS_TARGET),embedded) - $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(OPT) $(CROSSOPT)' cycleclean compiler - endif -+endif - - endif - diff --git a/community-testing/fpc/PKGBUILD b/community-testing/fpc/PKGBUILD deleted file mode 100644 index 5a1002143..000000000 --- a/community-testing/fpc/PKGBUILD +++ /dev/null @@ -1,58 +0,0 @@ -# $Id: PKGBUILD 53690 2011-08-07 20:47:34Z spupykin $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> -# Contributor: Valeriy Lyasotskiy <onestep@ukr.net> -# Contributor: Jan Willemson <janwil@hot.ee> -# Contributor: Hugo Ideler <hugoideler@dse.nl> -# Original PKGBUILD: Andre Naumann <anaumann@SPARCed.org> -# See http://bbs.archlinux.org/viewtopic.php?t=9318&highlight=fpc - -pkgname=fpc -pkgver=2.4.4 -pkgrel=2 -pkgdesc="The Free Pascal Compiler is a Turbo Pascal 7.0 and Delphi compatible 32bit Pascal Compiler. It comes with fully TP 7.0 compatible run-time library." -arch=('i686' 'x86_64') -url="http://www.freepascal.org/" -license=('GPL' 'LGPL' 'custom') -backup=("etc/fpc.cfg") -depends=(ncurses) -makedepends=(fpc) -options=(zipman) -source=(ftp://ftp.freepascal.org/pub/fpc/dist/$pkgver/source/fpcbuild-$pkgver.tar.gz - Makefile-mk382.diff) -md5sums=('d069dfd3412bd0d26dcd1b81ac998305' - 'a2242d261b055d08fa4d70e88ca1d1a7') - -build() { - cd ${srcdir}/fpcbuild-$pkgver - pushd fpcsrc/compiler - patch -uN Makefile.fpc $srcdir/Makefile-mk382.diff - fpcmake -Tall - popd - make NOGDB=1 build - make NOGDB=1 build OS_TARGET=win32 CPU_TARGET=i386 -} - -package() { - cd ${srcdir}/fpcbuild-$pkgver - - export HOME=$srcdir - - make -j1 NOGDB=1 PREFIX=${pkgdir}/usr install - - make NOGDB=1 PREFIX=${pkgdir}/usr crossinstall OS_TARGET=win32 CPU_TARGET=i386 - ln -s /usr/lib/fpc/$pkgver/ppcross386 $pkgdir/usr/bin/ppcross386 - - # install package license - install -m 755 -d ${pkgdir}/usr/share/licenses/${pkgname} - install -m 644 fpcsrc/rtl/COPYING.FPC ${pkgdir}/usr/share/licenses/${pkgname}/ - - # create symlink for compiler - [ "$CARCH" = "i686" ] && ln -s /usr/lib/fpc/${pkgver}/ppc386 ${pkgdir}/usr/bin/ - [ "$CARCH" = "x86_64" ] && ln -s /usr/lib/fpc/${pkgver}/ppcx64 ${pkgdir}/usr/bin/ - - # install sample config file - mkdir -p ${pkgdir}/etc - ${pkgdir}/usr/lib/fpc/${pkgver}/samplecfg /usr/lib/fpc/${pkgver} ${pkgdir}/etc - - mv $pkgdir/usr/man $pkgdir/usr/share/ -} diff --git a/community/java-oracle/java-control-panel.desktop b/community/java-oracle/java-control-panel.desktop deleted file mode 100644 index 476e04a82..000000000 --- a/community/java-oracle/java-control-panel.desktop +++ /dev/null @@ -1,12 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/bin/jcontrol -GenericName[cs]=Nastavení prostředí Java -GenericName=Java Environment Settings -Icon=java -Name[cs]=Nastavení Javy -Name=Java Control Panel -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Settings;Java; diff --git a/community/java-oracle/java-web-start.desktop b/community/java-oracle/java-web-start.desktop deleted file mode 100644 index a8a25f9e2..000000000 --- a/community/java-oracle/java-web-start.desktop +++ /dev/null @@ -1,13 +0,0 @@ -[Desktop Entry] -Exec=/opt/java/jre/bin/javaws-launcher %f -GenericName[cs]=Spravovat a spouštět aplikace Java Web Start -GenericName=Manage and run Java Web Start Applications -Icon=java -MimeType=application/x-java-jnlp-file; -Name[cs]=Java Web Start -Name=Java Web Start -Path= -StartupNotify=true -Terminal=false -Type=Application -Categories=Network;Java; diff --git a/community/ruby-gtk2/mkmf-gnome2.patch b/community/ruby-gtk2/mkmf-gnome2.patch deleted file mode 100644 index bf877cf9c..000000000 --- a/community/ruby-gtk2/mkmf-gnome2.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- glib2/lib/mkmf-gnome2.rb.orig 2011-04-12 14:51:53.223390976 +0200 -+++ glib2/lib/mkmf-gnome2.rb 2011-04-12 14:52:21.240120725 +0200 -@@ -366,20 +366,19 @@ - rescue LoadError - end - end -+ return false if rcairo_source_dir.nil? && !(PKGConfig.have_package('cairo') && have_header('rb_cairo.h')) - -- unless rcairo_source_dir.nil? -- if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM -- options = {} -- build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}" -- if File.exist?(File.join(rcairo_source_dir, build_dir)) -- options[:target_build_dir] = build_dir -- end -- add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options) -- $defs << "-DRUBY_CAIRO_PLATFORM_WIN32" -+ if /mingw|cygwin|mswin32/ =~ RUBY_PLATFORM -+ options = {} -+ build_dir = "tmp/#{RUBY_PLATFORM}/cairo/#{RUBY_VERSION}" -+ if File.exist?(File.join(rcairo_source_dir, build_dir)) -+ options[:target_build_dir] = build_dir - end -- $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo" -+ add_depend_package("cairo", "ext/cairo", rcairo_source_dir, options) -+ $defs << "-DRUBY_CAIRO_PLATFORM_WIN32" - end - -+ $CFLAGS += " -I#{rcairo_source_dir}/ext/cairo" - PKGConfig.have_package('cairo') and have_header('rb_cairo.h') - end diff --git a/extra/aterm/ChangeLog b/extra/aterm/ChangeLog deleted file mode 100644 index f099aa027..000000000 --- a/extra/aterm/ChangeLog +++ /dev/null @@ -1,6 +0,0 @@ -2009-07-28 Eric Belanger <eric@archlinux.org> - - * aterm 1.0.1-2 - * FHS man pages - * Added libxt makedepends - * Added ChangeLog diff --git a/extra/flac/ChangeLog b/extra/flac/ChangeLog deleted file mode 100644 index e7790cb1a..000000000 --- a/extra/flac/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2009-08-01 Eric Belanger <eric@archlinux.org> - - * flac 1.2.1-2 - * FHS man pages - * Added ChangeLog diff --git a/extra/glib/ChangeLog b/extra/glib/ChangeLog deleted file mode 100644 index a809a01d1..000000000 --- a/extra/glib/ChangeLog +++ /dev/null @@ -1,11 +0,0 @@ -2009-10-14 Eric Belanger <eric@archlinux.org> - - * glib 1.2.10-8.1 - * Fixed configure options for x86_64 (close FS#16658) - -2009-08-01 Eric Belanger <eric@archlinux.org> - - * glib 1.2.10-8 - * FHS man pages - * Added info pages - * Added ChangeLog diff --git a/extra/nedit/ChangeLog b/extra/nedit/ChangeLog deleted file mode 100644 index f7e102118..000000000 --- a/extra/nedit/ChangeLog +++ /dev/null @@ -1,5 +0,0 @@ -2009-07-29 Eric Belanger <eric@archlinux.org> - - * nedit 5.5-5 - * FHS man pages - * Added ChangeLog diff --git a/extra/rubberband/rubberband.changelog b/extra/rubberband/rubberband.changelog deleted file mode 100644 index 1d479b0f2..000000000 --- a/extra/rubberband/rubberband.changelog +++ /dev/null @@ -1,11 +0,0 @@ -9 Aug 2010 (GMT+8) Ray Rashif <schivmeister@gmail.com> - - * 1.5.0-1 : - Brought into extra from community for ardour - - replaces soundtouch for enhanced functionality - - * PKGBUILD : - Minor cosmetic ammendments. - - * rubberband.changelog : - Added this changelog. diff --git a/extra/vamp-plugin-sdk/vamp-plugin-sdk.changelog b/extra/vamp-plugin-sdk/vamp-plugin-sdk.changelog deleted file mode 100644 index 04f17247e..000000000 --- a/extra/vamp-plugin-sdk/vamp-plugin-sdk.changelog +++ /dev/null @@ -1,11 +0,0 @@ -9 Aug 2010 (GMT+8) Ray Rashif <schivmeister@gmail.com> - - * 2.1-1 : - Brought into extra from community for rubberband/ardour - - dep of rubberband - - * PKGBUILD : - Minor cosmetic ammendments. - - * vamp-plugin-sdk.changelog : - Added this changelog. diff --git a/extra/xorg-server/git-fixes.patch b/extra/xorg-server/git-fixes.patch deleted file mode 100644 index 3eadd81ba..000000000 --- a/extra/xorg-server/git-fixes.patch +++ /dev/null @@ -1,318 +0,0 @@ -From 613e0e9ef74c4542ed458200165adbcdfdf3cd17 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston <jeremyhu@apple.com> -Date: Wed, 13 Apr 2011 18:51:30 +0000 -Subject: Send events that were missing from RRSelectInput - -The RANDR spec (randrproto.txt) specifies that RRSelectInput will send out -events corresponding to the event mask, if there have been changes to -CRTCs or outputs. Only screen events were being generated, however. - -Fixes http://bugs.freedesktop.org/21760 - -Signed-off-by: Federico Mena Quintero <federico@novell.com> -Reviewd-by: Keith Packard <keithp@keithp.com> -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit b2997431fd426ab318bc5dfd2cd43956d733ebec) ---- -diff --git a/randr/rrdispatch.c b/randr/rrdispatch.c -index ac4d2ac..2135504 100644 ---- a/randr/rrdispatch.c -+++ b/randr/rrdispatch.c -@@ -146,7 +146,7 @@ ProcRRSelectInput (ClientPtr client) - /* - * Now see if the client needs an event - */ -- if (pScrPriv && (pRREvent->mask & RRScreenChangeNotifyMask)) -+ if (pScrPriv) - { - pTimes = &((RRTimesPtr) (pRRClient + 1))[pScreen->myNum]; - if (CompareTimeStamps (pTimes->setTime, -@@ -154,7 +154,35 @@ ProcRRSelectInput (ClientPtr client) - CompareTimeStamps (pTimes->configTime, - pScrPriv->lastConfigTime) != 0) - { -- RRDeliverScreenEvent (client, pWin, pScreen); -+ if (pRREvent->mask & RRScreenChangeNotifyMask) -+ { -+ RRDeliverScreenEvent (client, pWin, pScreen); -+ } -+ -+ if (pRREvent->mask & RRCrtcChangeNotifyMask) -+ { -+ int i; -+ -+ for (i = 0; i < pScrPriv->numCrtcs; i++) -+ { -+ RRDeliverCrtcEvent (client, pWin, pScrPriv->crtcs[i]); -+ } -+ } -+ -+ if (pRREvent->mask & RROutputChangeNotifyMask) -+ { -+ int i; -+ -+ for (i = 0; i < pScrPriv->numOutputs; i++) -+ { -+ RRDeliverOutputEvent (client, pWin, pScrPriv->outputs[i]); -+ } -+ } -+ -+ /* We don't check for RROutputPropertyNotifyMask, as randrproto.txt doesn't -+ * say if there ought to be notifications of changes to output properties -+ * if those changes occurred before the time RRSelectInput is called. -+ */ - } - } - } --- -cgit v0.8.3-6-g21f6 -From 50b9d3142ff90af2f7fa35b7b1bf9e5a07723dbd Mon Sep 17 00:00:00 2001 -From: Aaron Plattner <aplattner@nvidia.com> -Date: Tue, 24 May 2011 23:02:42 +0000 -Subject: randr: check rotated virtual size limits correctly - -Commit d1107918d4626268803b54033a07405122278e7f introduced checks to -the RandR path that cause RRSetScreenConfig requests to fail if the -size is too large. Unfortunately, when RandR 1.1 rotation is enabled -it compares the rotated screen dimensions to the unrotated limits, -which causes 90- and 270-degree rotation to fail unless your screen -happens to be square: - - X Error of failed request: BadValue (integer parameter out of range for operation) - Major opcode of failed request: 153 (RANDR) - Minor opcode of failed request: 2 (RRSetScreenConfig) - Value in failed request: 0x780 - Serial number of failed request: 14 - Current serial number in output stream: 14 - -Fix this by moving the check above the code that swaps the dimensions -based on the rotation. - -Signed-off-by: Aaron Plattner <aplattner@nvidia.com> -Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> -Tested-by: Robert Hooker <robert.hooker@canonical.com> -Tested-by: Kent Baxley <kent.baxley@canonical.com> -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit b6c7b9b2f39e970cedb6bc1e073f901e28cb0fa3) ---- -diff --git a/randr/rrscreen.c b/randr/rrscreen.c -index 1bc1a9e..da6d48d 100644 ---- a/randr/rrscreen.c -+++ b/randr/rrscreen.c -@@ -910,12 +910,6 @@ ProcRRSetScreenConfig (ClientPtr client) - */ - width = mode->mode.width; - height = mode->mode.height; -- if (rotation & (RR_Rotate_90|RR_Rotate_270)) -- { -- width = mode->mode.height; -- height = mode->mode.width; -- } -- - if (width < pScrPriv->minWidth || pScrPriv->maxWidth < width) { - client->errorValue = width; - free(pData); -@@ -927,6 +921,12 @@ ProcRRSetScreenConfig (ClientPtr client) - return BadValue; - } - -+ if (rotation & (RR_Rotate_90|RR_Rotate_270)) -+ { -+ width = mode->mode.height; -+ height = mode->mode.width; -+ } -+ - if (width != pScreen->width || height != pScreen->height) - { - int c; --- -cgit v0.8.3-6-g21f6 -From 4bfb22e7667c4cd55da5e7a31af29ce5769ecc65 Mon Sep 17 00:00:00 2001 -From: Aaron Plattner <aplattner@nvidia.com> -Date: Mon, 18 Apr 2011 15:23:48 +0000 -Subject: linux: Retry VT ioctls while errno == EINTR - -When the smart scheduler is enabled, the VT ioctls (particularly -VT_WAITACTIVE) can be interrupted by the smart scheduler's SIGALRMs. -Previously, this caused the server to immediately continue on to -ScreenInit, almost certainly causing a crash or failure because the X -server that owned the VT hadn't finished cleaning up. As of commit -7ee965a300c9eddcc1acacf9414cfe3e589222a8, it causes a FatalError -instead. - -Retrying the ioctl as long as it fails with errno == EINTR fixes the -problem and allows server regenerations to trigger VT switches that -actually succeed. - -Signed-off-by: Aaron Plattner <aplattner@nvidia.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Cyril Brulebois <kibi@debian.org> -Signed-off-by: Keith Packard <keithp@keithp.com> -(cherry picked from commit 88c4622b594a1725d0cee86bc82ad640d241c520) ---- -diff --git a/hw/xfree86/os-support/linux/lnx_init.c b/hw/xfree86/os-support/linux/lnx_init.c -index 9c71a42..77dfb2f 100644 ---- a/hw/xfree86/os-support/linux/lnx_init.c -+++ b/hw/xfree86/os-support/linux/lnx_init.c -@@ -62,17 +62,21 @@ drain_console(int fd, void *closure) - static void - switch_to(int vt, const char *from) - { -- if (ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt) < 0) -- FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno)); -+ int ret; - -- if (ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt) < 0) -- FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno)); -+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_ACTIVATE, vt)); -+ if (ret < 0) -+ FatalError("%s: VT_ACTIVATE failed: %s\n", from, strerror(errno)); -+ -+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_WAITACTIVE, vt)); -+ if (ret < 0) -+ FatalError("%s: VT_WAITACTIVE failed: %s\n", from, strerror(errno)); - } - - void - xf86OpenConsole(void) - { -- int i, fd = -1; -+ int i, fd = -1, ret; - struct vt_mode VT; - struct vt_stat vts; - MessageType from = X_PROBED; -@@ -107,17 +111,19 @@ xf86OpenConsole(void) - - if (ShareVTs) - { -- if (ioctl(fd, VT_GETSTATE, &vts) == 0) -- xf86Info.vtno = vts.v_active; -- else -- FatalError("xf86OpenConsole: Cannot find the current" -- " VT (%s)\n", strerror(errno)); -+ SYSCALL(ret = ioctl(fd, VT_GETSTATE, &vts)); -+ if (ret < 0) -+ FatalError("xf86OpenConsole: Cannot find the current" -+ " VT (%s)\n", strerror(errno)); -+ xf86Info.vtno = vts.v_active; - } else { -- if ((ioctl(fd, VT_OPENQRY, &xf86Info.vtno) < 0) || -- (xf86Info.vtno == -1)) -- FatalError("xf86OpenConsole: Cannot find a free VT: %s\n", -- strerror(errno)); -- } -+ SYSCALL(ret = ioctl(fd, VT_OPENQRY, &xf86Info.vtno)); -+ if (ret < 0) -+ FatalError("xf86OpenConsole: Cannot find a free VT: " -+ "%s\n", strerror(errno)); -+ if (xf86Info.vtno == -1) -+ FatalError("xf86OpenConsole: Cannot find a free VT\n"); -+ } - close(fd); - } - -@@ -159,7 +165,8 @@ xf86OpenConsole(void) - * Linux doesn't switch to an active vt after the last close of a vt, - * so we do this ourselves by remembering which is active now. - */ -- if (ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts) < 0) -+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETSTATE, &vts)); -+ if (ret < 0) - xf86Msg(X_WARNING,"xf86OpenConsole: VT_GETSTATE failed: %s\n", - strerror(errno)); - else -@@ -171,7 +178,7 @@ xf86OpenConsole(void) - * Detach from the controlling tty to avoid char loss - */ - if ((i = open("/dev/tty",O_RDWR)) >= 0) { -- ioctl(i, TIOCNOTTY, 0); -+ SYSCALL(ioctl(i, TIOCNOTTY, 0)); - close(i); - } - } -@@ -186,9 +193,10 @@ xf86OpenConsole(void) - */ - switch_to(xf86Info.vtno, "xf86OpenConsole"); - -- if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) -- FatalError("xf86OpenConsole: VT_GETMODE failed %s\n", -- strerror(errno)); -+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT)); -+ if (ret < 0) -+ FatalError("xf86OpenConsole: VT_GETMODE failed %s\n", -+ strerror(errno)); - - signal(SIGUSR1, xf86VTRequest); - -@@ -196,20 +204,23 @@ xf86OpenConsole(void) - VT.relsig = SIGUSR1; - VT.acqsig = SIGUSR1; - -- if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0) -- FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed: %s\n", -+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT)); -+ if (ret < 0) -+ FatalError("xf86OpenConsole: VT_SETMODE VT_PROCESS failed: %s\n", - strerror(errno)); -- -- if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS) < 0) -- FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed %s\n", -- strerror(errno)); -+ -+ SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_GRAPHICS)); -+ if (ret < 0) -+ FatalError("xf86OpenConsole: KDSETMODE KD_GRAPHICS failed %s\n", -+ strerror(errno)); - - tcgetattr(xf86Info.consoleFd, &tty_attr); -- ioctl(xf86Info.consoleFd, KDGKBMODE, &tty_mode); -+ SYSCALL(ioctl(xf86Info.consoleFd, KDGKBMODE, &tty_mode)); - -- if (ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW) < 0) -- FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n", -- strerror(errno)); -+ SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSKBMODE, K_RAW)); -+ if (ret < 0) -+ FatalError("xf86OpenConsole: KDSKBMODE K_RAW failed %s\n", -+ strerror(errno)); - - nTty = tty_attr; - nTty.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP); -@@ -241,6 +252,7 @@ void - xf86CloseConsole(void) - { - struct vt_mode VT; -+ int ret; - - if (ShareVTs) { - close(xf86Info.consoleFd); -@@ -253,20 +265,23 @@ xf86CloseConsole(void) - }; - - /* Back to text mode ... */ -- if (ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT) < 0) -+ SYSCALL(ret = ioctl(xf86Info.consoleFd, KDSETMODE, KD_TEXT)); -+ if (ret < 0) - xf86Msg(X_WARNING, "xf86CloseConsole: KDSETMODE failed: %s\n", - strerror(errno)); - -- ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode); -+ SYSCALL(ioctl(xf86Info.consoleFd, KDSKBMODE, tty_mode)); - tcsetattr(xf86Info.consoleFd, TCSANOW, &tty_attr); - -- if (ioctl(xf86Info.consoleFd, VT_GETMODE, &VT) < 0) -+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_GETMODE, &VT)); -+ if (ret < 0) - xf86Msg(X_WARNING, "xf86CloseConsole: VT_GETMODE failed: %s\n", - strerror(errno)); - else { - /* set dflt vt handling */ - VT.mode = VT_AUTO; -- if (ioctl(xf86Info.consoleFd, VT_SETMODE, &VT) < 0) -+ SYSCALL(ret = ioctl(xf86Info.consoleFd, VT_SETMODE, &VT)); -+ if (ret < 0) - xf86Msg(X_WARNING, "xf86CloseConsole: VT_SETMODE failed: %s\n", - strerror(errno)); - } --- -cgit v0.8.3-6-g21f6 diff --git a/extra/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch b/extra/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch deleted file mode 100644 index 4e782f1c6..000000000 --- a/extra/xorg-server/xorg-redhat-die-ugly-pattern-die-die-die.patch +++ /dev/null @@ -1,16 +0,0 @@ -Remove the default root window grey stipple pattern, replacing it with -blackness. - ---- xc/programs/Xserver/dix/window.c.die-ugly-pattern-die-die-die Tue Feb 12 16:33:04 2002 -+++ xc/programs/Xserver/dix/window.c Tue Feb 12 16:45:32 2002 -@@ -119,8 +119,8 @@ - * - ******/ - --static unsigned char _back_lsb[4] = {0x88, 0x22, 0x44, 0x11}; --static unsigned char _back_msb[4] = {0x11, 0x44, 0x22, 0x88}; -+static unsigned char _back_lsb[4] = {0x00, 0x00, 0x00, 0x00}; -+static unsigned char _back_msb[4] = {0x00, 0x00, 0x00, 0x00}; - - int screenIsSaved = SCREEN_SAVER_OFF; - |