summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--community-staging/bibletime/PKGBUILD31
-rw-r--r--community-staging/bibletime/bibletime.install13
-rw-r--r--community-staging/fatrat/PKGBUILD38
-rw-r--r--community-staging/freeradius/PKGBUILD45
-rw-r--r--community-staging/freeradius/freeradius.install22
-rw-r--r--community-staging/freeradius/krb5-build-fix.patch21
-rw-r--r--community-staging/freeradius/radiusd43
-rw-r--r--community-staging/gambas2/PKGBUILD950
-rw-r--r--community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch35
-rw-r--r--community-staging/gambas2/fix-gbi-gba-path.patch24
-rw-r--r--community-staging/gambas2/gambas2-runtime.install12
-rw-r--r--community-staging/gambas2/gambas2-script.install15
-rw-r--r--community-staging/gambas2/gambas2.install12
-rw-r--r--community-staging/gambas2/poppler-0.18.patch40
-rw-r--r--community-staging/gambas3/PKGBUILD1097
-rw-r--r--community-staging/gambas3/gambas3-runtime.install10
-rw-r--r--community-staging/gambas3/gambas3-script.install15
-rw-r--r--community-staging/gogglesmm/PKGBUILD39
-rw-r--r--community-staging/gogglesmm/gogglesmm.install11
-rw-r--r--community-staging/goldendict/PKGBUILD38
-rw-r--r--community-staging/goldendict/goldendict-paths.diff10
-rw-r--r--community-staging/goldendict/goldendict.changelog11
-rw-r--r--community-staging/google-gadgets/PKGBUILD158
-rw-r--r--community-staging/google-gadgets/google-gadgets-common.install15
-rw-r--r--community-staging/google-gadgets/google-gadgets.changelog8
-rw-r--r--community-staging/google-gadgets/google-gadgets.install15
-rw-r--r--community-staging/google-gadgets/wifi-types.patch36
-rw-r--r--community-staging/gpsbabel/PKGBUILD48
-rw-r--r--community-staging/kadu/PKGBUILD32
-rw-r--r--community-staging/kvirc/PKGBUILD33
-rw-r--r--community-staging/kvirc/kvirc.install13
-rw-r--r--community-staging/luminancehdr/PKGBUILD42
-rw-r--r--community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch10
-rw-r--r--community-staging/luminancehdr/luminancehdr.changelog33
-rw-r--r--community-staging/luminancehdr/luminancehdr.install12
-rw-r--r--community-staging/me-tv/PKGBUILD42
-rw-r--r--community-staging/me-tv/me-tv.install17
-rw-r--r--community-staging/myodbc/PKGBUILD31
-rw-r--r--community-staging/myodbc/myconf.h.in165
-rw-r--r--community-staging/myodbc/myodbc-64bit.patch85
-rw-r--r--community-staging/myodbc/myodbc-add-mysys.patch29
-rw-r--r--community-staging/myodbc/myodbc-my-free.patch253
-rw-r--r--community-staging/myodbc/myodbc-shutdown.patch27
-rw-r--r--community-staging/mythtv/PKGBUILD82
-rw-r--r--community-staging/mythtv/build.patch13
-rw-r--r--community-staging/mythtv/mythbackend.conf92
-rw-r--r--community-staging/mythtv/mythbackend.rc82
-rw-r--r--community-staging/mythtv/mythtv-v4l2-fix.patch724
-rw-r--r--community-staging/mythtv/mythtv.install11
-rw-r--r--community-staging/openscenegraph/PKGBUILD38
-rw-r--r--community-staging/openscenegraph/osg-xine-1.2.patch14
-rw-r--r--community-staging/opensips/PKGBUILD67
-rw-r--r--community-staging/opensips/opensips.init50
-rw-r--r--community-staging/opensips/opensips.install5
-rw-r--r--community-staging/paraview/PKGBUILD88
-rw-r--r--community-staging/paraview/fixkernelversioncheck.diff19
-rw-r--r--community-staging/paraview/paraview.desktop10
-rw-r--r--community-staging/paraview/paraview.pngbin367 -> 0 bytes
-rw-r--r--community-staging/perl-dbd-odbc/PKGBUILD28
-rw-r--r--community-staging/pkgtools/PKGBUILD36
-rw-r--r--community-staging/pkgtools/pkgtools.install66
-rw-r--r--community-staging/psqlodbc/PKGBUILD31
-rw-r--r--community-staging/psqlodbc/fix-function-declarations.patch47
-rw-r--r--community-staging/qbittorrent/PKGBUILD33
-rw-r--r--community-staging/qbittorrent/qbittorrent.install11
-rw-r--r--community-staging/qlandkartegt/PKGBUILD44
-rw-r--r--community-staging/qlandkartegt/qlandkartegt-mimetypes.xml7
-rw-r--r--community-staging/qlandkartegt/qlandkartegt.changelog30
-rw-r--r--community-staging/qlandkartegt/qlandkartegt.install7
-rw-r--r--community-staging/qmc2/PKGBUILD28
-rw-r--r--community-staging/qtcreator/PKGBUILD52
-rw-r--r--community-staging/qtcreator/qtcreator.desktop10
-rw-r--r--community-staging/qtcreator/qtcreator.install12
-rw-r--r--community-staging/root/PKGBUILD97
-rw-r--r--community-staging/root/root.install25
-rw-r--r--community-staging/root/root.sh5
-rw-r--r--community-staging/root/root.xml11
-rw-r--r--community-staging/root/rootd37
-rw-r--r--community-staging/sigil/PKGBUILD45
-rw-r--r--community-staging/sigil/sigil.desktop10
-rw-r--r--community-staging/sigil/sigil.install12
-rw-r--r--community-staging/swi-prolog/PKGBUILD48
-rw-r--r--community-staging/texmaker/PKGBUILD35
-rw-r--r--community-staging/vtk/PKGBUILD115
-rw-r--r--community-staging/vtk/ffmpeg-0.8.diff66
-rw-r--r--community-staging/vtk/fix-boost-graph-api-changes.diff42
-rw-r--r--community-staging/vtk/fixkernelversioncheck.diff19
-rw-r--r--community-staging/wkhtmltopdf/PKGBUILD30
-rw-r--r--community-staging/xfmedia/PKGBUILD41
-rw-r--r--community-staging/xfmedia/xfmedia-dbus-0.6-support.patch14
-rw-r--r--community-staging/xfmedia/xfmedia-empty-prev-next-fix.patch25
-rw-r--r--community-staging/xfmedia/xfmedia-exo-0.6.patch196
-rw-r--r--community-staging/xfmedia/xfmedia-xine-1.2.0.patch34
-rw-r--r--community-staging/xfmedia/xfmedia.install11
-rw-r--r--community-testing/bibletime/PKGBUILD31
-rw-r--r--community-testing/bibletime/bibletime.install13
-rw-r--r--community-testing/binutils-avr/PKGBUILD72
-rw-r--r--community-testing/fatrat/PKGBUILD38
-rw-r--r--community-testing/fpc/Makefile-mk382.diff174
-rw-r--r--community-testing/fpc/PKGBUILD51
-rw-r--r--community-testing/freeradius/PKGBUILD45
-rw-r--r--community-testing/freeradius/freeradius.install22
-rw-r--r--community-testing/freeradius/krb5-build-fix.patch21
-rw-r--r--community-testing/freeradius/radiusd43
-rw-r--r--community-testing/gambas2/PKGBUILD950
-rw-r--r--community-testing/gambas2/db.firebird.gcc-4.6.0-fix.patch35
-rw-r--r--community-testing/gambas2/fix-gbi-gba-path.patch24
-rw-r--r--community-testing/gambas2/gambas2-runtime.install12
-rw-r--r--community-testing/gambas2/gambas2-script.install15
-rw-r--r--community-testing/gambas2/gambas2.install12
-rw-r--r--community-testing/gambas2/poppler-0.18.patch40
-rw-r--r--community-testing/gambas3/PKGBUILD1097
-rw-r--r--community-testing/gambas3/gambas3-runtime.install10
-rw-r--r--community-testing/gambas3/gambas3-script.install15
-rw-r--r--community-testing/goldendict/PKGBUILD38
-rw-r--r--community-testing/goldendict/goldendict-paths.diff10
-rw-r--r--community-testing/goldendict/goldendict.changelog11
-rw-r--r--community-testing/google-gadgets/PKGBUILD158
-rw-r--r--community-testing/google-gadgets/google-gadgets-common.install15
-rw-r--r--community-testing/google-gadgets/google-gadgets.changelog8
-rw-r--r--community-testing/google-gadgets/google-gadgets.install15
-rw-r--r--community-testing/google-gadgets/wifi-types.patch36
-rw-r--r--community-testing/gpac/PKGBUILD43
-rw-r--r--community-testing/gpsbabel/PKGBUILD48
-rw-r--r--community-testing/kadu/PKGBUILD32
-rw-r--r--community-testing/kvirc/PKGBUILD33
-rw-r--r--community-testing/kvirc/kvirc.install13
-rw-r--r--community-testing/lazarus/ChangeLog3
-rw-r--r--community-testing/lazarus/PKGBUILD52
-rw-r--r--community-testing/libgda3/PKGBUILD27
-rw-r--r--community-testing/lilypond/PKGBUILD43
-rw-r--r--community-testing/lilypond/lilypond.install48
-rw-r--r--community-testing/lilypond/texlive-workaround.patch88
-rw-r--r--community-testing/luminancehdr/PKGBUILD42
-rw-r--r--community-testing/luminancehdr/luminance-hdr-2.1.0-libraw.patch10
-rw-r--r--community-testing/luminancehdr/luminancehdr.changelog33
-rw-r--r--community-testing/luminancehdr/luminancehdr.install12
-rw-r--r--community-testing/myodbc/PKGBUILD31
-rw-r--r--community-testing/myodbc/myconf.h.in165
-rw-r--r--community-testing/myodbc/myodbc-64bit.patch85
-rw-r--r--community-testing/myodbc/myodbc-add-mysys.patch29
-rw-r--r--community-testing/myodbc/myodbc-my-free.patch253
-rw-r--r--community-testing/myodbc/myodbc-shutdown.patch27
-rw-r--r--community-testing/mythtv/PKGBUILD82
-rw-r--r--community-testing/mythtv/build.patch13
-rw-r--r--community-testing/mythtv/mythbackend.conf92
-rw-r--r--community-testing/mythtv/mythbackend.rc82
-rw-r--r--community-testing/mythtv/mythtv-v4l2-fix.patch724
-rw-r--r--community-testing/mythtv/mythtv.install11
-rw-r--r--community-testing/opensips/PKGBUILD67
-rw-r--r--community-testing/opensips/opensips.init50
-rw-r--r--community-testing/opensips/opensips.install5
-rw-r--r--community-testing/paraview/PKGBUILD88
-rw-r--r--community-testing/paraview/fixkernelversioncheck.diff19
-rw-r--r--community-testing/paraview/paraview.desktop10
-rw-r--r--community-testing/paraview/paraview.pngbin367 -> 0 bytes
-rw-r--r--community-testing/perl-dbd-odbc/PKGBUILD28
-rw-r--r--community-testing/psqlodbc/PKGBUILD31
-rw-r--r--community-testing/psqlodbc/fix-function-declarations.patch47
-rw-r--r--community-testing/qbittorrent/PKGBUILD33
-rw-r--r--community-testing/qbittorrent/qbittorrent.install11
-rw-r--r--community-testing/qlandkartegt/PKGBUILD44
-rw-r--r--community-testing/qlandkartegt/qlandkartegt-mimetypes.xml7
-rw-r--r--community-testing/qlandkartegt/qlandkartegt.changelog30
-rw-r--r--community-testing/qlandkartegt/qlandkartegt.install7
-rw-r--r--community-testing/qmc2/PKGBUILD28
-rw-r--r--community-testing/qtcreator/PKGBUILD52
-rw-r--r--community-testing/qtcreator/qtcreator.desktop10
-rw-r--r--community-testing/qtcreator/qtcreator.install12
-rw-r--r--community-testing/root/PKGBUILD97
-rw-r--r--community-testing/root/root.install25
-rw-r--r--community-testing/root/root.sh5
-rw-r--r--community-testing/root/root.xml11
-rw-r--r--community-testing/root/rootd37
-rw-r--r--community-testing/sigil/PKGBUILD45
-rw-r--r--community-testing/sigil/sigil.desktop10
-rw-r--r--community-testing/sigil/sigil.install12
-rw-r--r--community-testing/swi-prolog/PKGBUILD48
-rw-r--r--community-testing/texmaker/PKGBUILD35
-rw-r--r--community-testing/vtk/PKGBUILD115
-rw-r--r--community-testing/vtk/ffmpeg-0.8.diff66
-rw-r--r--community-testing/vtk/fix-boost-graph-api-changes.diff42
-rw-r--r--community-testing/vtk/fixkernelversioncheck.diff19
-rw-r--r--community-testing/wkhtmltopdf/PKGBUILD30
-rw-r--r--community/acpitool/PKGBUILD32
-rw-r--r--community/acpitool/linux-3.0.patch18
-rw-r--r--community/acpitool/sysfs-battery.patch52
-rw-r--r--community/amaya/PKGBUILD69
-rw-r--r--community/amaya/amaya-fix-amaya-wxfile.patch13
-rw-r--r--community/amaya/amaya-fix-thotlib-png14.patch56
-rw-r--r--community/amaya/amaya-fix-thotlib-wxfile.patch16
-rw-r--r--community/amaya/amaya-splitmode.patch10
-rw-r--r--community/amaya/amaya-wakeupidle.patch11
-rw-r--r--community/amaya/amaya-wxyield.patch21
-rw-r--r--community/amaya/amaya.install14
-rw-r--r--community/apparix/PKGBUILD27
-rw-r--r--community/apparix/apparix.sh52
-rw-r--r--community/asix-module/PKGBUILD31
-rw-r--r--community/asix-module/asix-module.install15
-rw-r--r--community/avant-window-navigator/PKGBUILD58
-rw-r--r--community/avant-window-navigator/avant-window-navigator.install29
-rw-r--r--community/avant-window-navigator/awn-applet-simple.patch21
-rw-r--r--community/awn-extras-applets/PKGBUILD50
-rw-r--r--community/awn-extras-applets/aff-results.patch11
-rw-r--r--community/awn-extras-applets/awn-extras-applets.install23
-rw-r--r--community/awn-extras-applets/awn-extras-libnotify0.7.patch20
-rw-r--r--community/awn-extras-applets/weather.patch11
-rw-r--r--community/bmpanel/PKGBUILD27
-rw-r--r--community/clementine/clementine-0.7.1-fix-devicekit.patch11
-rw-r--r--community/clipgrab/PKGBUILD31
-rw-r--r--community/clipgrab/clipgrab.desktop13
-rw-r--r--community/compizconfig-backend-kconfig4/PKGBUILD31
-rw-r--r--community/conkeror-git/PKGBUILD56
-rw-r--r--community/conkeror-git/conkeror-git.install11
-rw-r--r--community/conkeror-git/conkeror.sh2
-rw-r--r--community/conkeror-git/conkeror_gimpfile.xpm2251
-rw-r--r--community/convertlit/PKGBUILD31
-rw-r--r--community/cross-arm-elf-binutils/PKGBUILD54
-rw-r--r--community/cross-arm-elf-gcc-base/PKGBUILD60
-rw-r--r--community/cross-arm-wince-cegcc-binutils/PKGBUILD35
-rw-r--r--community/cross-arm-wince-cegcc-cegccdll-dummy/PKGBUILD28
-rw-r--r--community/cross-arm-wince-cegcc-cegccdll/PKGBUILD35
-rw-r--r--community/cross-arm-wince-cegcc-cegccdll/cegccdll.install8
-rw-r--r--community/cross-arm-wince-cegcc-cegccthrddll/PKGBUILD30
-rw-r--r--community/cross-arm-wince-cegcc-gcc-base/PKGBUILD55
-rw-r--r--community/cross-arm-wince-cegcc-gcc/PKGBUILD59
-rw-r--r--community/cross-arm-wince-cegcc-libstdcppdll/PKGBUILD71
-rw-r--r--community/cross-arm-wince-cegcc-newlib/PKGBUILD37
-rw-r--r--community/cross-arm-wince-cegcc-profile/PKGBUILD40
-rw-r--r--community/cross-arm-wince-cegcc-w32api/PKGBUILD28
-rw-r--r--community/dar/ChangeLog3
-rw-r--r--community/dar/PKGBUILD37
-rw-r--r--community/driftnet/PKGBUILD25
-rw-r--r--community/duff/ChangeLog3
-rw-r--r--community/duff/PKGBUILD24
-rw-r--r--community/dvdstyler/PKGBUILD30
-rw-r--r--community/eiciel/PKGBUILD29
-rw-r--r--community/eiciel/eiciel.install11
-rwxr-xr-xcommunity/emesene/PKGBUILD55
-rw-r--r--community/emesene/emesene.install12
-rw-r--r--community/emesene/emesene.run2
-rw-r--r--community/emesene/setup.patch20
-rw-r--r--community/eterm/PKGBUILD36
-rw-r--r--community/extrema/PKGBUILD43
-rw-r--r--community/extrema/extrema.desktop8
-rw-r--r--community/extrema/gcc46.patch15
-rw-r--r--community/fail2ban/PKGBUILD22
-rw-r--r--community/fail2ban/fail2ban.rc36
-rw-r--r--community/fgetty/ChangeLog3
-rw-r--r--community/fgetty/PKGBUILD25
-rw-r--r--community/fio/PKGBUILD23
-rw-r--r--community/flvstreamer/PKGBUILD21
-rw-r--r--community/fotoxx/PKGBUILD26
-rw-r--r--community/fotoxx/fotoxx.install9
-rw-r--r--community/gammu/gammu.changelog72
-rw-r--r--community/ghdl/PKGBUILD60
-rw-r--r--community/ghdl/gcc_pure64.patch24
-rw-r--r--community/gnofract4d/PKGBUILD30
-rw-r--r--community/gnofract4d/gnofract4d.install12
-rw-r--r--community/gnofract4d/imageIO.cpp.patch13
-rw-r--r--community/gnome-do/PKGBUILD33
-rw-r--r--community/gnome-do/gnome-do.install25
-rw-r--r--community/gpac/libpng14-infopp-null.patch12
-rw-r--r--community/gpac/openjpeg14.patch23
-rw-r--r--community/grass/PKGBUILD112
-rw-r--r--community/grass/grass.conf1
-rw-r--r--community/grass/grass.install6
-rw-r--r--community/grass/grass.sh4
-rw-r--r--community/gri/PKGBUILD30
-rw-r--r--community/gri/gri.install18
-rw-r--r--community/gromacs/PKGBUILD38
-rw-r--r--community/gtk-gnutella/PKGBUILD27
-rw-r--r--community/gtk-rezlooks-engine/PKGBUILD29
-rw-r--r--community/handbrake/PKGBUILD54
-rw-r--r--community/handbrake/dbus-glib.patch12
-rw-r--r--community/handbrake/handbrake.install9
-rw-r--r--community/handbrake/libnotify-0.7.patch30
-rw-r--r--community/jogl/PKGBUILD37
-rw-r--r--community/kmod/PKGBUILD25
-rw-r--r--community/kydpdict/ChangeLog9
-rw-r--r--community/kydpdict/PKGBUILD42
-rw-r--r--community/kydpdict/kydpdict.desktop8
-rw-r--r--community/kydpdict/kydpdict.install23
-rw-r--r--community/kydpdict/kydpdict.pngbin933 -> 0 bytes
-rw-r--r--community/libast/LICENSE.txt21
-rw-r--r--community/libast/PKGBUILD31
-rw-r--r--community/libcgi/PKGBUILD38
-rw-r--r--community/libxnvctrl/PKGBUILD33
-rw-r--r--community/linphone/disable-v4l1.patch50
-rw-r--r--community/mhwaveedit/PKGBUILD25
-rw-r--r--community/microblog-purple/PKGBUILD20
-rw-r--r--community/mms_client/PKGBUILD32
-rw-r--r--community/mms_client/mmsclient-0.0.3-fbsd.patch41
-rw-r--r--community/mms_client/mmsclient-0.0.3-r1.patch92
-rw-r--r--community/mplayer2/PKGBUILD67
-rw-r--r--community/multiget/PKGBUILD44
-rw-r--r--community/multiget/multiget.desktop8
-rw-r--r--community/multimux/PKGBUILD28
-rw-r--r--community/musescore/PKGBUILD38
-rw-r--r--community/musescore/musescore.install11
-rw-r--r--community/musescore/paths.patch22
-rw-r--r--community/mysql-ruby/PKGBUILD30
-rw-r--r--community/mysql-workbench/ArchLinux.xml18
-rw-r--r--community/mysql-workbench/PKGBUILD64
-rw-r--r--community/mysql-workbench/arch.patch22
-rw-r--r--community/mysql-workbench/gcc46.patch11
-rw-r--r--community/mysql-workbench/python27.patch19
-rw-r--r--community/nas/PKGBUILD33
-rw-r--r--community/nas/license.txt22
-rw-r--r--community/nginx/changelog4
-rw-r--r--community/nsd/nsd.install20
-rw-r--r--community/ocaml-extlib/PKGBUILD35
-rw-r--r--community/ocaml-ounit/PKGBUILD32
-rw-r--r--community/paraview/fixkernelversioncheck.diff19
-rw-r--r--community/pcb/PKGBUILD43
-rw-r--r--community/pcb/install37
-rw-r--r--community/pdftrans/PKGBUILD26
-rwxr-xr-xcommunity/pdftrans/pdftrans.sh15
-rw-r--r--community/perl-list-moreutils/PKGBUILD48
-rw-r--r--community/python-daap/PKGBUILD17
-rwxr-xr-xcommunity/python2-cheetah/PKGBUILD32
-rw-r--r--community/qdevelop/PKGBUILD41
-rw-r--r--community/qdevelop/qt47.patch24
-rw-r--r--community/qlandkartegt/fix-glu-header.patch12
-rw-r--r--community/qps/version-patch.diff14
-rwxr-xr-xcommunity/qtoctave/PKGBUILD30
-rw-r--r--community/qtoctave/qtoctave-gcc44.patch10
-rw-r--r--community/qtoctave/qtoctave.install14
-rw-r--r--community/qtractor/qtractor.changelog14
-rw-r--r--community/rep-gtk/PKGBUILD26
-rw-r--r--community/sauerbraten/PKGBUILD82
-rw-r--r--community/sauerbraten/license.txt34
-rwxr-xr-xcommunity/sauerbraten/sauerbraten-client14
-rwxr-xr-xcommunity/sauerbraten/sauerbraten-server22
-rw-r--r--community/sauerbraten/sauerbraten.confd7
-rw-r--r--community/sauerbraten/sauerbraten.desktop13
-rw-r--r--community/sauerbraten/sauerbraten.install22
-rw-r--r--community/sauerbraten/sauerbraten.pngbin9313 -> 0 bytes
-rw-r--r--community/sauerbraten/sauerbraten.rcd37
-rw-r--r--community/sawfish/PKGBUILD29
-rw-r--r--community/sawfish/sawfish.install21
-rw-r--r--community/scilab/PKGBUILD86
-rw-r--r--community/scilab/classpath.xml173
-rw-r--r--community/scilab/configure-hdf5-vercheck.patch24
-rw-r--r--community/scilab/java.patch217
-rw-r--r--community/scilab/scilab.desktop9
-rw-r--r--community/superswitcher/PKGBUILD42
-rw-r--r--community/tagtool/PKGBUILD32
-rw-r--r--community/tagtool/tagtool.install22
-rw-r--r--community/tora/PKGBUILD33
-rw-r--r--community/tora/tora.install19
-rw-r--r--community/unrtf/ChangeLog8
-rw-r--r--community/wml/PKGBUILD42
-rw-r--r--community/wxsvg/PKGBUILD27
-rw-r--r--community/xskat/PKGBUILD34
-rw-r--r--community/xskat/xskat.desktop12
-rw-r--r--community/xskat/xskat.pngbin2696 -> 0 bytes
-rw-r--r--core/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch94
-rw-r--r--core/gcc/gcc-pr49720.patch26
-rw-r--r--core/glibc/glibc-2.12.1-static-shared-getpagesize.patch11
-rw-r--r--core/glibc/glibc-2.13-futex.patch31
-rw-r--r--core/glibc/glibc-2.14.1-tzfile-overflow.patch72
-rw-r--r--core/krb5/krb5-1.9.1-2011-006.patch75
-rw-r--r--core/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch344
-rw-r--r--core/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch159
-rw-r--r--core/syslog-ng/PKGBUILD53
-rw-r--r--core/syslog-ng/syslog-ng.conf92
-rw-r--r--core/syslog-ng/syslog-ng.logrotate7
-rwxr-xr-xcore/syslog-ng/syslog-ng.rc66
-rw-r--r--extra/arora/arora.install12
-rw-r--r--extra/avidemux/avidemux-2.5.4-x264-build115.patch45
-rw-r--r--extra/blender/PKGBUILD93
-rw-r--r--extra/blender/blender.install13
-rw-r--r--extra/claws-mail-extra-plugins/webkit1.6.1.patch106
-rw-r--r--extra/cups/PKGBUILD144
-rwxr-xr-xextra/cups/cups68
-rw-r--r--extra/cups/cups-avahi.patch3156
-rw-r--r--extra/cups/cups-no-export-ssllibs.patch12
-rw-r--r--extra/cups/cups-no-gcrypt.patch38
-rw-r--r--extra/cups/cups.install26
-rw-r--r--extra/cups/cups.logrotate8
-rw-r--r--extra/cups/cups.pam3
-rw-r--r--extra/emacs/emacs.desktop12
-rw-r--r--extra/ettercap/ettercap.desktop9
-rw-r--r--extra/fping/fping-2.4b2_p161-min-time.patch47
-rw-r--r--extra/fping/fping_2.4b2-to-ipv6-16.1.diff838
-rw-r--r--extra/gegl/0.1.6-ffmpeg.patch33
-rw-r--r--extra/gtk3/filechooserdefault_do_not_unref_value_twice.patch24
-rw-r--r--extra/gtk3/moveresize.patch47
-rw-r--r--extra/hplip/PKGBUILD68
-rw-r--r--extra/hplip/hplip.install10
-rw-r--r--extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch12
-rw-r--r--extra/icedtea-web/icedtea-web-1.1.4-npapi-fix.patch12
-rw-r--r--extra/kdebase-workspace/kdm-zsh-profile.patch11
-rw-r--r--extra/kile/PKGBUILD31
-rw-r--r--extra/kile/kile.install13
-rw-r--r--extra/libdrm/list.h137
-rw-r--r--extra/libdrm/rbo.h50
-rw-r--r--extra/libgsf/libgsf-gnome.install19
-rw-r--r--extra/llvm/bug-9869-operator-h-c++0x.patch57
-rw-r--r--extra/llvm/clang-toolchains-gcc-versions.patch12
-rw-r--r--extra/mediastreamer/disable-v4l1.patch50
-rw-r--r--extra/monodevelop-debugger-mdb/PKGBUILD30
-rw-r--r--extra/monodevelop-debugger-mdb/support_mdb_2.4.2.patch444
-rw-r--r--extra/nss/distrust-diginotar.patch1675
-rw-r--r--extra/phonon/libqzeitgeist08.patch150
-rw-r--r--extra/qt/blacklist-diginotar-certs.diff89
-rw-r--r--extra/qtscriptgenerator/qtscriptgenerator-gcc44.patch15
-rw-r--r--extra/smplayer/ChangeLog74
-rw-r--r--extra/strigi/libstreamanalyzer_pdf.patch27
-rw-r--r--extra/subversion/subversion-perl-bindings.patch12
-rw-r--r--extra/subversion/subversion.suppress.deprecation.warnings.patch22
-rw-r--r--extra/tcpdump/ppi.h8
-rw-r--r--extra/thunar-media-tags-plugin/0001-Switch-to-the-new-tooltip-api-in-gtk-depend-on-gtk-2.patch177
-rw-r--r--extra/thunar-media-tags-plugin/04_fix-implicit-dso-linking.patch10
-rw-r--r--extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch33
-rw-r--r--extra/xalan-java/PKGBUILD25
-rw-r--r--extra/xerces2-java/PKGBUILD28
-rw-r--r--extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch31
-rw-r--r--extra/zsh/modules.patch11
-rw-r--r--kde-unstable/kactivities/fix-activities.patch156
-rw-r--r--kde-unstable/kdebase-workspace/kdm-zsh-profile.patch11
-rw-r--r--kde-unstable/kdebindings-smokegen/fix-crash.patch13
-rw-r--r--kde-unstable/kdeplasma-addons/fix-build.patch163
-rw-r--r--libre/kernel26-libre-lts/config4776
-rwxr-xr-xlibre/p7zip-libre/unzip18
-rw-r--r--libre/thunderbird-libre/thunderbird-3.0-lang.patch11
-rw-r--r--mozilla-testing/icecat/parabola.patch22
-rw-r--r--mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch12
-rw-r--r--mozilla-testing/iceweasel/PKGBUILD135
-rw-r--r--mozilla-testing/iceweasel/iceweasel.install21
-rw-r--r--mozilla-testing/iceweasel/libre.patch391
-rw-r--r--mozilla-testing/iceweasel/mozconfig39
-rw-r--r--mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch12
-rw-r--r--mozilla-testing/iceweasel/region.properties23
-rw-r--r--mozilla-testing/iceweasel/xulrunner-copy-stub.patch11
-rw-r--r--multilib-testing/binutils-multilib/PKGBUILD79
-rw-r--r--multilib-testing/binutils-multilib/binutils.install17
-rw-r--r--multilib-testing/gcc-multilib/PKGBUILD303
-rw-r--r--multilib-testing/gcc-multilib/gcc-ada.install20
-rw-r--r--multilib-testing/gcc-multilib/gcc-fortran.install16
-rw-r--r--multilib-testing/gcc-multilib/gcc-go.install20
-rw-r--r--multilib-testing/gcc-multilib/gcc-hash-style-both.patch122
-rw-r--r--multilib-testing/gcc-multilib/gcc-libs.install16
-rw-r--r--multilib-testing/gcc-multilib/gcc.install20
-rw-r--r--multilib-testing/gcc-multilib/gcc_pure64.patch26
-rw-r--r--multilib-testing/lib32-glibc/PKGBUILD176
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch42
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch13
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch11
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch26
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.13-futex.patch31
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch132
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch26
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch28
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch37
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch72
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch27
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch184
-rw-r--r--multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch229
-rw-r--r--multilib-testing/lib32-glibc/glibc-__i686.patch13
-rw-r--r--multilib-testing/lib32-glibc/lib32-glibc.conf2
-rw-r--r--multilib/gcc-multilib/gcc-pr49720.patch26
-rwxr-xr-xmultilib/lib32-curl/PKGBUILD57
-rw-r--r--multilib/lib32-db/PKGBUILD40
-rw-r--r--multilib/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch11
-rw-r--r--multilib/lib32-glibc/glibc-2.13-futex.patch31
-rw-r--r--multilib/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch72
-rw-r--r--multilib/lib32-libvdpau/PKGBUILD37
-rw-r--r--multilib/lib32-libxpm/PKGBUILD36
-rw-r--r--multilib/lib32-libxslt/PKGBUILD37
-rw-r--r--multilib/lib32-libxxf86dga/PKGBUILD38
-rw-r--r--multilib/lib32-llvm/clang-toolchains-gcc-versions.patch12
-rw-r--r--multilib/lib32-nspr/PKGBUILD58
-rw-r--r--multilib/lib32-nspr/nspr.pc.in10
-rw-r--r--multilib/lib32-nss/PKGBUILD82
-rw-r--r--multilib/lib32-nss/add_spi+cacert_ca_certs.patch1150
-rw-r--r--multilib/lib32-nss/distrust-diginotar.patch1675
-rw-r--r--multilib/lib32-nss/nss-no-rpath.patch14
-rw-r--r--multilib/lib32-nss/nss-nolocalsql.patch52
-rw-r--r--multilib/lib32-nss/nss.pc.in11
-rw-r--r--multilib/lib32-nss/ssl-renegotiate-transitional.patch21
-rw-r--r--staging/arora/PKGBUILD28
-rw-r--r--staging/arora/install12
-rw-r--r--staging/claws-mail-extra-plugins/PKGBUILD66
-rw-r--r--staging/cloog/PKGBUILD31
-rw-r--r--staging/cmake/PKGBUILD40
-rw-r--r--staging/cmake/cmake.install12
-rw-r--r--staging/erlang/PKGBUILD71
-rw-r--r--staging/freetds/PKGBUILD28
-rw-r--r--staging/gcc/PKGBUILD259
-rw-r--r--staging/gcc/gcc-ada.install20
-rw-r--r--staging/gcc/gcc-fortran.install16
-rw-r--r--staging/gcc/gcc-go.install20
-rw-r--r--staging/gcc/gcc-hash-style-both.patch122
-rw-r--r--staging/gcc/gcc-libs.install16
-rw-r--r--staging/gcc/gcc-pr49720.patch26
-rw-r--r--staging/gcc/gcc.install20
-rw-r--r--staging/gcc/gcc_pure64.patch26
-rw-r--r--staging/gvfs/PKGBUILD113
-rw-r--r--staging/gvfs/gvfs-module.install7
-rw-r--r--staging/gvfs/gvfs-smb.install12
-rw-r--r--staging/gvfs/gvfs.install14
-rw-r--r--staging/hydrogen/PKGBUILD40
-rw-r--r--staging/hydrogen/install.patch12
-rw-r--r--staging/hydrogen/lrdf_raptor2.patch11
-rw-r--r--staging/isl/PKGBUILD33
-rw-r--r--staging/k9copy/PKGBUILD31
-rw-r--r--staging/k9copy/k9copy.install11
-rw-r--r--staging/kadu/PKGBUILD28
-rw-r--r--staging/kdeaccessibility/PKGBUILD82
-rw-r--r--staging/kdeaccessibility/kdeaccessibility.install11
-rw-r--r--staging/kdeadmin/PKGBUILD78
-rw-r--r--staging/kdeadmin/kdeadmin.install11
-rw-r--r--staging/kdeadmin/syslog-path.patch11
-rw-r--r--staging/kdeartwork/PKGBUILD104
-rw-r--r--staging/kdebase-konsole/PKGBUILD30
-rw-r--r--staging/kdebase-runtime/PKGBUILD43
-rw-r--r--staging/kdebase-runtime/kdebase-runtime.install12
-rw-r--r--staging/kdebase-runtime/libqzeitgeist08.patch102
-rw-r--r--staging/kdebase-workspace/PKGBUILD83
-rw-r--r--staging/kdebase-workspace/fix-powerprofiles.patch23
-rw-r--r--staging/kdebase-workspace/fixpath.patch34
-rw-r--r--staging/kdebase-workspace/kde-np.pam7
-rw-r--r--staging/kdebase-workspace/kde.pam7
-rw-r--r--staging/kdebase-workspace/kdebase-workspace.install25
-rw-r--r--staging/kdebase-workspace/kdm36
-rw-r--r--staging/kdebase-workspace/kdm-xinitrd.patch18
-rw-r--r--staging/kdebase-workspace/kdm-zsh-profile.patch11
-rw-r--r--staging/kdebase-workspace/kscreensaver.pam1
-rw-r--r--staging/kdebase-workspace/terminate-server.patch11
-rw-r--r--staging/kdebase/PKGBUILD119
-rw-r--r--staging/kdebase/kdebase.install11
-rw-r--r--staging/kdebindings-kimono/PKGBUILD32
-rw-r--r--staging/kdebindings-korundum/PKGBUILD32
-rw-r--r--staging/kdebindings-kross/PKGBUILD52
-rw-r--r--staging/kdebindings-perlkde/PKGBUILD31
-rw-r--r--staging/kdebindings-perlqt/PKGBUILD30
-rw-r--r--staging/kdebindings-python/PKGBUILD34
-rw-r--r--staging/kdebindings-qtruby/PKGBUILD31
-rw-r--r--staging/kdebindings-qyoto/PKGBUILD31
-rw-r--r--staging/kdebindings-smokegen/PKGBUILD35
-rw-r--r--staging/kdebindings-smokegen/fix-crash.patch13
-rw-r--r--staging/kdebindings-smokekde/PKGBUILD32
-rw-r--r--staging/kdebindings-smokeqt/PKGBUILD32
-rw-r--r--staging/kdeedu-blinken/PKGBUILD31
-rw-r--r--staging/kdeedu-blinken/kdeedu-blinken.install11
-rw-r--r--staging/kdeedu-cantor/PKGBUILD34
-rw-r--r--staging/kdeedu-cantor/kdeedu-cantor.install12
-rw-r--r--staging/kdeedu-kalgebra/PKGBUILD31
-rw-r--r--staging/kdeedu-kalgebra/kdeedu-kalgebra.install12
-rw-r--r--staging/kdeedu-kalzium/PKGBUILD31
-rw-r--r--staging/kdeedu-kalzium/kdeedu-kalzium.install11
-rw-r--r--staging/kdeedu-kanagram/PKGBUILD31
-rw-r--r--staging/kdeedu-kanagram/kdeedu-kanagram.install11
-rw-r--r--staging/kdeedu-kbruch/PKGBUILD31
-rw-r--r--staging/kdeedu-kbruch/kdeedu-kbruch.install11
-rw-r--r--staging/kdeedu-kgeography/PKGBUILD31
-rw-r--r--staging/kdeedu-kgeography/kdeedu-kgeography.install11
-rw-r--r--staging/kdeedu-khangman/PKGBUILD31
-rw-r--r--staging/kdeedu-khangman/kdeedu-khangman.install11
-rw-r--r--staging/kdeedu-kig/PKGBUILD34
-rw-r--r--staging/kdeedu-kig/kdeedu-kig.install12
-rw-r--r--staging/kdeedu-kiten/PKGBUILD31
-rw-r--r--staging/kdeedu-kiten/kdeedu-kiten.install11
-rw-r--r--staging/kdeedu-klettres/PKGBUILD31
-rw-r--r--staging/kdeedu-klettres/kdeedu-klettres.install11
-rw-r--r--staging/kdeedu-kmplot/PKGBUILD31
-rw-r--r--staging/kdeedu-kmplot/kdeedu-kmplot.install12
-rw-r--r--staging/kdeedu-kstars/PKGBUILD32
-rw-r--r--staging/kdeedu-kstars/kdeedu-kstars.install11
-rw-r--r--staging/kdeedu-ktouch/PKGBUILD31
-rw-r--r--staging/kdeedu-ktouch/kdeedu-ktouch.install11
-rw-r--r--staging/kdeedu-kturtle/PKGBUILD31
-rw-r--r--staging/kdeedu-kturtle/kdeedu-kturtle.install11
-rw-r--r--staging/kdeedu-kwordquiz/PKGBUILD31
-rw-r--r--staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install12
-rw-r--r--staging/kdeedu-marble/PKGBUILD32
-rw-r--r--staging/kdeedu-marble/kdeedu-marble.install12
-rw-r--r--staging/kdeedu-parley/PKGBUILD31
-rw-r--r--staging/kdeedu-parley/kdeedu-parley.install12
-rw-r--r--staging/kdeedu-rocs/PKGBUILD31
-rw-r--r--staging/kdeedu-step/PKGBUILD31
-rw-r--r--staging/kdeedu-step/kdeedu-step.install11
-rw-r--r--staging/kdegames/PKGBUILD515
-rw-r--r--staging/kdegames/kdegames-kbattleship.install24
-rw-r--r--staging/kdegames/kdegames-kfourinline.install12
-rw-r--r--staging/kdegames/kdegames-kigo.install12
-rw-r--r--staging/kdegames/kdegames-kolf.install12
-rw-r--r--staging/kdegames/kdegames-kreversi.install22
-rw-r--r--staging/kdegames/kdegames-kspaceduel.install12
-rw-r--r--staging/kdegames/kdegames-ksquares.install22
-rw-r--r--staging/kdegames/kdegames-ktuberling.install12
-rw-r--r--staging/kdegames/kdegames-lskat.install12
-rw-r--r--staging/kdegames/kdegames-palapeli.install13
-rw-r--r--staging/kdegames/kdegames.install11
-rw-r--r--staging/kdegraphics-gwenview/PKGBUILD32
-rw-r--r--staging/kdegraphics-gwenview/kdegraphics-gwenview.install12
-rw-r--r--staging/kdegraphics-kamera/PKGBUILD30
-rw-r--r--staging/kdegraphics-kcolorchooser/PKGBUILD31
-rw-r--r--staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install11
-rw-r--r--staging/kdegraphics-kgamma/PKGBUILD33
-rw-r--r--staging/kdegraphics-kolourpaint/PKGBUILD31
-rw-r--r--staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install12
-rw-r--r--staging/kdegraphics-kruler/PKGBUILD31
-rw-r--r--staging/kdegraphics-kruler/kdegraphics-kruler.install12
-rw-r--r--staging/kdegraphics-ksaneplugin/PKGBUILD31
-rw-r--r--staging/kdegraphics-ksnapshot/PKGBUILD32
-rw-r--r--staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install12
-rw-r--r--staging/kdegraphics-mobipocket/PKGBUILD31
-rw-r--r--staging/kdegraphics-okular/PKGBUILD34
-rw-r--r--staging/kdegraphics-okular/kdegraphics-okular.install12
-rw-r--r--staging/kdegraphics-okular/staging-i686/PKGBUILD34
-rw-r--r--staging/kdegraphics-okular/staging-i686/kdegraphics-okular.install12
-rw-r--r--staging/kdegraphics-strigi-analyzer/PKGBUILD31
-rw-r--r--staging/kdegraphics-svgpart/PKGBUILD31
-rw-r--r--staging/kdegraphics-thumbnailers/PKGBUILD31
-rw-r--r--staging/kdelibs/PKGBUILD65
-rw-r--r--staging/kdelibs/archlinux-menu.patch22
-rw-r--r--staging/kdelibs/fix-knotify-filepath.patch13
-rw-r--r--staging/kdelibs/kde-applications-menu.patch22
-rw-r--r--staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch32
-rw-r--r--staging/kdelibs/kdelibs.install13
-rw-r--r--staging/kdemultimedia/PKGBUILD109
-rw-r--r--staging/kdemultimedia/kdemultimedia.install11
-rw-r--r--staging/kdemultimedia/mplayerthumbs.config2
-rw-r--r--staging/kdenetwork/PKGBUILD111
-rw-r--r--staging/kdenetwork/kdenetwork.install11
-rw-r--r--staging/kdepim-runtime/PKGBUILD32
-rw-r--r--staging/kdepim-runtime/kdepim-runtime.install12
-rw-r--r--staging/kdepim/PKGBUILD252
-rw-r--r--staging/kdepim/kdepim.install11
-rw-r--r--staging/kdepimlibs/PKGBUILD32
-rw-r--r--staging/kdepimlibs/kdepimlibs.install11
-rw-r--r--staging/kdeplasma-addons/PKGBUILD603
-rw-r--r--staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install12
-rw-r--r--staging/kdeplasma-addons/kdeplasma-addons-applets.install11
-rw-r--r--staging/kdesdk-kate/PKGBUILD58
-rw-r--r--staging/kdesdk-kate/kdebase-kwrite.install12
-rw-r--r--staging/kdesdk-kate/kdesdk-kate.install12
-rw-r--r--staging/kdesdk-kate/pkgbuild-syntax-highlight.patch11
-rw-r--r--staging/kdesdk/PKGBUILD247
-rw-r--r--staging/kdesdk/fix-python2-path.patch64
-rw-r--r--staging/kdesdk/kdesdk-okteta.install12
-rw-r--r--staging/kdesdk/kdesdk.install11
-rw-r--r--staging/kdetoys/PKGBUILD56
-rw-r--r--staging/kdetoys/kdetoys.install11
-rw-r--r--staging/kdeutils/PKGBUILD191
-rw-r--r--staging/kdeutils/kdeutils.install11
-rw-r--r--staging/kdewebdev/PKGBUILD67
-rw-r--r--staging/kdewebdev/kdewebdev.install11
-rw-r--r--staging/kwebkitpart/PKGBUILD30
-rw-r--r--staging/kwebkitpart/kwebkitpart.install11
-rw-r--r--staging/libarchive/PKGBUILD36
-rw-r--r--staging/libarchive/release-2.8-fixes.patch234
-rw-r--r--staging/libkdcraw/PKGBUILD32
-rw-r--r--staging/libkdcraw/libkdcraw.install11
-rw-r--r--staging/libkdeedu/PKGBUILD31
-rw-r--r--staging/libkdeedu/libkdeedu.install11
-rw-r--r--staging/libkexiv2/PKGBUILD31
-rw-r--r--staging/libkipi/PKGBUILD32
-rw-r--r--staging/libkipi/libkipi.install11
-rw-r--r--staging/libksane/PKGBUILD32
-rw-r--r--staging/libksane/libksane.install11
-rw-r--r--staging/opencv/PKGBUILD119
-rw-r--r--staging/oxine/PKGBUILD28
-rw-r--r--staging/pyqt/PKGBUILD79
-rw-r--r--staging/qt/PKGBUILD126
-rw-r--r--staging/qt/assistant.desktop9
-rw-r--r--staging/qt/designer.desktop11
-rw-r--r--staging/qt/linguist.desktop10
-rw-r--r--staging/qt/qt.install12
-rw-r--r--staging/qt/qtconfig.desktop10
-rw-r--r--staging/qt3/PKGBUILD133
-rw-r--r--staging/qt3/eastern_asian_languagues.diff39
-rw-r--r--staging/qt3/gcc-4.6.patch33
-rw-r--r--staging/qt3/mysql.patch47
-rw-r--r--staging/qt3/qt-copy-kde-patches.tar.bz2bin31498 -> 0 bytes
-rw-r--r--staging/qt3/qt-font-default-subst.diff77
-rw-r--r--staging/qt3/qt-odbc.patch19
-rw-r--r--staging/qt3/qt-patches.tar.bz2bin3708 -> 0 bytes
-rw-r--r--staging/qt3/qt.install12
-rw-r--r--staging/qt3/qt.profile4
-rw-r--r--staging/qt3/qt3-png14.patch33
-rw-r--r--staging/qt3/utf8-bug-qt3.diff101
-rw-r--r--staging/qtwebkit/PKGBUILD38
-rw-r--r--staging/qtwebkit/python2-path.patch29
-rw-r--r--staging/unixodbc/PKGBUILD28
-rw-r--r--staging/xine-lib/PKGBUILD44
-rw-r--r--staging/xine-ui/PKGBUILD42
-rw-r--r--staging/xine-ui/fix_lirc.diff13
-rw-r--r--staging/xine-ui/lirc-check-a89347673097.patch64
-rw-r--r--staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch19
-rw-r--r--staging/xine-ui/xine-ui-xdg.diff206
-rw-r--r--staging/xine-ui/xine-ui.install13
-rw-r--r--testing/apr-util/PKGBUILD28
-rw-r--r--testing/arora/PKGBUILD28
-rw-r--r--testing/arora/install12
-rw-r--r--testing/binutils/PKGBUILD87
-rw-r--r--testing/binutils/binutils.install17
-rw-r--r--testing/cryptsetup/PKGBUILD37
-rw-r--r--testing/cryptsetup/encrypt_hook148
-rw-r--r--testing/cryptsetup/encrypt_install26
-rw-r--r--testing/erlang/PKGBUILD71
-rw-r--r--testing/fakeroot/PKGBUILD35
-rw-r--r--testing/fakeroot/fakeroot.install14
-rw-r--r--testing/file/PKGBUILD34
-rw-r--r--testing/fontforge/PKGBUILD39
-rw-r--r--testing/freetds/PKGBUILD28
-rw-r--r--testing/gcc/PKGBUILD254
-rw-r--r--testing/gcc/gcc-ada.install20
-rw-r--r--testing/gcc/gcc-fortran.install16
-rw-r--r--testing/gcc/gcc-go.install20
-rw-r--r--testing/gcc/gcc-hash-style-both.patch122
-rw-r--r--testing/gcc/gcc-libs.install16
-rw-r--r--testing/gcc/gcc-pr49720.patch26
-rw-r--r--testing/gcc/gcc.install20
-rw-r--r--testing/gcc/gcc_pure64.patch26
-rw-r--r--testing/ghc/PKGBUILD43
-rw-r--r--testing/ghc/build.mk150
-rw-r--r--testing/ghc/ghc.install19
-rw-r--r--testing/glibc/PKGBUILD213
-rw-r--r--testing/glibc/glibc-2.10-bz4781.patch42
-rw-r--r--testing/glibc/glibc-2.10-dont-build-timezone.patch13
-rw-r--r--testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch11
-rw-r--r--testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch26
-rw-r--r--testing/glibc/glibc-2.13-futex.patch31
-rw-r--r--testing/glibc/glibc-2.14-libdl-crash.patch132
-rw-r--r--testing/glibc/glibc-2.14-reexport-rpc-interface.patch26
-rw-r--r--testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch28
-rw-r--r--testing/glibc/glibc-2.14-revert-4768ae77.patch37
-rw-r--r--testing/glibc/glibc-2.14.1-tzfile-overflow.patch72
-rw-r--r--testing/glibc/glibc-2.15-lddebug-scopes.patch27
-rw-r--r--testing/glibc/glibc-2.15-math64crash.patch184
-rw-r--r--testing/glibc/glibc-2.15-revert-c5a0802a.patch229
-rw-r--r--testing/glibc/glibc-__i686.patch13
-rw-r--r--testing/glibc/glibc.install20
-rwxr-xr-xtesting/glibc/locale-gen42
-rw-r--r--testing/glibc/locale.gen.txt23
-rwxr-xr-xtesting/glibc/nscd40
-rw-r--r--testing/graphicsmagick/PKGBUILD55
-rw-r--r--testing/gtk3/PKGBUILD38
-rw-r--r--testing/gtk3/gtk3.install15
-rw-r--r--testing/gtk3/settings.ini2
-rw-r--r--testing/inetutils/PKGBUILD78
-rw-r--r--testing/inetutils/dnsdomainname3
-rw-r--r--testing/inetutils/domainname3
-rw-r--r--testing/inetutils/ftpd.conf4
-rw-r--r--testing/inetutils/ftpd.rc37
-rw-r--r--testing/inetutils/inetutils.install20
-rw-r--r--testing/inetutils/rexec.xinetd10
-rw-r--r--testing/inetutils/rlogin.xinetd10
-rw-r--r--testing/inetutils/rsh.xinetd10
-rw-r--r--testing/inetutils/talk.xinetd10
-rw-r--r--testing/inetutils/telnet.xinetd10
-rw-r--r--testing/kdevplatform/PKGBUILD39
-rw-r--r--testing/kdevplatform/kdevplatform.install11
-rw-r--r--testing/kdevplatform/subversion17.patch127
-rw-r--r--testing/keyutils/PKGBUILD24
-rw-r--r--testing/krb5/PKGBUILD90
-rw-r--r--testing/krb5/krb5-1.9.1-2011-007.patch40
-rw-r--r--testing/krb5/krb5-1.9.1-canonicalize-fallback.patch58
-rw-r--r--testing/krb5/krb5-1.9.1-config-script.patch27
-rw-r--r--testing/krb5/krb5-kadmind40
-rw-r--r--testing/krb5/krb5-kdc40
-rw-r--r--testing/krb5/krb5-kpropd40
-rw-r--r--testing/kwebkitpart/PKGBUILD30
-rw-r--r--testing/kwebkitpart/kwebkitpart.install11
-rw-r--r--testing/libdrm/list.h137
-rw-r--r--testing/libdrm/rbo.h50
-rw-r--r--testing/libpcap/PKGBUILD38
-rw-r--r--testing/libreoffice/PKGBUILD923
-rw-r--r--testing/libreoffice/PKGBUILD.next_stable924
-rw-r--r--testing/libreoffice/buildfix_boost.diff40
-rw-r--r--testing/libreoffice/buildfix_ct2n.diff17
-rw-r--r--testing/libreoffice/gcc462_buildfix.diff138
-rw-r--r--testing/libreoffice/libreoffice.install47
-rw-r--r--testing/libreoffice/scp2-more-reasonable-file-access-rights.diff15
-rw-r--r--testing/libreoffice/vbahelper.visibility.patch33
-rw-r--r--testing/libspiro/PKGBUILD25
-rw-r--r--testing/linux-api-headers/PKGBUILD42
-rw-r--r--testing/llvm/PKGBUILD199
-rw-r--r--testing/llvm/cindexer-clang-path.patch10
-rw-r--r--testing/llvm/clang-plugin-loader-registry.patch11
-rw-r--r--testing/llvm/clang-pure64.patch13
-rw-r--r--testing/llvm/enable-lto.patch32
-rw-r--r--testing/llvm/fix-gold-lto-linking.patch11
-rw-r--r--testing/module-init-tools/PKGBUILD49
-rw-r--r--testing/module-init-tools/depmod.conf5
-rw-r--r--testing/module-init-tools/docfix.patch90
-rw-r--r--testing/module-init-tools/modprobe.conf3
-rw-r--r--testing/nilfs-utils/PKGBUILD26
-rw-r--r--testing/ntp/PKGBUILD62
-rw-r--r--testing/ntp/install19
-rw-r--r--testing/ntp/ntp.conf23
-rwxr-xr-xtesting/ntp/ntpd47
-rw-r--r--testing/ntp/ntpd.conf5
-rwxr-xr-xtesting/ntp/ntpdate29
-rw-r--r--testing/openldap/PKGBUILD96
-rw-r--r--testing/openldap/ntlm.patch230
-rw-r--r--testing/openldap/openldap.install20
-rwxr-xr-xtesting/openldap/slapd49
-rw-r--r--testing/openldap/slapd.default6
-rw-r--r--testing/openvpn/PKGBUILD72
-rw-r--r--testing/openvpn/openvpn-tapdev.conf12
-rwxr-xr-xtesting/openvpn/openvpn-tapdev.rc40
-rwxr-xr-xtesting/openvpn/openvpn.rc43
-rw-r--r--testing/pcre/PKGBUILD43
-rw-r--r--testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch83
-rw-r--r--testing/perl/ChangeLog66
-rw-r--r--testing/perl/PKGBUILD116
-rw-r--r--testing/perl/fix-h2ph-and-tests.patch104
-rw-r--r--testing/perl/perl.install10
-rw-r--r--testing/perl/perlbin.csh15
-rwxr-xr-xtesting/perl/perlbin.sh18
-rw-r--r--testing/perl/provides.pl286
-rw-r--r--testing/php/PKGBUILD365
-rw-r--r--testing/php/apache.conf13
-rw-r--r--testing/php/logrotate.d.php-fpm6
-rw-r--r--testing/php/php-fpm.conf.in.patch80
-rw-r--r--testing/php/php.ini.patch126
-rw-r--r--testing/php/rc.d.php-fpm158
-rw-r--r--testing/pulseaudio/PKGBUILD104
-rw-r--r--testing/pulseaudio/pulseaudio.install23
-rw-r--r--testing/pulseaudio/pulseaudio.xinit12
-rw-r--r--testing/pyqt/PKGBUILD79
-rw-r--r--testing/qt/PKGBUILD126
-rw-r--r--testing/qt/assistant.desktop9
-rw-r--r--testing/qt/designer.desktop11
-rw-r--r--testing/qt/linguist.desktop10
-rw-r--r--testing/qt/qt.install12
-rw-r--r--testing/qt/qtconfig.desktop10
-rw-r--r--testing/qt3/PKGBUILD133
-rw-r--r--testing/qt3/eastern_asian_languagues.diff39
-rw-r--r--testing/qt3/gcc-4.6.patch33
-rw-r--r--testing/qt3/mysql.patch47
-rw-r--r--testing/qt3/qt-copy-kde-patches.tar.bz2bin31498 -> 0 bytes
-rw-r--r--testing/qt3/qt-font-default-subst.diff77
-rw-r--r--testing/qt3/qt-odbc.patch19
-rw-r--r--testing/qt3/qt-patches.tar.bz2bin3708 -> 0 bytes
-rw-r--r--testing/qt3/qt.install12
-rw-r--r--testing/qt3/qt.profile4
-rw-r--r--testing/qt3/qt3-png14.patch33
-rw-r--r--testing/qt3/utf8-bug-qt3.diff101
-rw-r--r--testing/qtwebkit/PKGBUILD38
-rw-r--r--testing/qtwebkit/python2-path.patch29
-rw-r--r--testing/redland/PKGBUILD79
-rw-r--r--testing/redland/rpath.diff11
-rw-r--r--testing/shadow/LICENSE31
-rw-r--r--testing/shadow/PKGBUILD107
-rw-r--r--testing/shadow/adduser399
-rw-r--r--testing/shadow/chgpasswd4
-rw-r--r--testing/shadow/chpasswd6
-rw-r--r--testing/shadow/defaults.pam6
-rw-r--r--testing/shadow/login21
-rw-r--r--testing/shadow/login.defs197
-rw-r--r--testing/shadow/newusers6
-rw-r--r--testing/shadow/passwd4
-rw-r--r--testing/shadow/shadow-add-missing-include.patch11
-rw-r--r--testing/shadow/shadow-strncpy-usage.patch27
-rwxr-xr-xtesting/shadow/shadow.cron.daily6
-rw-r--r--testing/shadow/shadow.install9
-rw-r--r--testing/shadow/shadow_CVE-2011-0721.patch57
-rw-r--r--testing/shadow/useradd.defaults9
-rw-r--r--testing/shadow/xstrdup.patch9
-rw-r--r--testing/subversion/PKGBUILD79
-rw-r--r--testing/subversion/subversion.rpath.fix.patch10
-rw-r--r--testing/subversion/svn11
-rw-r--r--testing/subversion/svnmerge.py2370
-rwxr-xr-xtesting/subversion/svnserve42
-rw-r--r--testing/subversion/svnserve.conf7
-rw-r--r--testing/syslinux/PKGBUILD49
-rw-r--r--testing/syslinux/syslinux-dont-build-dos-windows-targets.patch12
-rw-r--r--testing/syslinux/syslinux-install_update459
-rw-r--r--testing/syslinux/syslinux.cfg79
-rw-r--r--testing/syslinux/syslinux.install13
-rw-r--r--testing/texinfo/PKGBUILD34
-rw-r--r--testing/texinfo/texinfo-4.13a-data_types.patch32
-rw-r--r--testing/texinfo/texinfo.install21
-rw-r--r--testing/twisted/PKGBUILD34
-rw-r--r--testing/twisted/twisted.install11
-rw-r--r--testing/unixodbc/PKGBUILD28
-rw-r--r--testing/valgrind/PKGBUILD36
-rw-r--r--testing/valgrind/valgrind-3.7.0-glibc-2.15.patch30
-rw-r--r--testing/xulrunner/PKGBUILD52
-rw-r--r--testing/xulrunner/mozconfig38
-rw-r--r--testing/xulrunner/mozilla-pkgconfig.patch40
-rw-r--r--~lukeshu/iceweasel-libre-current/PKGBUILD124
-rw-r--r--~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml12
-rw-r--r--~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml8
-rw-r--r--~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml8
-rw-r--r--~lukeshu/iceweasel-libre-current/iceweasel.install21
-rw-r--r--~lukeshu/iceweasel-libre-current/internet-archive.xml12
-rw-r--r--~lukeshu/iceweasel-libre-current/jamendo-en.xml12
-rw-r--r--~lukeshu/iceweasel-libre-current/libre.patch391
-rw-r--r--~lukeshu/iceweasel-libre-current/logless-search.xml8
-rw-r--r--~lukeshu/iceweasel-libre-current/mozconfig39
-rw-r--r--~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch12
-rw-r--r--~lukeshu/iceweasel-libre-current/region.properties23
-rw-r--r--~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml14
-rw-r--r--~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch11
-rw-r--r--~lukeshu/iceweasel-libre-current/yacy.xml9
-rw-r--r--~lukeshu/openni-unstable/openni.install11
903 files changed, 0 insertions, 63282 deletions
diff --git a/community-staging/bibletime/PKGBUILD b/community-staging/bibletime/PKGBUILD
deleted file mode 100644
index 906c908f1..000000000
--- a/community-staging/bibletime/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 60743 2011-12-17 13:42:53Z arodseth $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de>
-pkgname=bibletime
-pkgver=2.9.0
-pkgrel=2
-pkgdesc="Bible study tool for KDE4"
-arch=('x86_64' 'i686')
-url="http://www.bibletime.info/"
-license=('GPL2')
-depends=('qt' 'sword' 'openssl' 'clucene' 'qtwebkit')
-makedepends=('cmake' 'boost-libs')
-install=$pkgname.install
-source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('0190b64de5892fc5f45e9a3d46bb29d6')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release "$srcdir/$pkgname-$pkgver"
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/bibletime/bibletime.install b/community-staging/bibletime/bibletime.install
deleted file mode 100644
index ad97d7bab..000000000
--- a/community-staging/bibletime/bibletime.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_install() {
- post_upgrade
-}
-
-post_remove() {
- post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD
deleted file mode 100644
index 2c463a795..000000000
--- a/community-staging/fatrat/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 60756 2011-12-17 15:17:48Z andrea $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=fatrat
-pkgver=1.2.0_beta1
-pkgrel=3
-pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
-arch=('i686' 'x86_64')
-url="http://fatrat.dolezel.info/"
-license=('GPL')
-depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
-makedepends=('boost' 'cmake' 'java-environment')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz)
-md5sums=('7ce4d5e6318361f36ba5ac86a5755da9')
-
-build() {
- cd $pkgname-$pkgver
-
- . /etc/profile.d/jre.sh
- . /etc/profile.d/jdk.sh
-
- cmake \
- -DWITH_EVERYTHING=ON \
- -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS="-lpthread" \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- .
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/freeradius/PKGBUILD b/community-staging/freeradius/PKGBUILD
deleted file mode 100644
index 1beb9c0c7..000000000
--- a/community-staging/freeradius/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 60681 2011-12-16 21:36:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jason R Begley (jayray@digitalgoat.com>
-
-pkgname=freeradius
-pkgver=2.1.12
-pkgrel=3
-pkgdesc="The premier open source RADIUS server"
-arch=('i686' 'x86_64')
-url="http://www.freeradius.org/"
-license=("GPL")
-depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam'
- 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow')
-makedepends=('libpcap' 'unixodbc' 'python2')
-optdepends=('libpcap' 'unixodbc' 'python2')
-options=('!libtool' 'emptydirs' '!makeflags')
-install=$pkgname.install
-source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2
- radiusd
- krb5-build-fix.patch)
-md5sums=('862d3a2c11011e61890ba84fa636ed8c'
- 'f1a6530b1b69d2fa793aa45b2de379bb'
- 'c6a61de7576933f59154a53bfc12a2d2')
-
-build() {
- cd $srcdir/freeradius-server-$pkgver
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
- sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in
- patch -p1 <$srcdir/krb5-build-fix.patch
- ./configure --with-system-libtool --with-system-libltdl \
- --prefix=/usr --enable-heimdal-krb5 \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --libdir=/usr/lib/freeradius
- make
-}
-
-package() {
- cd $srcdir/freeradius-server-$pkgver
- make install R=$pkgdir
- install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd
- chmod o+r $pkgdir/etc/raddb/*
- mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default
- rm -rf $pkgdir/var/run
-}
diff --git a/community-staging/freeradius/freeradius.install b/community-staging/freeradius/freeradius.install
deleted file mode 100644
index c3b9f9415..000000000
--- a/community-staging/freeradius/freeradius.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- groupadd -r radiusd
- useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd
-
- touch /var/log/radius/radius.log
- chown -R radiusd.radiusd /var/log/radius/radius.log
-
- [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb
-
- /bin/true
-}
-
-pre_remove() {
- /etc/rc.d/radiusd stop
- /bin/true
-}
-
-post_remove() {
- userdel radiusd
- groupdel radiusd
- /bin/true
-}
diff --git a/community-staging/freeradius/krb5-build-fix.patch b/community-staging/freeradius/krb5-build-fix.patch
deleted file mode 100644
index 11dae7090..000000000
--- a/community-staging/freeradius/krb5-build-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c
---- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000
-+++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000
-@@ -375,7 +375,7 @@
- * Heimdal krb5 verification
- */
- radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n",
-- *userP->name.name_string.val,
-+ "-" /* *userP->name.name_string.val*/,
- userP->realm);
-
- krb5_cc_default(context, &id);
-@@ -390,7 +390,7 @@
-
- radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )",
- error_message(ret),
-- *userP->name.name_string.val,
-+ "-" /* *userP->name.name_string.val */,
- userP->realm);
-
- return RLM_MODULE_REJECT;
diff --git a/community-staging/freeradius/radiusd b/community-staging/freeradius/radiusd
deleted file mode 100644
index bf872b6f2..000000000
--- a/community-staging/freeradius/radiusd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/radiusd`
-case "$1" in
- start)
- stat_busy "Starting radiusd Server"
-
- [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd
- [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid
- chown -R radiusd.radiusd /var/run/radiusd
-
- [ -z "$PID" ] && /usr/sbin/radiusd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo $PID > /var/run/radiusd.pid
- add_daemon radiusd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping radiusd Server"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm /var/run/radiusd.pid
- rm_daemon radiusd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/gambas2/PKGBUILD b/community-staging/gambas2/PKGBUILD
deleted file mode 100644
index 8622c023c..000000000
--- a/community-staging/gambas2/PKGBUILD
+++ /dev/null
@@ -1,950 +0,0 @@
-# $Id: PKGBUILD 60741 2011-12-17 13:18:16Z lcarlier $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Biru Ionut <ionut@archlinux.ro>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Toni Foerster <stonerl@skeps.de>
-
-pkgbase="gambas2"
-pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
- 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
- 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
- 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3'
- 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
- 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
- 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
- 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
- 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
- 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
- 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
- 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-pkgver=2.23.1
-pkgrel=6
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net"
-depends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils'
- 'postgresql-libs>=8.4.1' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3'
- 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
- 'libxcursor' 'libsm')
-makedepends=('intltool' 'mysql' 'postgresql')
-license=('GPL2')
-options=('!emptydirs' '!makeflags')
-groups=('gambas2')
-replaces=('gambas2')
-conflicts=('gambas2')
-source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
- 'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch'
- 'poppler-0.18.patch'
- 'gambas2-script.install' 'gambas2-runtime.install')
-md5sums=('ff8d2c1f310222c150b114e7ce247dfd'
- '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
- 'ac9703b390502ed3242c8d34485c9236'
- 'a551b4b216bbdb3489f3c264bf73ee66'
- '870ff5b4b33cd75aa9c290539e6fdd5d'
- 'ab5667175c4945282d2f40a35d0e9e5b')
-_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
-
-_buildgbcomp() {
- cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
- install $1.gambas ${pkgdir}/usr/lib/gambas2/
- install .component ${pkgdir}/usr/lib/gambas2/$1.component
- chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component
- install .info ${pkgdir}/usr/share/gambas2/info/$1.info
- chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info
- install .list ${pkgdir}/usr/share/gambas2/info/$1.list
- chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list
- if test -d control; then
- install -d ${pkgdir}/usr/share/gambas2/control/$1
- install control/*.png ${pkgdir}/usr/share/gambas2/control/$1
- chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png
- fi
-}
-
-build() {
- cd "${srcdir}/$pkgbase-$pkgver"
-
- ## workaround to allow package splitting
- msg "Applying patches ..."
- patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch"
- # merged upstream
- patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch"
- patch -Np2 -i "${srcdir}/poppler-0.18.patch"
- ./reconf-all
- ##
-
- . /etc/profile.d/kde3.sh
- . /etc/profile.d/qt3.sh
-
- ./configure -C --disable-qte --prefix=/usr
- make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas2-meta() {
- depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
- 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
- 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
- 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3'
- 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
- 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
- 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
- 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
- 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
- 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
- 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
- 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
- pkgdesc="Gambas2 meta package"
-}
-
-package_gambas2-runtime() {
- depends=('libffi' 'xdg-utils')
- pkgdesc="Gambas2 runtime environment"
- install=gambas2-runtime.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \
- ${pkgdir}/usr/lib/gambas2
- ln -s gbx2 ${pkgdir}/usr/bin/gbr2
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-
- ## needed for postinst with xdg-utils
- install -d -m755 ${pkgdir}/usr/share/gambas2/mime
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \
- ${pkgdir}/usr/share/gambas2/mime/
- install -d -m755 ${pkgdir}/usr/share/gambas2/icons
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \
- ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png
-}
-
-package_gambas2-devel() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 development environment"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-ide() {
- depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings'
- 'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel')
- pkgdesc="Gambas2 Integrated Development Environment"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- _buildgbcomp gb.form
- _buildgbcomp gb.form.dialog
- _buildgbcomp gb.form.mdi
- _buildgbcomp gb.settings
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
- cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
- cd ${srcdir}/${pkgbase}-${pkgver}/app/src/
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
- rm ${pkgdir}/usr/bin/gbx2
- ##
-
- install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin
- install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin
- ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \
- ${pkgdir}/usr/share/applications/gambas2.desktop
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \
- ${pkgdir}/usr/share/pixmaps/gambas2.png
-}
-
-package_gambas2-examples() {
- depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
- 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
- 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3'
- 'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
- 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
- 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
- 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
- 'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
- 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
- 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
- 'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
- pkgdesc="Gambas2 examples"
-# arch=('any')
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib
- rm -r ${pkgdir}/usr/share/gambas2/{help,info}
-}
-
-package_gambas2-help() {
- depends=()
- pkgdesc="Gambas2 help files"
-# arch=('any')
-
- cd ${srcdir}/${pkgbase}-${pkgver}/help
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- #fix help
- chown root:root -R ${pkgdir}/usr/share/gambas2/help/help
-}
-
-package_gambas2-script() {
- depends=('gambas2-devel')
- pkgdesc="Gambas2 scripter and server programs support"
- install=gambas2-script.install
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
- install -m755 gbs2.gambas ${pkgdir}/usr/bin
-
- ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2
- ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
- rm ${pkgdir}/usr/bin/gbx2
- ##
-
- ## needed for postinst with xdg-utils
- cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
- install -d -m755 ${pkgdir}/usr/share/gambas2/mime
- install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/
- install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/
- ##
-}
-
-package_gambas2-gb-chart() {
- depends=('gambas2-gb-form')
- pkgdesc="Gambas2 chart component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.form
- _buildgbcomp gb.chart
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-compress() {
- depends=('gambas2-runtime' 'bzip2' 'zlib')
- pkgdesc="Gambas2 compression support component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-corba() {
- depends=('gambas2-runtime' 'omniorb')
- pkgdesc="Gambas2 corba component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-crypt() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 MD5/DES crypting component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-firebird() {
- depends=('gambas2-gb-db' 'libfbclient')
- pkgdesc="Gambas2 Firebird database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-form() {
- depends=('gambas2-gb-db' 'gambas2-gb-form')
- pkgdesc="Gambas2 database form component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.db.form
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-db-mysql() {
- depends=('gambas2-gb-db' 'libmysqlclient')
- pkgdesc="Gambas2 MySQL database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-odbc() {
- depends=('gambas2-gb-db' 'unixodbc')
- pkgdesc="Gambas2 ODBC database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-postgresql() {
- depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1')
- pkgdesc="Gambas2 PostgreSQL database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-sqlite2() {
- depends=('gambas2-gb-db' 'sqlite2')
- pkgdesc="Gambas2 Sqlite2 database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-sqlite3() {
- depends=('gambas2-gb-db' 'sqlite3')
- pkgdesc="Gambas2 Sqlite3 database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-desktop() {
- depends=('gambas2-runtime' 'libsm' 'libxtst')
- pkgdesc="Gambas2 desktop component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-form() {
- depends=('gambas2-gb-gui')
- pkgdesc="Gambas2 form component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.form
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-form-dialog() {
- depends=('gambas2-gb-form')
- pkgdesc="Gambas2 form dialog component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.form
- _buildgbcomp gb.form.dialog
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-form-mdi() {
- depends=('gambas2-gb-form')
- pkgdesc="Gambas2 form MDI component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.form
- _buildgbcomp gb.form.mdi
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-gtk() {
- depends=('gambas2-runtime' 'gtk2')
- pkgdesc="Gambas2 graphical GTK+ toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-gtk-ext() {
- depends=('gambas2-gb-gtk')
- pkgdesc="Gambas2 graphical GTK+ toolkit extension component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-gtk-svg() {
- depends=('gambas2-gb-gtk' 'librsvg')
- pkgdesc="Gambas2 graphical GTK+ toolkit svg component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-gui() {
- depends=('gambas2-gb-qt' 'gambas2-gb-gtk')
- pkgdesc="Gambas2 automatic gui toolkit chooser"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-image() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 image processing component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.image
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-info() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 info component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- _buildgbcomp gb.info
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-net() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 networking component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-net-curl() {
- depends=('gambas2-runtime' 'curl')
- pkgdesc="Gambas2 advanced networking component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-net-smtp() {
- depends=('gambas2-runtime' 'glib2')
- pkgdesc="Gambas2 SMTP component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-opengl() {
- depends=('gambas2-runtime' 'libgl' 'mesa')
- pkgdesc="Gambas2 OpenGL component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-option() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 command-line options component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-pcre() {
- depends=('gambas2-runtime' 'pcre')
- pkgdesc="Gambas2 PCRE component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-pdf() {
- depends=('gambas2-runtime' 'poppler-glib')
- pkgdesc="Gambas2 PDF component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-qt() {
- depends=('gambas2-runtime' 'qt3')
- pkgdesc="Gambas2 graphical QT toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-qt-ext() {
- depends=('gambas2-gb-qt')
- pkgdesc="Gambas2 graphical QT toolkit extension component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-qt-opengl() {
- depends=('gambas2-gb-qt' 'libgl')
- pkgdesc="Gambas2 graphical QT toolkit OpenGL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-qt-kde() {
- depends=('gambas2-gb-qt' 'kdelibs3')
- pkgdesc="Gambas2 KDE component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html*
- rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html*
-}
-
-package_gambas2-gb-qt-kde-html() {
- depends=('gambas2-gb-qt-kde')
- pkgdesc="Gambas2 KHTML component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-report() {
- depends=('gambas2-runtime' 'gambas2-gb-form')
- pkgdesc="Gambas2 report component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.form
- _buildgbcomp gb.report
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-sdl() {
- depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl')
- pkgdesc="Gambas2 SDL component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-sdl-sound() {
- depends=('gambas2-runtime' 'sdl_mixer')
- pkgdesc="Gambas2 SDL sound component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-settings() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 settings management component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- _buildgbcomp gb.settings
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-v4l() {
- depends=('gambas2-runtime' 'libjpeg' 'libpng')
- pkgdesc="Gambas2 V4L component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-vb() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 VB transitional component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-web() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 CGI component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- _buildgbcomp gb.web
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-xml() {
- depends=('gambas2-runtime' 'libxml2')
- pkgdesc="Gambas2 xml component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-xml-rpc() {
- depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl')
- pkgdesc="Gambas2 xml-rpc component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*}
- rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-xml-xslt() {
- depends=('gambas2-gb-xml' 'libxslt')
- pkgdesc="Gambas2 xml-xslt component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
diff --git a/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch
deleted file mode 100644
index 0b6e68df3..000000000
--- a/community-staging/gambas2/db.firebird.gcc-4.6.0-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:01:54 3864
-+++ gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:26:41 3865
-@@ -1216,7 +1216,8 @@
- GB.StoreVariant(&fantom, &buffer[i]);
- }
- else{
-- GB.StoreVariant(&res->GetData(pos,i), &buffer[i]);
-+ GB_VARIANT val = res->GetData(pos,i);
-+ GB.StoreVariant(&val , &buffer[i]);
- }
- }
- }
-@@ -1874,6 +1875,8 @@
- static char query[SQLMAXLEN];
- int type;
- std::string str1,str2;
-+ GB_VARIANT varval;
-+ char* charval;
- snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field);
- if (do_query(db, query, &res, "Unable to get the field from the table")){
- delete res;
-@@ -1900,9 +1903,11 @@
- str1=res->GetData(0,3).value.value._string;
- if(str1!="")
- str2=str1.assign(str1,8,str1.length()-8);
-- GB.FreeString(&res->GetData(0,3).value.value._string);
-+ charval = res->GetData(0,3).value.value._string;
-+ GB.FreeString(&charval);
- res->SetData(0,3,str2);
-- GB.StoreVariant(&res->GetData(0,3), &info->def);
-+ varval = res->GetData(0,3);
-+ GB.StoreVariant(&varval, &info->def);
- }
- delete res;
- return FALSE;
diff --git a/community-staging/gambas2/fix-gbi-gba-path.patch b/community-staging/gambas2/fix-gbi-gba-path.patch
deleted file mode 100644
index 9be8e921e..000000000
--- a/community-staging/gambas2/fix-gbi-gba-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- component.am 2010-03-15 20:54:43.000000000 +0100
-+++ ../component.am 2010-04-30 15:00:47.218700833 +0200
-@@ -6,17 +6,17 @@
- @if test -d $(COMPONENT); then \
- echo "Compiling the $(COMPONENT) project..."; \
- ( \
-- $(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
-+ $(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
- cd $(COMPONENT); \
-- $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
-- $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
-+ $(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
-+ $(GBFILES)/gba$(GAMBAS_VERSION); \
- rm -rf .gambas; \
- $(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \
- ) \
- fi
- @echo
- @echo "Creating the information files for $(COMPONENT) component..."
-- @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
-+ @$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
- @echo
-
- uninstall-hook:
diff --git a/community-staging/gambas2/gambas2-runtime.install b/community-staging/gambas2/gambas2-runtime.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-staging/gambas2/gambas2-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
- xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
- xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gambas2/gambas2-script.install b/community-staging/gambas2/gambas2-script.install
deleted file mode 100644
index 86558e434..000000000
--- a/community-staging/gambas2/gambas2-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage
- xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml
- xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
- xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml
- xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-staging/gambas2/gambas2.install b/community-staging/gambas2/gambas2.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-staging/gambas2/gambas2.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
- xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
- xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/gambas2/poppler-0.18.patch b/community-staging/gambas2/poppler-0.18.patch
deleted file mode 100644
index fbcc430bf..000000000
--- a/community-staging/gambas2/poppler-0.18.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- gambas/trunk/gb.pdf/configure.ac 2010/07/14 01:50:18 3038
-+++ gambas/trunk/gb.pdf/configure.ac 2011/08/09 10:43:30 3997
-@@ -22,6 +22,8 @@
- AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8)
- pkg-config --atleast-version=0.11.3 poppler
- AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
-+ pkg-config --atleast-version=0.17.0 poppler
-+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
- fi
-
- AC_OUTPUT( \
-
---- gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/06/03 00:51:09 3870
-+++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/08/09 10:43:30 3997
-@@ -44,6 +44,7 @@
- #include <Outline.h>
- #include <Link.h>
- #include <Gfx.h>
-+#include <glib/poppler-features.h>
-
- /*****************************************************************************
-
-@@ -956,12 +957,17 @@
- Bookmarks of a PDF page
-
- ******************************************************************************/
-+
- void aux_fill_links(void *_object)
- {
-+ #if POPPLER_VERSION_0_17
-+ THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
-+ #else
- Object obj;
-
- THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ());
- obj.free();
-+ #endif
- }
-
- BEGIN_PROPERTY (PDFPAGELINKS_count)
diff --git a/community-staging/gambas3/PKGBUILD b/community-staging/gambas3/PKGBUILD
deleted file mode 100644
index 1347dcd2c..000000000
--- a/community-staging/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1097 +0,0 @@
-# $Id: PKGBUILD 60777 2011-12-17 18:38:00Z andrea $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
- 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
- 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
- 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form'
- 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
- 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
- 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
- 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
- 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
- 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-pkgver=2.99.6
-pkgrel=5
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net/"
-license=('GPL')
-groups=('gambas3')
-makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
- 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2'
- 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
- 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
- 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
-options=('!emptydirs' '!makeflags')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
- 'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('746aaae5494c4b267bdae802c5c006d5'
- 'b284be39d147ec799f1116a6abc068b4'
- 'b5cc403990f31b8ea1c5cf37366d3d29')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- ./reconf-all
- ./configure --prefix=/usr -C
-
- make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas3-runtime() {
- depends=('libffi' 'xdg-utils')
- pkgdesc="Runtime environment"
- install=gambas3-runtime.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
- make DESTDIR="${pkgdir}" install
-
- cd ../gbx
- make DESTDIR="${pkgdir}" install
- cd ../lib/debug
- make DESTDIR="${pkgdir}" install
- cd ../eval
- make DESTDIR="${pkgdir}" install
- cd ../draw
- make DESTDIR="${pkgdir}" install
- install -D -m644 ../gb.component \
- ${pkgdir}/usr/lib/gambas3
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- ln -s gbx3 ${pkgdir}/usr/bin/gbr3
- gbc/gbi3 -r ${pkgdir}/usr gb
- rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la}
-
- ## needed for postinst with xdg-utils
- install -d -m755 ${pkgdir}/usr/share/gambas3/mime
- install -D -m644 mime/* \
- ${pkgdir}/usr/share/gambas3/mime/
- install -d -m755 ${pkgdir}/usr/share/gambas3/icons
- install -D -m644 mime/application-x-gambas3.png \
- ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
-
- cd gbc
- make DESTDIR="${pkgdir}" uninstall
-}
-
-package_gambas3-devel() {
- depends=('gambas3-runtime')
- pkgdesc="Development environment"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
- make DESTDIR="${pkgdir}" install
-}
-
-package_gambas3-ide() {
- depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
- 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect'
- 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
- pkgdesc="Integrated Development Environment"
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-#!! with the ide !!
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \
- ${pkgdir}/usr/share/applications/gambas3.desktop
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \
- ${pkgdir}/usr/share/pixmaps/gambas3.png
-
- rm -r ${pkgdir}/usr/bin/gb*
- rm -r ${pkgdir}/usr/lib
- rm -r ${pkgdir}/usr/share/gambas3
-}
-
-package_gambas3-script() {
- depends=('gambas3-devel')
- pkgdesc="Scripter and server programs support"
- install=gambas3-script.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## needed for postinst with xdg-utils
- cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
- install -d -m755 ${pkgdir}/usr/share/gambas3/mime
- install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/
- install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/
- ##
-
- rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}}
- rm -r ${pkgdir}/usr/lib
- rm -r ${pkgdir}/usr/share/gambas3/[c-i]*
-}
-
-package_gambas3-examples() {
- depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
- 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
- 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
- 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
- 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
- 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
- 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
- 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
- pkgdesc="Applications examples"
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- rm -r ${pkgdir}/usr/{bin,lib}
- rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
-}
-
-package_gambas3-gb-cairo() {
- depends=('gambas3-runtime' 'cairo')
- pkgdesc="Cairo component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-chart() {
- depends=('gambas3-gb-form')
- pkgdesc="Chart component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
- ##
-}
-
-package_gambas3-gb-compress() {
- depends=('gambas3-runtime' 'bzip2' 'zlib')
- pkgdesc="Compression support component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
- make DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]*
- ##
-}
-
-package_gambas3-gb-crypt() {
- depends=('gambas3-runtime')
- pkgdesc="MD5/DES crypting component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db() {
- depends=('gambas3-runtime')
- pkgdesc="Database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*}
- ##
-}
-
-package_gambas3-gb-db-form() {
- depends=('gambas3-gb-db' 'gambas3-gb-form')
- pkgdesc="Database form component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
- ##
-}
-
-package_gambas3-gb-db-mysql() {
- depends=('gambas3-gb-db' 'libmysqlclient')
- pkgdesc="MySQL database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-odbc() {
- depends=('gambas3-gb-db' 'unixodbc')
- pkgdesc="ODBC database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-postgresql() {
- depends=('gambas3-gb-db' 'postgresql-libs')
- pkgdesc="PostgreSQL database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-sqlite2() {
- depends=('gambas3-gb-db' 'sqlite2')
- pkgdesc="Sqlite2 database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-sqlite3() {
- depends=('gambas3-gb-db' 'sqlite3')
- pkgdesc="Sqlite3 database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-desktop() {
- depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring')
- pkgdesc="Desktop component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
- make DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-dbus() {
- depends=('gambas3-runtime' 'dbus-core')
- pkgdesc="DBUS component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-eval-highlight() {
- depends=('gambas3-runtime')
- pkgdesc="Expression evaluator highlight component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]*
- ##
-}
-
-package_gambas3-gb-form() {
- depends=('gambas3-gb-gui')
- pkgdesc="Form component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
- ##
-}
-
-package_gambas3-gb-form-dialog() {
- depends=('gambas3-gb-form')
- pkgdesc="Form dialog component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
- ##
-}
-
-package_gambas3-gb-form-mdi() {
- depends=('gambas3-gb-form')
- pkgdesc="Form MDI component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
- ##
-}
-
-package_gambas3-gb-form-stock() {
- depends=('gambas3-runtime')
- pkgdesc="Default stock icons component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*}
- ##
-}
-
-package_gambas3-gb-gtk() {
- depends=('gambas3-gb-image' 'gtk2' 'librsvg')
- pkgdesc="GTK+ toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-gui() {
- depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
- pkgdesc="Automatic gui toolkit chooser"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
- ##
-}
-
-package_gambas3-gb-image() {
- depends=('gambas3-runtime')
- pkgdesc="Image component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*}
- ##
-}
-
-package_gambas3-gb-image-effect() {
- depends=('gambas3-gb-image')
- pkgdesc="Image effect component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*}
- ##
-}
-
-package_gambas3-gb-image-imlib() {
- depends=('gambas3-gb-image' 'imlib2')
- pkgdesc="Imlib component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-image-io() {
- depends=('gambas3-gb-image' 'gdk-pixbuf2')
- pkgdesc="Input/Output component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net() {
- depends=('gambas3-runtime')
- pkgdesc="Network component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net-curl() {
- depends=('gambas3-gb-net' 'curl')
- pkgdesc="Curl component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net-smtp() {
- depends=('gambas3-runtime' 'glib2')
- pkgdesc="SMTP component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl() {
- depends=('gambas3-runtime' 'libgl' 'glew')
- pkgdesc="OpenGL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl-glu() {
- depends=('gambas3-gb-opengl')
- pkgdesc="GL Utility component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl-glsl() {
- depends=('gambas3-gb-opengl')
- pkgdesc="GLSL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-option() {
- depends=('gambas3-runtime')
- pkgdesc="Getopt component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*}
- ##
-}
-
-package_gambas3-gb-pcre() {
- depends=('gambas3-runtime' 'pcre')
- pkgdesc="PCRE component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-pdf() {
- depends=('gambas3-runtime' 'poppler')
- pkgdesc="PDF component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4() {
- depends=('gambas3-gb-image' 'qt')
- pkgdesc="Qt4 toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-ext() {
- depends=('gambas3-gb-qt4')
- pkgdesc="Qt4 toolkit extended component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-opengl() {
- depends=('gambas3-gb-qt4' 'libgl')
- pkgdesc="Qt4 toolkit OpenGL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-webkit() {
- depends=('gambas3-gb-qt4' 'qtwebkit')
- pkgdesc="Qt4 toolkit webkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-report() {
- depends=('gambas3-gb-form' 'gambas3-gb-image-io')
- pkgdesc="Report component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
- ##
-}
-
-package_gambas3-gb-sdl() {
- depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl')
- pkgdesc="SDL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-sdl-sound() {
- depends=('gambas3-runtime' 'sdl_mixer')
- pkgdesc="SDL sound component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-settings() {
- depends=('gambas3-runtime')
- pkgdesc="Setting component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
- ##
-}
-
-package_gambas3-gb-signal() {
- depends=('gambas3-runtime')
- pkgdesc="Signal component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*}
- ##
-}
-
-package_gambas3-gb-v4l() {
- depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
- pkgdesc="Video4linux component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-vb() {
- depends=('gambas3-runtime')
- pkgdesc="VB transitional component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]*
- ##
-}
-
-package_gambas3-gb-xml() {
- depends=('gambas3-runtime' 'libxml2')
- pkgdesc="XML component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-xml-rpc() {
- depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
- pkgdesc="XML-RPC component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
- ##
-}
-
-package_gambas3-gb-xml-xslt() {
- depends=('gambas3-gb-xml' 'libxslt')
- pkgdesc="XML-XSLT component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-web() {
- depends=('gambas3-runtime')
- pkgdesc="CGI component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
- ##
-}
diff --git a/community-staging/gambas3/gambas3-runtime.install b/community-staging/gambas3/gambas3-runtime.install
deleted file mode 100644
index 6c8201a6a..000000000
--- a/community-staging/gambas3/gambas3-runtime.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3
- xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml
-}
diff --git a/community-staging/gambas3/gambas3-script.install b/community-staging/gambas3/gambas3-script.install
deleted file mode 100644
index 77c1aa52f..000000000
--- a/community-staging/gambas3/gambas3-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
- xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
- xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-staging/gogglesmm/PKGBUILD b/community-staging/gogglesmm/PKGBUILD
deleted file mode 100644
index f1a0968d6..000000000
--- a/community-staging/gogglesmm/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 61610 2012-01-04 21:20:00Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Sander Jansen <sander@knology.net>
-
-pkgname=gogglesmm
-pkgver=0.12.5
-pkgrel=2
-pkgdesc="Music Manager and Player"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/gogglesmm/"
-license=('GPL3')
-install=gogglesmm.install
-depends=('fox>=1.6.0' 'xine-lib>=1.0' 'sqlite3>=3.4.0' 'taglib' 'dbus-core' 'curl' 'expat' 'libgcrypt')
-makedepends=('pkgconfig' 'glproto' 'dri2proto')
-replaces=('musicmanager')
-conflicts=('musicmanager')
-source=(http://gogglesmm.googlecode.com/files/gogglesmm-$pkgver.tar.bz2)
-md5sums=('07e92bcf2daf39d6b380590816edd013')
-
-build() {
- cd $srcdir/gogglesmm-$pkgver
- patch configure <<EOF
-diff gogglesmm-0.12.5/configure gogglesmm-0.12.5.my/configure
-206,207c206,207
-< XINE_MINOR=\${XINE_MINOR:-1}
-< XINE_LEVEL=\${XINE_LEVEL:-16}
----
-> XINE_MINOR=\${XINE_MINOR:-2}
-> XINE_LEVEL=\${XINE_LEVEL:-0}
-EOF
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/gogglesmm-$pkgver
- mkdir -p $pkgdir/usr/bin
- make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/gogglesmm/gogglesmm.install b/community-staging/gogglesmm/gogglesmm.install
deleted file mode 100644
index 04c026840..000000000
--- a/community-staging/gogglesmm/gogglesmm.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- which gtk-update-icon-cache >/dev/null && gtk-update-icon-cache /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-staging/goldendict/PKGBUILD b/community-staging/goldendict/PKGBUILD
deleted file mode 100644
index 17ddf5f36..000000000
--- a/community-staging/goldendict/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 60748 2011-12-17 14:29:22Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: m0rph <m0rph.mailbox@gmail.com>
-
-pkgname=goldendict
-pkgver=1.0.1
-pkgrel=5
-pkgdesc="Feature-rich dictionary lookup program"
-arch=('i686' 'x86_64')
-url="http://goldendict.berlios.de/"
-license=('GPL3')
-depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'qtwebkit' 'phonon')
-makedepds=('patch')
-provides=('stardict')
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2
- $pkgname-paths.diff)
-sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
- '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589')
-
-build(){
- cd ${srcdir}
-
- patch -Np0 -i ${srcdir}/$pkgname-paths.diff
-
- qmake
- make
- qmake
-}
-
-package() {
- cd ${srcdir}
-
- make INSTALL_ROOT=${pkgdir} install
-
- #removing unneeded
- rm -rf ${pkgdir}/usr/share/app-install
-}
diff --git a/community-staging/goldendict/goldendict-paths.diff b/community-staging/goldendict/goldendict-paths.diff
deleted file mode 100644
index 812dfdb97..000000000
--- a/community-staging/goldendict/goldendict-paths.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- goldendict.pro~ 2010-12-27 22:52:21.000000000 +0100
-+++ goldendict.pro 2010-12-27 22:52:21.000000000 +0100
-@@ -63,2 +63,2 @@
-- isEmpty( PREFIX ):PREFIX = /usr/local
-- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
-+ isEmpty( PREFIX ):PREFIX = /usr
-+ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
-@@ -66 +66 @@
-- locale.path = $$PREFIX/share/apps/goldendict/locale/
-+ locale.path = $$PREFIX/share/goldendict/locale/
diff --git a/community-staging/goldendict/goldendict.changelog b/community-staging/goldendict/goldendict.changelog
deleted file mode 100644
index a42c630d3..000000000
--- a/community-staging/goldendict/goldendict.changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-2011-12-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * goldendict 1.0.1-5 libQtWebKit.so.4 now in new qtwebkit package
-
-2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release 1.0.1
-
-2010-02-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * FS#18350 fixed in 0.9.0-5
-
-2009-06-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Package moved to [community] in v0.9.0
diff --git a/community-staging/google-gadgets/PKGBUILD b/community-staging/google-gadgets/PKGBUILD
deleted file mode 100644
index f4c1e0b83..000000000
--- a/community-staging/google-gadgets/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# $Id: PKGBUILD 60759 2011-12-17 15:18:50Z andrea $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-
-pkgbase=google-gadgets
-pkgname=('google-gadgets-common' 'google-gadgets-gtk' 'google-gadgets-qt')
-_realname=$pkgbase-for-linux
-_basedir="$startdir/pkg/base"
-pkgver=0.11.2
-_sover=1.0
-_sobump=0.0.0
-pkgrel=5
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/google-gadgets-for-linux/"
-license=('APACHE')
-makedepends=('gstreamer0.10-base-plugins' 'libwebkit'
- 'desktop-file-utils' 'xdg-utils'
- 'librsvg' 'curl' 'libsoup-gnome'
- 'qt' 'qtwebkit'
- 'networkmanager'
- 'zip' 'flex')
-options=('!libtool')
-source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2"
- "wifi-types.patch")
-md5sums=('279305553bcbf74f3e3615f6abc36a5e'
- 'f0df71c60a174e9d629db87b8bd9e102')
-
-build() {
- cd "$srcdir/$_realname-$pkgver"
-
- # Building thrice is expensive;
- # we move files around instead
- #
- # xulrunner 2.0 is incompatible;
- # we build without smjs-script/browser-element
-
- patch -p1 <$srcdir/wifi-types.patch
- ./configure --prefix=/usr \
- --disable-werror \
- --disable-update-desktop-database \
- --disable-update-mime-database \
- --with-oem-brand=Arch \
- --with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \
- --with-browser-plugins-dir=/usr/lib/mozilla/plugins \
- --disable-gtkmoz-browser-element \
- --disable-smjs-script-runtime
- make
-}
-
-package_google-gadgets-common() {
- pkgdesc="Desktop widgets from Google (common files)"
- install=$pkgbase-common.install
- depends=('hicolor-icon-theme' 'shared-mime-info')
- optdepends=('google-gadgets-gtk: GTK+ (full) UI'
- 'google-gadgets-qt: Qt (partial) UI')
-
- cd "$srcdir/$_realname-$pkgver"
-
- make -j1 DESTDIR="$pkgdir/" install
-
- # we need to remove stuff in this package
- cp -a "$pkgdir" "$_basedir"
-
- # do not force any removal; we want to know in case files change
- cd "$pkgdir/usr"
- rm -r bin
- rm -r share/applications
-
- cd "$pkgdir/usr/lib/$pkgbase"
-
- # gtk-related
- #rm gtkmoz-browser-child
- rm ../lib*gtk*
- rm modules/gtk*.so
-
- # qt-related
- rm ../lib*qt*
- rm modules/qt*.so
-}
-
-package_google-gadgets-gtk() {
- pkgdesc="Desktop widgets from Google (full GTK+ front-end)"
- groups=('google-gadgets')
- install=$pkgbase.install
- depends=('google-gadgets-common'
- 'desktop-file-utils' 'xdg-utils'
- 'gstreamer0.10-base-plugins' 'libwebkit' 'libsoup-gnome'
- 'librsvg' 'curl')
- optdepends=('networkmanager: desktop integration')
-
- # install the gtk binary
- cd "$_basedir"
- install -Dm755 "usr/bin/ggl-gtk" "$pkgdir/usr/bin/ggl-gtk"
-
- # gtk-only browser stuff
- #install -Dm755 usr/lib/$pkgbase/gtkmoz-browser-child \
- # "$pkgdir/usr/lib/$pkgbase/gtkmoz-browser-child"
-
- # now the gtk libraries
- mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
- install -m755 usr/lib/$pkgbase/modules/gtk*.so \
- "$pkgdir/usr/lib/$pkgbase/modules/"
-
- install -m755 usr/lib/lib*gtk* "$pkgdir/usr/lib"
-
- # fix permissions and symlinks
- find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
- ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-gtk-$_sover.so"
-
- ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-gtk-$_sover.so.0"
-
- # freedesktop.org for gtk
- install -Dm644 usr/share/applications/ggl-gtk.desktop \
- "$pkgdir/usr/share/applications/ggl-gtk.desktop"
-
- install -m644 usr/share/applications/ggl-designer.desktop \
- "$pkgdir/usr/share/applications/"
-}
-
-package_google-gadgets-qt() {
- pkgdesc="Desktop widgets from Google (partial Qt front-end)"
- groups=('google-gadgets')
- install=$pkgbase.install
- depends=('google-gadgets-common' 'qt' 'qtwebkit'
- 'desktop-file-utils' 'xdg-utils'
- 'gstreamer0.10-base-plugins' 'libwebkit')
- optdepends=('networkmanager: desktop integration')
-
- # install the qt binary
- cd "$_basedir"
- install -Dm755 usr/bin/ggl-qt "$pkgdir/usr/bin/ggl-qt"
-
- # the qt libraries
- mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
- install -m755 usr/lib/$pkgbase/modules/qt*.so \
- "$pkgdir/usr/lib/$pkgbase/modules/"
-
- install -m755 usr/lib/lib*qt* "$pkgdir/usr/lib/"
-
- # fix permissions and symlinks
- find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
- ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-qt-$_sover.so"
-
- ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-qt-$_sover.so.0"
-
- # freedesktop.org for qt
- install -Dm644 usr/share/applications/ggl-qt.desktop \
- "$pkgdir/usr/share/applications/ggl-qt.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/google-gadgets/google-gadgets-common.install b/community-staging/google-gadgets/google-gadgets-common.install
deleted file mode 100644
index 210cbc869..000000000
--- a/community-staging/google-gadgets/google-gadgets-common.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo "==> Updating desktop database..."
- gtk-update-icon-cache --quiet usr/share/icons/hicolor
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/google-gadgets/google-gadgets.changelog b/community-staging/google-gadgets/google-gadgets.changelog
deleted file mode 100644
index 5b8f85a71..000000000
--- a/community-staging/google-gadgets/google-gadgets.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-25 Mar 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 0.11.2-3:
- xulrunner rebuild
- - undepend on xulrunner (2.0 incompatible)
- - disable smjs-script/browser-element
- Cleaned up scriptlets (too many blank lines)
- Added this changelog
diff --git a/community-staging/google-gadgets/google-gadgets.install b/community-staging/google-gadgets/google-gadgets.install
deleted file mode 100644
index fd88688fc..000000000
--- a/community-staging/google-gadgets/google-gadgets.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo "==> Updating desktop database..."
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/google-gadgets/wifi-types.patch b/community-staging/google-gadgets/wifi-types.patch
deleted file mode 100644
index be9383a61..000000000
--- a/community-staging/google-gadgets/wifi-types.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc 2009-03-15 04:12:42.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc 2011-04-08 20:57:16.000000000 +0000
-@@ -23,17 +23,9 @@
- namespace framework {
- namespace linux_system {
-
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
-
--#ifdef NM_DEVICE_TYPE_ETHERNET
- static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET;
--#else
--static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET;
--#endif
-
- static const int kDeviceTypeUnknown = 0;
-
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc 2009-12-28 10:39:53.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc 2011-04-08 20:57:39.000000000 +0000
-@@ -77,11 +77,7 @@
-
- using namespace ggadget::dbus;
-
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
-
- // Defined in nm 0.7
- static const int kDeviceStateActivated = 8;
diff --git a/community-staging/gpsbabel/PKGBUILD b/community-staging/gpsbabel/PKGBUILD
deleted file mode 100644
index 5734523ed..000000000
--- a/community-staging/gpsbabel/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 60752 2011-12-17 14:52:14Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=gpsbabel
-pkgver=1.4.2
-pkgrel=4
-pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
-arch=('i686' 'x86_64')
-url="http://www.gpsbabel.org"
-license=('GPL')
-depends=('libusb-compat' 'expat')
-makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit')
-optdepends=('qt' 'qtwebkit')
-options=('docs')
-source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz"
- "gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD")
-md5sums=('76ea9f7852be2e98aa18976c4697ca93'
- '7bdbd243e29a8831842d31c079f04c45')
-
-build() {
- cd $srcdir/gpsbabel-$pkgver
- ./configure --prefix=/usr
- make
- make doc
- (cd gui && qmake && make)
-}
-
-package() {
- cd $srcdir/gpsbabel-$pkgver
- make DESTDIR=$pkgdir install
-
- # GUI
- install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
- install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png
- install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
-
- # Header install
- mkdir -p $pkgdir/usr/include/gpsbabel
- cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \
- $pkgdir/usr/include/gpsbabel
-
- # Doc install
- mkdir -p $pkgdir/usr/share/doc/$pkgname
- cp -r $srcdir/babelweb/* $pkgdir/usr/share/doc/$pkgname/
- cp README* $pkgdir/usr/share/doc/$pkgname/
-}
diff --git a/community-staging/kadu/PKGBUILD b/community-staging/kadu/PKGBUILD
deleted file mode 100644
index 278b2a8dd..000000000
--- a/community-staging/kadu/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 60735 2011-12-17 10:36:34Z bpiotrowski $
-# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Mateusz Herych
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-
-pkgname=kadu
-pkgver=0.10.1
-pkgrel=3
-pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
-arch=('i686' 'x86_64')
-url="http://www.kadu.net/"
-license=('GPL')
-depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
-source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('6211a9a9e02d645268cbf055892601a0')
-
-build() {
- cd "$srcdir"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}"
- rm -rf "$pkgdir/usr/share/kadu/{HISTORY,README}"
-}
diff --git a/community-staging/kvirc/PKGBUILD b/community-staging/kvirc/PKGBUILD
deleted file mode 100644
index bf4263529..000000000
--- a/community-staging/kvirc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 60754 2011-12-17 14:53:06Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=kvirc
-pkgver=4.0.4
-pkgrel=4
-pkgdesc="Qt-based IRC client"
-url="http://www.kvirc.net"
-depends=('python2' 'qt' 'libxss' 'qtwebkit')
-arch=(i686 x86_64)
-makedepends=('cmake')
-license=('GPL')
-options=("!libtool")
-install=kvirc.install
-source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2)
-md5sums=('26fd24979ae4a29bac9309b3b0c98788')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DWANT_KDE4=OFF \
- -DWANT_PERL=ON \
- -DWANT_PHONON=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd ${srcdir}/build
- make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/kvirc/kvirc.install b/community-staging/kvirc/kvirc.install
deleted file mode 100644
index 8f76d007f..000000000
--- a/community-staging/kvirc/kvirc.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
- true
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
- true
-}
diff --git a/community-staging/luminancehdr/PKGBUILD b/community-staging/luminancehdr/PKGBUILD
deleted file mode 100644
index 39dc3aab9..000000000
--- a/community-staging/luminancehdr/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 60739 2011-12-17 12:18:25Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dmitry N. Shilov <stormblast@land.ru>
-
-pkgname=luminancehdr
-pkgver=2.1.0
-pkgrel=6
-pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
-arch=('i686' 'x86_64')
-url='http://qtpfsgui.sourceforge.net/'
-license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit')
-optdepends=('hugin: align image stack functionality')
-install=$pkgname.install
-changelog=$pkgname.changelog
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz
- luminance-hdr-2.1.0-libraw.patch)
-sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac'
- 'd3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c')
-
-build() {
- cd "${srcdir}/luminance-hdr-${pkgver}"
-
- # stolen from gentoo
- patch -Np1 -i ../luminance-hdr-2.1.0-libraw.patch
-
- if [ ${CARCH} = i686 ]; then
- sed -i 's/ -msse2//' project.pro
- fi
-
- lrelease project.pro
- qmake PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}/luminance-hdr-${pkgver}"
-
- make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch
deleted file mode 100644
index 8472a7422..000000000
--- a/community-staging/luminancehdr/luminance-hdr-2.1.0-libraw.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig
-+++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp
-@@ -94,7 +94,6 @@
- RawProcessor.set_progress_handler(cb, callback_data);
- int ret;
-
-- OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
- OUT.output_bps = 16;
-
- //OUT.gamm[0] = 1/2.4; //sRGB
diff --git a/community-staging/luminancehdr/luminancehdr.changelog b/community-staging/luminancehdr/luminancehdr.changelog
deleted file mode 100644
index 378053ef5..000000000
--- a/community-staging/luminancehdr/luminancehdr.changelog
+++ /dev/null
@@ -1,33 +0,0 @@
-2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * luminancehdr 2.1.0-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * luminancehdr 2.0.2-1
-
-2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * exiv2 0.20 rebuild
-
-2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release 2.0.1
-
-2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Package renamed to LuminanceHDR
- * Update to major release 2.0.0
-
-2010-03-09 Andrea Scarpino <andrea@archlinux.org>
- * exiv2 0.19 rebuild
-
-2009-11-02 Biru Ionut <ionut@archlinux.ro>
- * add translation and fix segfault on old i686 procesors
-
-2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release v1.9.3
-
-2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Minor version (v1.9.2-3) update caused by exiv2 upgrade.
-
-2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Minor version (v1.9.2-2) update caused by openexr upgrade.
-
-2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Package moved to [community]
diff --git a/community-staging/luminancehdr/luminancehdr.install b/community-staging/luminancehdr/luminancehdr.install
deleted file mode 100644
index 279762804..000000000
--- a/community-staging/luminancehdr/luminancehdr.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/community-staging/me-tv/PKGBUILD b/community-staging/me-tv/PKGBUILD
deleted file mode 100644
index 4a97fb410..000000000
--- a/community-staging/me-tv/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-#Maintainer: jakob gruber <jakob.gruber@gmail.com>
-#Contributor: gborzi
-#Previous Contributor: Vinzenz Vietzke <vinz@archlinux.us>
-#Previous Contributor: Heiko Baums <heiko@baums-on-web.de>
-#Previous Contributor: Jeff Bailes <thepizzaking@gmail.com>
-
-pkgname=me-tv
-pkgver=2.0.1
-pkgrel=3
-pkgdesc="A GTK desktop application for watching digital television services that use the DVB standard"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/me-tv"
-license=('GPL')
-depends=('glibmm' 'gtkmm' 'gconfmm' 'glib2' 'xine-lib' 'sqlite3' 'linuxtv-dvb-apps' 'libunique' 'libxml++' 'vlc' 'gstreamer0.10-base')
-makedepends=('intltool')
-install='me-tv.install'
-source=("http://launchpad.net/${pkgname}/${pkgver:0:3}/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz")
-options=('!emptydirs')
-md5sums=('7cda820b795f2fea522ba3de5e312483')
-
-build() {
-
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure CXXFLAGS="$CXXFLAGS -D__KERNEL_STRICT_NAMES" --prefix=/usr
- make
-
-}
-
-package() {
-
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install
-
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" \
- --domain me-tv "${pkgdir}/usr/etc/gconf/schemas/${pkgname}.schemas"
-
- rm -rf "${pkgdir}/usr/etc/"
-
-}
diff --git a/community-staging/me-tv/me-tv.install b/community-staging/me-tv/me-tv.install
deleted file mode 100644
index f701b4754..000000000
--- a/community-staging/me-tv/me-tv.install
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=me-tv
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
diff --git a/community-staging/myodbc/PKGBUILD b/community-staging/myodbc/PKGBUILD
deleted file mode 100644
index 1a9738827..000000000
--- a/community-staging/myodbc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 60685 2011-12-16 21:38:28Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=myodbc
-pkgver=5.1.9
-pkgrel=2
-pkgdesc="ODBC driver/connector for MySQL"
-arch=(i686 x86_64)
-url="http://dev.mysql.com/downloads/connector/odbc/"
-depends=('unixodbc' 'libmysqlclient')
-license=('GPL')
-options=('libtool')
-source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}.tar.gz"
- myconf.h.in)
-md5sums=('80f146bd384a9011d968aa67df27e68e'
- '6c99c83e309b18d15ef0f07f0b461241')
-
-build() {
- cd $srcdir/mysql-connector-odbc-${pkgver}
- cp $srcdir/myconf.h.in driver/myconf.h.in
- [ -x configure ] || { aclocal; libtoolize; automake --add-missing; autoreconf; }
- [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \
- ./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \
- --with-mysql-path=/usr --without-x --disable-gui --disable-test
- make
-}
-
-package() {
- cd $srcdir/mysql-connector-odbc-${pkgver}
- make DESTDIR=$pkgdir install
-}
diff --git a/community-staging/myodbc/myconf.h.in b/community-staging/myodbc/myconf.h.in
deleted file mode 100644
index 2a04eebba..000000000
--- a/community-staging/myodbc/myconf.h.in
+++ /dev/null
@@ -1,165 +0,0 @@
-/* driver/myconf.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <iodbcinst.h> header file. */
-#undef HAVE_IODBCINST_H
-
-/* Define to 1 if you have the <isqlext.h> header file. */
-#undef HAVE_ISQLEXT_H
-
-/* Define to 1 if you have the <isqltypes.h> header file. */
-#undef HAVE_ISQLTYPES_H
-
-/* Define to 1 if you have the <isql.h> header file. */
-#undef HAVE_ISQL_H
-
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <odbcinst.h> header file. */
-#undef HAVE_ODBCINST_H
-
-/* Define to 1 if you have the <sqlext.h> header file. */
-#undef HAVE_SQLEXT_H
-
-/* Define if SQLGetPrivateProfileString is defined */
-#undef HAVE_SQLGETPRIVATEPROFILESTRING
-
-/* Define to 1 if you have the `SQLGetPrivateProfileStringW' function. */
-#undef HAVE_SQLGETPRIVATEPROFILESTRINGW
-
-/* Define to 1 if you have the <sqltypes.h> header file. */
-#undef HAVE_SQLTYPES_H
-
-/* Define to 1 if you have the <sql.h> header file. */
-#undef HAVE_SQL_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strndup' function. */
-#undef HAVE_STRNDUP
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define if SQLCHAR is undefined */
-#undef SQLCHAR
-
-/* Define if SQLHDBC is undefined */
-#undef SQLHDBC
-
-/* Define if SQLHENV is undefined */
-#undef SQLHENV
-
-/* Define if SQLHSTMT is undefined */
-#undef SQLHSTMT
-
-/* Define if SQLHWND is undefined */
-#undef SQLHWND
-
-/* Define if SQLINTEGER is undefined */
-#undef SQLINTEGER
-
-/* Define if SQLPOINTER is undefined */
-#undef SQLPOINTER
-
-/* Define if SQLRETURN is undefined */
-#undef SQLRETURN
-
-/* Define if SQLSMALLINT is undefined */
-#undef SQLSMALLINT
-
-/* Define if SQLUINTEGER is undefined */
-#undef SQLUINTEGER
-
-/* Define if SQLUSMALLINT is undefined */
-#undef SQLUSMALLINT
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define path to system ODBC.INI file */
-#undef SYSTEM_ODBC_INI
-
-/* Define if compiler defines C99 __func__ macro */
-#undef USE_C99_FUNC_MACRO
-
-/* Define if compiler defines __FUNCTION__ */
-#undef USE_GNU_FUNC_MACRO
-
-/* use iODBC */
-#undef USE_IODBC
-
-/* Define if SQLColAttribute() last arg is compatible with SQLLEN* */
-#undef USE_SQLCOLATTRIBUTE_SQLLEN_PTR
-
-/* Define if SQLColAttribute() last arg is compatible with SQLPOINTER */
-#undef USE_SQLCOLATTRIBUTE_SQLPOINTER
-
-/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLUINTEGER
- */
-#undef USE_SQLPARAMOPTIONS_SQLUINTEGER_PTR
-
-/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLULEN */
-#undef USE_SQLPARAMOPTIONS_SQLULEN_PTR
-
-/* use unixODBC */
-#undef USE_UNIXODBC
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
-
-/* Define if we are using unix build environment */
-#undef _UNIX_
diff --git a/community-staging/myodbc/myodbc-64bit.patch b/community-staging/myodbc/myodbc-64bit.patch
deleted file mode 100644
index ac62d816a..000000000
--- a/community-staging/myodbc/myodbc-64bit.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Fix some 64-bitness issues arising from unixODBC 2.2.14 changes.
-
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c
---- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:15:37.516602586 -0500
-@@ -1205,7 +1205,7 @@
- {
- /* See comment for fill_transfer_oct_len_buff()*/
- SQLLEN size= get_display_size(stmt, field);
-- sprintf(buff,size == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), size);
-+ sprintf(buff, (size == SQL_NO_TOTAL ? "%ld" : "%lu"), size);
-
- return size;
- }
-@@ -1228,7 +1228,7 @@
- */
- SQLLEN len= get_transfer_octet_length(stmt, field);
-
-- sprintf(buff, len == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), len );
-+ sprintf(buff, (len == SQL_NO_TOTAL ? "%ld" : "%lu"), len );
-
- return len;
- }
-@@ -1245,8 +1245,7 @@
- SQLULEN fill_column_size_buff(char *buff, STMT *stmt, MYSQL_FIELD *field)
- {
- SQLULEN size= get_column_size(stmt, field);
-- sprintf(buff, (size== SQL_NO_TOTAL ? "%d" :
-- (sizeof(SQLULEN) == 4 ? "%lu" : "%llu")), size);
-+ sprintf(buff, (size== SQL_NO_TOTAL ? "%ld" : "%lu"), size);
- return size;
- }
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_catalog.c mysql-connector-odbc-5.1.8/test/my_catalog.c
---- mysql-connector-odbc-5.1.8.orig/test/my_catalog.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/test/my_catalog.c 2010-12-23 17:16:26.284605944 -0500
-@@ -599,7 +599,7 @@
- fprintf(stdout, "# Column Name : %s\n", szColName);
- fprintf(stdout, "# NameLengh : %d\n", pcbColName);
- fprintf(stdout, "# DataType : %d\n", pfSqlType);
-- fprintf(stdout, "# ColumnSize : %d\n", pcbColDef);
-+ fprintf(stdout, "# ColumnSize : %ld\n", pcbColDef);
- fprintf(stdout, "# DecimalDigits : %d\n", pibScale);
- fprintf(stdout, "# Nullable : %d\n", pfNullable);
-
-@@ -632,7 +632,7 @@
-
- rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, sizeof(db), &len);
- mycon(hdbc,rc);
-- fprintf(stdout,"current_catalog: %s (%ld)\n", db, len);
-+ fprintf(stdout,"current_catalog: %s (%d)\n", db, len);
- is_num(len, 4);
- is_str(db, "test", 5);
-
-@@ -653,7 +653,7 @@
-
- rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, 255, &len);
- mycon(hdbc,rc);
-- fprintf(stdout,"current_catalog: %s (%ld)\n", db, len);
-+ fprintf(stdout,"current_catalog: %s (%d)\n", db, len);
- is_num(len, 17);
- is_str(db, cur_db, 18);
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_cursor.c mysql-connector-odbc-5.1.8/test/my_cursor.c
---- mysql-connector-odbc-5.1.8.orig/test/my_cursor.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/test/my_cursor.c 2010-12-23 17:12:16.632676933 -0500
-@@ -711,7 +711,7 @@
-
- rc = SQLRowCount(hstmt1,&row_count);
- mystmt(hstmt1,rc);
-- fprintf(stdout, "rows affected: %d\n", row_count);
-+ fprintf(stdout, "rows affected: %ld\n", row_count);
- myassert(row_count == 1);
-
- rc = SQLExtendedFetch(hstmt,SQL_FETCH_NEXT,1,NULL,&rgfRowStatus);
-@@ -732,7 +732,7 @@
-
- rc = SQLRowCount(hstmt1,&row_count);
- mystmt(hstmt1,rc);
-- fprintf(stdout, "rows affected: %d\n", row_count);
-+ fprintf(stdout, "rows affected: %ld\n", row_count);
- myassert(row_count == 1);
-
- SQLFreeStmt(hstmt,SQL_UNBIND);
diff --git a/community-staging/myodbc/myodbc-add-mysys.patch b/community-staging/myodbc/myodbc-add-mysys.patch
deleted file mode 100644
index a30466114..000000000
--- a/community-staging/myodbc/myodbc-add-mysys.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Add files extracted from mysql into the driver build script.
-
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/util/Makefile.am mysql-connector-odbc-5.1.8/util/Makefile.am
---- mysql-connector-odbc-5.1.8.orig/util/Makefile.am 2010-10-28 14:33:17.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/util/Makefile.am 2010-12-23 18:09:00.359695597 -0500
-@@ -10,6 +10,22 @@
- installer.c \
- odbcinstw.c \
- unicode_transcode.c \
-+ array.c \
-+ list.c \
-+ my_alloc.c \
-+ my_malloc.c \
-+ string.c \
-+ int2str.c \
-+ is_prefix.c \
-+ longlong2str.c \
-+ strcend.c \
-+ strend.c \
-+ strfill.c \
-+ strmake.c \
-+ strmov.c \
-+ strxmov.c \
-+ mysys_err.h \
-+ mysys_priv.h \
- MYODBCUtil.h \
- MYODBCUtilAllocDataSource.c \
- MYODBCUtilAllocDriver.c \
diff --git a/community-staging/myodbc/myodbc-my-free.patch b/community-staging/myodbc/myodbc-my-free.patch
deleted file mode 100644
index cf7730a59..000000000
--- a/community-staging/myodbc/myodbc-my-free.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-Once again, mysql can't manage to ship a mysql-connector-odbc release
-on time ... mysql 5.5 changed the my_free() function and the released
-connector version is not up to speed. Can't use NEAR anymore, either.
-
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog.c mysql-connector-odbc-5.1.8/driver/catalog.c
---- mysql-connector-odbc-5.1.8.orig/driver/catalog.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/catalog.c 2010-12-23 17:50:52.916552525 -0500
-@@ -94,11 +94,11 @@
- {
- if (stmt->result)
- {
-- my_free((char *)stmt->result, MYF(0));
-+ my_free((char *)stmt->result);
- }
- if (stmt->result_array)
- {
-- my_free((char *)stmt->result_array, MYF(0));
-+ my_free((char *)stmt->result_array);
- }
- set_mem_error(&stmt->dbc->mysql);
- return handle_connection_error(stmt);
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c
---- mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c 2010-12-23 17:51:41.493551970 -0500
-@@ -269,13 +269,13 @@
- pthread_mutex_lock(&dbc->lock);
- if (mysql_query(mysql, select))
- {
-- my_free(select, MYF(0));
-+ my_free(select);
- pthread_mutex_unlock(&dbc->lock);
- return NULL;
- }
- result= mysql_store_result(&dbc->mysql);
- pthread_mutex_unlock(&dbc->lock);
-- my_free(select, MYF(0));
-+ my_free(select);
-
- return result;
- }
-@@ -1094,7 +1094,7 @@
- SQLFORE_KEYS_FIELDS *
- row_count,
- MYF(0));
-- my_free((char *)tempdata, MYF(0));
-+ my_free((char *)tempdata);
-
- if (!stmt->result_array)
- {
-@@ -1323,12 +1323,12 @@
- && (j != mypcREMARKS)
- && (j != mypcCOLUMN_DEF)
- && (j != mypcIS_NULLABLE))
-- my_free(((char**)cur_params->data)[j], MYF(0));
-+ my_free(((char**)cur_params->data)[j]);
- }
- /* cleanup the list */
- params= list_delete_forward(params);
-- my_free(cur_params->data, MYF(0));
-- my_free(cur_params, MYF(0));
-+ my_free(cur_params->data);
-+ my_free(cur_params);
- }
- }
- }
-@@ -1675,7 +1675,7 @@
- }
-
- dynstr_free(&dynQuery);
-- my_free(params_r, MYF(0));
-+ my_free(params_r);
-
- return nReturn;
- }
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/desc.c mysql-connector-odbc-5.1.8/driver/desc.c
---- mysql-connector-odbc-5.1.8.orig/driver/desc.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/desc.c 2010-12-23 17:51:06.532607921 -0500
-@@ -65,7 +65,7 @@
- */
- if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
- {
-- my_free((char *)desc, MYF(0));
-+ my_free((char *)desc);
- return NULL;
- }
- desc->desc_type= desc_type;
-@@ -111,7 +111,7 @@
- if (aprec->par.alloced)
- {
- aprec->par.alloced= FALSE;
-- my_free(aprec->par.value, MYF(0));
-+ my_free(aprec->par.value);
- }
- }
- }
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/driver.h mysql-connector-odbc-5.1.8/driver/driver.h
---- mysql-connector-odbc-5.1.8.orig/driver/driver.h 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/driver.h 2010-12-23 17:50:43.017608761 -0500
-@@ -113,7 +113,7 @@
- /* Max Primary keys in a cursor * WHERE clause */
- #define MY_MAX_PK_PARTS 32
-
--#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); }
-+#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); }
-
-
- /* We don't make any assumption about what the default may be. */
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/execute.c mysql-connector-odbc-5.1.8/driver/execute.c
---- mysql-connector-odbc-5.1.8.orig/driver/execute.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/execute.c 2010-12-23 17:49:52.799552481 -0500
-@@ -96,7 +96,7 @@
- exit:
- pthread_mutex_unlock(&stmt->dbc->lock);
- if ( query != stmt->query )
-- my_free(query,MYF(0));
-+ my_free(query);
-
- /*
- If the original query was modified, we reset stmt->query so that the
-@@ -104,7 +104,7 @@
- */
- if (stmt->orig_query)
- {
-- my_free(stmt->query,MYF(0));
-+ my_free(stmt->query);
- stmt->query= stmt->orig_query;
- stmt->query_end= stmt->orig_query_end;
- stmt->orig_query= NULL;
-@@ -625,7 +625,7 @@
-
- out:
- if (free_data)
-- my_free(data, MYF(0));
-+ my_free(data);
-
- *toptr= to;
- return SQL_SUCCESS;
-@@ -1060,7 +1060,7 @@
- if ( cbValue == SQL_NULL_DATA )
- {
- if ( aprec->par.alloced )
-- my_free(aprec->par.value,MYF(0));
-+ my_free(aprec->par.value);
- aprec->par.alloced= FALSE;
- aprec->par.value= NULL;
- return SQL_SUCCESS;
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/handle.c mysql-connector-odbc-5.1.8/driver/handle.c
---- mysql-connector-odbc-5.1.8.orig/driver/handle.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/handle.c 2010-12-23 17:50:17.425586339 -0500
-@@ -112,7 +112,7 @@
- GlobalUnlock(GlobalHandle((HGLOBAL) henv));
- GlobalFree(GlobalHandle((HGLOBAL) henv));
- #else
-- if (henv) my_free((char*) henv,MYF(0));
-+ if (henv) my_free((char*) henv);
- myodbc_end();
- #endif /* _UNIX_ */
- return(SQL_SUCCESS);
-@@ -251,7 +251,8 @@
- LIST *next;
-
- dbc->env->connections= list_delete(dbc->env->connections,&dbc->list);
-- my_free(dbc->database,MYF(MY_ALLOW_ZERO_PTR));
-+ if (dbc->database)
-+ my_free(dbc->database);
- if (dbc->ds)
- ds_delete(dbc->ds);
- pthread_mutex_destroy(&dbc->lock);
-@@ -268,7 +269,7 @@
- GlobalUnlock(GlobalHandle((HGLOBAL) hdbc));
- GlobalFree(GlobalHandle((HGLOBAL) hdbc));
- #else
-- my_free((char*) hdbc,MYF(0));
-+ my_free((char*) hdbc);
- #endif
- return SQL_SUCCESS;
- }
-@@ -513,7 +514,7 @@
- GlobalUnlock(GlobalHandle ((HGLOBAL) hstmt));
- GlobalFree(GlobalHandle((HGLOBAL) hstmt));
- #else
-- my_free((char*) hstmt,MYF(0));
-+ my_free((char*) hstmt);
- #endif /* _UNIX_*/
- return SQL_SUCCESS;
- }
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/options.c mysql-connector-odbc-5.1.8/driver/options.c
---- mysql-connector-odbc-5.1.8.orig/driver/options.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/options.c 2010-12-23 17:50:28.864604596 -0500
-@@ -301,7 +301,7 @@
- return SQL_ERROR;
- }
- }
-- my_free(dbc->database,MYF(0));
-+ my_free(dbc->database);
- dbc->database= my_strdup(db,MYF(MY_WME));
- pthread_mutex_unlock(&dbc->lock);
- }
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/prepare.c mysql-connector-odbc-5.1.8/driver/prepare.c
---- mysql-connector-odbc-5.1.8.orig/driver/prepare.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/prepare.c 2010-12-23 17:51:17.175676805 -0500
-@@ -93,7 +93,7 @@
- CLEAR_STMT_ERROR(stmt);
-
- if (stmt->query)
-- my_free(stmt->query, MYF(0));
-+ my_free(stmt->query);
-
- if (dupe && szSqlStr)
- stmt->query= (char *)szSqlStr;
-@@ -223,7 +223,7 @@
- {
- aprec->par.alloced= FALSE;
- assert(aprec->par.value);
-- my_free(aprec->par.value,MYF(0));
-+ my_free(aprec->par.value);
- aprec->par.value = NULL;
- }
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c
---- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:49:05.498552376 -0500
-@@ -930,7 +930,7 @@
- ulong max_length= stmt->stmt_options.max_length;
- ulong *offset= &stmt->getdata.src_offset;
- #if MYSQL_VERSION_ID >= 40100
-- char NEAR _dig_vec[] =
-+ char _dig_vec[] =
- "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- #endif
-
-@@ -2154,7 +2154,7 @@
-
- my_bool reget_current_catalog(DBC FAR *dbc)
- {
-- my_free(dbc->database,MYF(0));
-+ my_free(dbc->database);
- dbc->database= NULL;
-
- if ( odbc_stmt(dbc, "select database()") )
-diff -Naur mysql-connector-odbc-5.1.8.orig/util/stringutil.h mysql-connector-odbc-5.1.8/util/stringutil.h
---- mysql-connector-odbc-5.1.8.orig/util/stringutil.h 2010-10-28 14:33:17.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/util/stringutil.h 2010-12-23 17:51:51.848676475 -0500
-@@ -41,7 +41,7 @@
- #include <sqlext.h>
-
- #ifndef x_free
--#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); }
-+#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); }
- #endif
-
- #define myodbc_min(a, b) ((a) < (b) ? (a) : (b))
diff --git a/community-staging/myodbc/myodbc-shutdown.patch b/community-staging/myodbc/myodbc-shutdown.patch
deleted file mode 100644
index ec0cf3d36..000000000
--- a/community-staging/myodbc/myodbc-shutdown.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-myodbc_end is really only usable during Windows DLL unload, since it's not
-connection-specific and not thread-safe either. This bit of brain fade
-accounts for our bug #185343 and several bugs filed at mysql.com.
-
-Furthermore, my_end() isn't exported from libmysqlclient anymore.
-Hence, best fix is to turn the function into a no-op.
-
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/dll.c mysql-connector-odbc-5.1.8/driver/dll.c
---- mysql-connector-odbc-5.1.8.orig/driver/dll.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/dll.c 2010-12-23 15:05:49.394608226 -0500
-@@ -94,6 +94,7 @@
- */
- void myodbc_end()
- {
-+#if 0
- if (!--myodbc_inited)
- {
- my_free(decimal_point,MYF(0));
-@@ -121,6 +122,7 @@
- my_end(0);
- #endif
- }
-+#endif
- }
-
-
diff --git a/community-staging/mythtv/PKGBUILD b/community-staging/mythtv/PKGBUILD
deleted file mode 100644
index 265a26a92..000000000
--- a/community-staging/mythtv/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 60790 2011-12-18 04:46:39Z andrea $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: <kleptophobiac@gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=mythtv
-pkgver=0.24.1
-pkgrel=4
-epoch=1
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org/"
-license=('GPL')
-depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama'
- 'libxvmc' 'libxxf86vm' 'lirc-utils' 'mesa' 'mysql-clients'
- 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp'
- 'python-lxml' 'wget' 'qtwebkit')
-makedepends=('yasm')
-optdepends=('xmltv: to download tv listings')
-backup=('etc/conf.d/mythbackend')
-install='mythtv.install'
-source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
- 'mythbackend.rc'
- 'mythbackend.conf'
- 'mythtv-v4l2-fix.patch'
- 'build.patch')
-md5sums=('6870c679619ec58456e76839745411d8'
- 'feadcc9ad064d93d6dceab1efc0bd9ed'
- 'bb8e4033d82428d827570fae9ba15e6a'
- 'ba5c91df80f0d3f7563a873e71a3725c'
- '3188962917e98c4e07818dccd64bc423')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
- patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch
- patch -Np1 -i ${srcdir}/build.patch
-
- ARCH="${CARCH/_/-}"
- ./configure --prefix=/usr --cpu="$ARCH" \
- --enable-mmx \
- --enable-audio-oss \
- --enable-audio-alsa \
- --disable-audio-jack \
- --enable-audio-pulse \
- --disable-altivec \
- --disable-distcc \
- --disable-ccache \
- --enable-vdpau \
- --enable-dvb \
- --dvb-path=/usr/include \
- --enable-lirc \
- --enable-joystick-menu \
- --enable-v4l \
- --enable-ivtv \
- --enable-xvmc \
- --enable-xvmcw \
- --enable-xvmc-vld \
- --enable-firewire \
- --enable-opengl-vsync \
- --enable-xrandr \
- --enable-xv \
- --enable-x11 \
- --with-bindings=perl,python \
- --python=python2
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make INSTALL_ROOT="$pkgdir" install
-
- install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend"
- install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend"
- install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
-
- mkdir -p "$pkgdir/usr/share/mythtv"
- cp -R 'contrib' "$pkgdir/usr/share/mythtv"
-}
diff --git a/community-staging/mythtv/build.patch b/community-staging/mythtv/build.patch
deleted file mode 100644
index 35dccd618..000000000
--- a/community-staging/mythtv/build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp
---- a/libs/libmythui/mythrender_opengl.cpp 2011-05-16 08:57:52.000000000 +1200
-+++ b/libs/libmythui/mythrender_opengl.cpp 2011-10-23 15:05:33.178392264 +1300
-@@ -2,6 +2,8 @@
- #include "mythrender_opengl.h"
- #include "mythxdisplay.h"
-
-+#include <GL/glu.h>
-+
- #define LOC QString("OpenGL: ")
- #define LOC_ERR QString("OpenGL Error: ")
-
-Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ
diff --git a/community-staging/mythtv/mythbackend.conf b/community-staging/mythtv/mythbackend.conf
deleted file mode 100644
index e004ae5bd..000000000
--- a/community-staging/mythtv/mythbackend.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-#
-# Rename this file to:
-#
-# /etc/config.d/mythbackend
-#
-###############################################################################
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-# Michael Thomson <linux at m-thomson dot net>
-# Stu Tomlinson <stu at nosnilmot dot com>
-# Axel Thimm <axel.thimm at atrpms dot net>
-# Adopted for ArchLinux:
-# Jürgen Hoetzel <juergen@archinux.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-###############################################################################
-#
-# Config variables for the mythbackend startup script, which is usually
-# located in /etc/rc.d/mythbackend
-#
-# When the startup script is executed, it sources this file if it exists,
-# otherwise it will fall back on default values.
-#
-# Leave variables commented out to use default values in init script
-# (/etc/rc.d/mythbackend).
-#
-# To override defaults, uncomment the relevant variable definition and
-# edit as required.
-#
-
-#
-# User who should start the mythbackend processes
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Directory holding the mythbackend binary (empty means autodetect).
-#
-# MBE_DIR=''
-
-#
-# Name of mythbackend binary.
-#
-# MBE_PROG='mythbackend'
-
-#
-# Other startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTIONS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_DIR='/var/log/mythtv'
-
-#
-# Name of mythbackend log file.
-#
-# NOTE: If you are running as non-root take care to ensure the mythbackend user
-# has permission to write to this log file.
-#
-# LOG_FILE='mythbackend.log'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''
diff --git a/community-staging/mythtv/mythbackend.rc b/community-staging/mythtv/mythbackend.rc
deleted file mode 100644
index 410e8de41..000000000
--- a/community-staging/mythtv/mythbackend.rc
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# Default values to use if none are supplied in the config file.
-
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# User who should start the mythbackend processes
-MBE_USER='root'
-
-# Startup options for mythbackend
-MBE_OPTIONS=''
-
-# Name of mythbackend log file
-LOG_FILE='/var/log/mythbackend.log'
-
-# Logging options for mythbackend (empty means '-v important,general')
-LOG_OPTS=''
-
-###############################################################################
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -f ${CONFIG_FILE} ]]; then
- . ${CONFIG_FILE}
-fi
-
-pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)";
-
-# fix FS#11890
-mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)"
-
-case "$1" in
- start)
- stat_busy "Starting MythTV Backend"
-
- # already running ?
- if [[ "${pid}" -gt 0 ]] && kill -0 "${pid}"; then
- stat_fail
- exit 1;
- fi
- touch ${PIDFILE} ${LOG_FILE}
- chown "$MBE_USER" ${PIDFILE} ${LOG_FILE}
- if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \
- --daemon \
- --logfile $LOG_FILE $LOG_OPTS \
- --pidfile ${PIDFILE} $MBE_OPTIONS";
- then
- add_daemon mythbackend
- stat_done
- else
- stat_fail
- fi
- ;;
-
- stop)
- stat_busy "Stopping MythTV Backend"
- if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then
- rm_daemon mythbackend
- stat_done
- rm ${PIDFILE} 2>/dev/null
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/mythtv/mythtv-v4l2-fix.patch b/community-staging/mythtv/mythtv-v4l2-fix.patch
deleted file mode 100644
index e26e16615..000000000
--- a/community-staging/mythtv/mythtv-v4l2-fix.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-diff --git a/mythtv/configure b/mythtv/configure
-index 1efe803..7bcdf06 100755
---- a/mythtv/configure
-+++ b/mythtv/configure
-@@ -109,7 +109,8 @@ Advanced options (experts only):
- --disable-iptv disable support for recording RTSP/UDP/RTP streams
- --disable-hdhomerun disable support for HDHomeRun boxes
- --disable-v4l disable Video4Linux support
-- --disable-ivtv disable ivtv support (PVR-x50) req. v4l support
-+ --disable-v4l2 disable Video4Linux2 support
-+ --disable-ivtv disable ivtv support (PVR-x50) req. v4l2 support
- --disable-hdpvr disable HD-PVR support
- --disable-dvb disable DVB support
- --dvb-path=HDRLOC location of directory containing
-@@ -1315,6 +1316,7 @@ MYTHTV_CONFIG_LIST='
- qtwebkit
- quartz_video
- v4l
-+ v4l2
- valgrind
- x11
- xrandr
-@@ -1706,8 +1708,8 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h"
- dvb_deps="backend"
- firewire_deps="backend"
- iptv_deps="backend"
--ivtv_deps="backend v4l"
--hdpvr_deps="backend v4l"
-+ivtv_deps="backend v4l2"
-+hdpvr_deps="backend v4l2"
- hdhomerun_deps="backend"
- mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c"
- mythtranscode_deps="backend frontend"
-@@ -1715,6 +1717,7 @@ opengl_deps_any="agl_h GL_gl_h darwin windows x11"
- opengl_video_deps="opengl"
- opengl_vsync_deps="opengl"
- v4l_deps="backend linux_videodev_h linux_videodev2_h"
-+v4l2_deps="backend linux_videodev2_h"
- vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
- xrandr_deps="x11"
- xv_deps="x11"
-@@ -1933,6 +1936,7 @@ enable opengl_vsync
- enable opengl_video
- enable quartz_video
- enable v4l
-+enable v4l2
- enable x11
- enable xrandr
- enable xv
-@@ -3062,6 +3066,7 @@ EOF
- fi
- disable opengl_vsync
- disable v4l
-+ disable v4l2
- disable x11
- # Workaround compile errors from missing gmtime_r/localtime_r/uint def
- CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
-@@ -3106,6 +3111,7 @@ EOF
- fi
- disable symver
- disable v4l
-+ disable v4l2
- enable windows
- disable x11
- ###### Standard ffmpeg configure stuff follows:
-@@ -4375,6 +4381,7 @@ enabled stripping || strip="echo skipping strip"
-
- if enabled backend; then
- echo "Video4Linux sup. ${v4l-no}"
-+ echo "Video4Linux2 sup. ${v4l2-no}"
- echo "ivtv support ${ivtv-no}"
- echo "HD-PVR support ${hdpvr-no}"
- echo "FireWire support ${firewire-no}"
-diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-index 739634d..39e5956 100644
---- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-+++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-@@ -42,9 +42,13 @@ extern "C" {
- #include "libswscale/swscale.h"
- }
-
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
-
- #include "go7007_myth.h"
-
-@@ -55,9 +59,9 @@ extern "C" {
- extern "C" {
- #include "vbitext/vbi.h"
- }
--#else // USING_V4l
-+#else // USING_V4L || USING_V4L2
- #define VT_WIDTH 0
--#endif // USING_V4l
-+#endif // USING_V4l || USING_V4L2
-
- #define KEYFRAMEDIST 30
-
-@@ -1019,7 +1023,7 @@ bool NuppelVideoRecorder::Open(void)
-
- void NuppelVideoRecorder::ProbeV4L2(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- usingv4l2 = true;
-
- struct v4l2_capability vcap;
-@@ -1049,7 +1053,7 @@ void NuppelVideoRecorder::ProbeV4L2(void)
- QString driver = (char *)vcap.driver;
- if (driver == "go7007")
- go7007 = true;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
-
- void NuppelVideoRecorder::StartRecording(void)
-@@ -2460,7 +2464,7 @@ void NuppelVideoRecorder::doAudioThread(void)
- audio_device->Close();
- }
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- struct VBIData
- {
- NuppelVideoRecorder *nvr;
-@@ -2634,9 +2638,9 @@ void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata)
- act_text_buffer = 0;
- textbuffer[act]->freeToEncode = 1;
- }
--#else // USING_V4L
-+#else // USING_V4L || USING_V4L2
- void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) {}
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- void NuppelVideoRecorder::FormatCC(struct cc *cc)
- {
-@@ -2863,7 +2867,7 @@ void NuppelVideoRecorder::doVbiThread(void)
- //VERBOSE(VB_RECORD, LOC + "vbi end");
- }
-
--#else // USING_V4L
-+#else // USING_V4L
- void NuppelVideoRecorder::doVbiThread(void) { }
- #endif // USING_V4L
-
-diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-index 2a4f4c5..fa5823a 100644
---- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-@@ -6,7 +6,9 @@
- #include <sys/ioctl.h>
- #include <poll.h>
-
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-
- #include "mythverbose.h"
- #include "analogsignalmonitor.h"
-@@ -151,6 +153,7 @@ void AnalogSignalMonitor::UpdateValues(void)
- }
- else
- {
-+#ifdef USING_V4L
- struct video_tuner tuner;
- bzero(&tuner, sizeof(tuner));
-
-@@ -163,6 +166,7 @@ void AnalogSignalMonitor::UpdateValues(void)
- {
- isLocked = tuner.signal;
- }
-+#endif
- }
-
- {
-diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
-index 8852682..494f48a 100644
---- a/mythtv/libs/libmythtv/cardutil.cpp
-+++ b/mythtv/libs/libmythtv/cardutil.cpp
-@@ -4,7 +4,7 @@
-
- #include <algorithm>
-
--#if defined(USING_V4L) || defined(USING_DVB)
-+#if defined(USING_V4L) || defined(USING_V4L2) || defined(USING_DVB)
- #include <sys/ioctl.h>
- #endif
-
-@@ -28,6 +28,8 @@
-
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
-
-@@ -1455,15 +1457,15 @@ uint CardUtil::GetQuickTuning(uint cardid, const QString &input_name)
- bool CardUtil::hasV4L2(int videofd)
- {
- (void) videofd;
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- struct v4l2_capability vcap;
- bzero(&vcap, sizeof(vcap));
-
- return ((ioctl(videofd, VIDIOC_QUERYCAP, &vcap) >= 0) &&
- (vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE));
--#else // if !USING_V4L
-+#else // if !USING_V4L2
- return false;
--#endif // !USING_V4L
-+#endif // !USING_V4L2
- }
-
- bool CardUtil::GetV4LInfo(
-@@ -1475,7 +1477,7 @@ bool CardUtil::GetV4LInfo(
- if (videofd < 0)
- return false;
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- // First try V4L2 query
- struct v4l2_capability capability;
- bzero(&capability, sizeof(struct v4l2_capability));
-@@ -1487,11 +1489,13 @@ bool CardUtil::GetV4LInfo(
- }
- else // Fallback to V4L1 query
- {
-+#ifdef USING_V4L
- struct video_capability capability;
- if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0)
- card = QString::fromAscii((const char*)capability.name);
-+#endif //USING_V4L
- }
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
-
- if (!driver.isEmpty())
- driver.remove( QRegExp("\\[[0-9]\\]$") );
-@@ -1506,9 +1510,9 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
- InputNames list;
- ok = false;
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- bool usingv4l2 = hasV4L2(videofd);
--
-+#ifdef USING_V4L2
- // V4L v2 query
- struct v4l2_input vin;
- bzero(&vin, sizeof(vin));
-@@ -1523,8 +1527,10 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
- ok = true;
- return list;
- }
-+#endif
-
- // V4L v1 query
-+#ifdef USING_V4L
- struct video_capability vidcap;
- bzero(&vidcap, sizeof(vidcap));
- if (ioctl(videofd, VIDIOCGCAP, &vidcap) != 0)
-@@ -1552,15 +1558,15 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-
- list[i] = test.name;
- }
--
-+#endif
- // Create an input on single input cards that don't advertise input
- if (!list.size())
- list[0] = "Television";
-
- ok = true;
--#else // if !USING_V4L
-+#else // if !USING_V4L || USING_V4L2
- list[-1] += QObject::tr("ERROR, Compile with V4L support to query inputs");
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
- return list;
- }
-
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-index 832d0a8..e35b186 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-@@ -1394,7 +1394,7 @@ const DVBChannel *ChannelScanSM::GetDVBChannel(void) const
-
- V4LChannel *ChannelScanSM::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- return dynamic_cast<V4LChannel*>(channel);
- #else
- return NULL;
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-index 1595d6a..4d2b2cf 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-@@ -342,7 +342,7 @@ void ChannelScanner::PreScanCommon(
- channel = new DVBChannel(device);
- #endif
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- if (("V4L" == card_type) || ("MPEG" == card_type))
- channel = new V4LChannel(NULL, device);
- #endif
-diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-index 00fd9d3..70e3469 100644
---- a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-@@ -27,14 +27,14 @@ static QString card_types(void)
- cardTypes += "'DVB'";
- #endif // USING_DVB
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- if (!cardTypes.isEmpty())
- cardTypes += ",";
- cardTypes += "'V4L'";
- # ifdef USING_IVTV
- cardTypes += ",'MPEG'";
- # endif // USING_IVTV
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_IPTV
- if (!cardTypes.isEmpty())
-diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
-index 3d26e0a..ea06ee7 100644
---- a/mythtv/libs/libmythtv/libmythtv.pro
-+++ b/mythtv/libs/libmythtv/libmythtv.pro
-@@ -119,7 +119,7 @@ cygwin:DEFINES += _WIN32
- using_valgrind:DEFINES += USING_VALGRIND
-
- # old libvbitext (Caption decoder)
--using_v4l {
-+using_v4l || using_v4l2 {
- HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h
- HEADERS += vbitext/vbi.h vbitext/vt.h
- SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c
-@@ -471,11 +471,17 @@ using_backend {
- SOURCES += channelchangemonitor.cpp
-
- # Support for Video4Linux devices
-- using_v4l {
-+ using_v4l || using_v4l2 {
- HEADERS += v4lchannel.h analogsignalmonitor.h
- SOURCES += v4lchannel.cpp analogsignalmonitor.cpp
-
-- DEFINES += USING_V4L
-+ using_v4l {
-+ DEFINES += USING_V4L
-+ }
-+
-+ using_v4l2 {
-+ DEFINES += USING_V4L2
-+ }
- }
-
- # Support for cable boxes that provide Firewire out
-diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp
-index 221efef..c199b3b 100644
---- a/mythtv/libs/libmythtv/signalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/signalmonitor.cpp
-@@ -23,7 +23,7 @@ extern "C" {
- # include "dvbchannel.h"
- #endif
-
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- # include "analogsignalmonitor.h"
- # include "v4lchannel.h"
- #endif
-@@ -95,7 +95,7 @@ SignalMonitor *SignalMonitor::Init(QString cardtype, int db_cardnum,
- }
- #endif
-
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- if ((cardtype.toUpper() == "HDPVR"))
- {
- V4LChannel *chan = dynamic_cast<V4LChannel*>(channel);
-diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
-index b885eaa..3d9c7ad 100644
---- a/mythtv/libs/libmythtv/tv_rec.cpp
-+++ b/mythtv/libs/libmythtv/tv_rec.cpp
-@@ -57,7 +57,7 @@ using namespace std;
-
- #include "channelgroup.h"
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #include "v4lchannel.h"
- #endif
-
-@@ -206,7 +206,7 @@ bool TVRec::CreateChannel(const QString &startchannel)
- }
- else // "V4L" or "MPEG", ie, analog TV
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- channel = new V4LChannel(this, genOpt.videodev);
- if (!channel->Open())
- return false;
-@@ -1082,11 +1082,11 @@ bool TVRec::SetupRecorder(RecordingProfile &profile)
- }
- else
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- // V4L/MJPEG/GO7007 from here on
- recorder = new NuppelVideoRecorder(this, channel);
- recorder->SetOption("skipbtaudio", genOpt.skip_btaudio);
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
-
- if (recorder)
-@@ -1292,11 +1292,11 @@ FirewireChannel *TVRec::GetFirewireChannel(void)
-
- V4LChannel *TVRec::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- return dynamic_cast<V4LChannel*>(channel);
- #else
- return NULL;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
-
- /** \fn TVRec::EventThread(void*)
-@@ -4137,7 +4137,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData)
- channel->GetCurrentName());
- }
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- if (GetV4LChannel())
- {
- channel->InitPictureAttributes();
-diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/v4lchannel.cpp
-index bc82b49..7aa47ef 100644
---- a/mythtv/libs/libmythtv/v4lchannel.cpp
-+++ b/mythtv/libs/libmythtv/v4lchannel.cpp
-@@ -16,8 +16,12 @@
- #include <iostream>
- using namespace std;
-
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
-
- // MythTV headers
- #include "v4lchannel.h"
-@@ -150,8 +154,10 @@ static int format_to_mode(const QString &fmt, int v4l_version)
- {
- if (fmt == "NTSC-JP")
- return 6;
-+#ifdef USING_V4L
- else if (fmt.left(5) == "SECAM")
- return VIDEO_MODE_SECAM;
-+#endif
- else if (fmt == "PAL-NC")
- return 3;
- else if (fmt == "PAL-M")
-@@ -159,6 +165,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
- else if (fmt == "PAL-N")
- return 5;
- // generics...
-+#ifdef USING_V4L
- else if (fmt.left(3) == "PAL")
- return VIDEO_MODE_PAL;
- else if (fmt.left(4) == "NTSC")
-@@ -166,6 +173,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
- else if (fmt.left(4) == "ATSC")
- return VIDEO_MODE_NTSC; // We've dropped V4L ATSC support...
- return VIDEO_MODE_NTSC;
-+#endif
- }
-
- VERBOSE(VB_IMPORTANT,
-@@ -237,6 +245,7 @@ static QString mode_to_format(int mode, int v4l_version)
- }
- else if (1 == v4l_version)
- {
-+#ifdef USING_V4L
- if (mode == VIDEO_MODE_NTSC)
- return "NTSC";
- else if (mode == VIDEO_MODE_PAL)
-@@ -249,6 +258,7 @@ static QString mode_to_format(int mode, int v4l_version)
- return "PAL-N";
- else if (mode == 6)
- return "NTSC-JP";
-+#endif
- }
- else
- {
-@@ -676,6 +686,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
- return true;
- }
-
-+#ifdef USING_V4L
- // Video4Linux version 1 tuning
- uint freq = frequency / 62500;
- ioctlval = ioctl(videofd, VIDIOCSFREQ, &freq);
-@@ -687,6 +698,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
- .arg(device).arg(ioctlval).arg(strerror(errno)));
- return false;
- }
-+#endif
-
- SetSIStandard(si_std);
-
-@@ -858,6 +870,7 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
-
- if (usingv4l1)
- {
-+#ifdef USING_V4L
- VERBOSE(VB_CHANNEL, LOC + msg + "(v4l v1)");
-
- // read in old settings
-@@ -875,8 +888,9 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
- {
- VERBOSE(VB_IMPORTANT, LOC_ERR + msg +
- "\n\t\t\twhile setting format (v4l v1)" + ENO);
-- }
-- else if (usingv4l2)
-+ } else
-+#endif
-+ if (usingv4l2)
- {
- VERBOSE(VB_IMPORTANT, LOC + msg +
- "\n\t\t\tSetting video mode with v4l version 1 worked");
-@@ -951,6 +965,7 @@ bool V4LChannel::SwitchToInput(int inputnum, bool setstarting)
- return ok;
- }
-
-+#ifdef USING_V4L
- static unsigned short *get_v4l1_field(
- int v4l2_attrib, struct video_picture &vid_pic)
- {
-@@ -970,6 +985,7 @@ static unsigned short *get_v4l1_field(
- }
- return NULL;
- }
-+#endif
-
- static int get_v4l2_attribute(const QString &db_col_name)
- {
-@@ -1067,6 +1083,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
- }
-
- // V4L1
-+#ifdef USING_V4L
- unsigned short *setfield;
- struct video_picture vid_pic;
- bzero(&vid_pic, sizeof(vid_pic));
-@@ -1087,7 +1104,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
- VERBOSE(VB_IMPORTANT, loc_err + "failed to set controls." + ENO);
- return false;
- }
--
-+#endif
- return true;
- }
-
-@@ -1154,6 +1171,7 @@ static int get_v4l2_attribute_value(int videofd, int v4l2_attrib)
-
- static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
- {
-+#ifdef USING_V4L
- struct video_picture vid_pic;
- bzero(&vid_pic, sizeof(vid_pic));
-
-@@ -1167,6 +1185,7 @@ static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
- unsigned short *setfield = get_v4l1_field(v4l2_attrib, vid_pic);
- if (setfield)
- return *setfield;
-+#endif
-
- return -1;
- }
-@@ -1210,6 +1229,7 @@ static int set_v4l2_attribute_value(int videofd, int v4l2_attrib, int newvalue)
-
- static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- {
-+#ifdef USING_V4L
- unsigned short *setfield;
- struct video_picture vid_pic;
- bzero(&vid_pic, sizeof(vid_pic));
-@@ -1236,7 +1256,7 @@ static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- // ???
- return -1;
- }
--
-+#endif
- return 0;
- }
-
-diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/v4lchannel.h
-index b059c64..aa6d934 100644
---- a/mythtv/libs/libmythtv/v4lchannel.h
-+++ b/mythtv/libs/libmythtv/v4lchannel.h
-@@ -4,11 +4,11 @@
- #define CHANNEL_H
-
- #include "dtvchannel.h"
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h> // needed for v4l2_std_id type
- #else
- typedef uint64_t v4l2_std_id;
--#endif //USING_V4L
-+#endif //USING_V4L2
-
- using namespace std;
-
-diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/vbitext/vbi.c
-index 15f8d85..4c50e8d 100644
---- a/mythtv/libs/libmythtv/vbitext/vbi.c
-+++ b/mythtv/libs/libmythtv/vbitext/vbi.c
-@@ -14,8 +14,12 @@
- // compiling with -std=c99. We could remove this in the .pro file,
- // but that would disable it for all .c files.
- #undef __STRICT_ANSI__
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
-
- // vbitext headers
- #include "vt.h"
-@@ -29,8 +33,13 @@ static int rawbuf_size; // its current size
-
-
- /***** bttv api *****/
-+#ifdef USING_V4L
- #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int)
--
-+#else // !USING_V4L
-+#ifdef USING_V4L2
-+#define BTTV_VBISIZE _IOR('v' , BASE_VIDIOC_PRIVATE+8, int)
-+#endif // USING_V4L2
-+#endif // !USING_V4L
-
- static void
- error(const char *str, ...)
-diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
-index 5d7a508..635faeb 100644
---- a/mythtv/libs/libmythtv/videosource.cpp
-+++ b/mythtv/libs/libmythtv/videosource.cpp
-@@ -45,7 +45,7 @@ using namespace std;
- #include "dvbtypes.h"
- #endif
-
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
-
-@@ -2012,7 +2012,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
- setTrigger(cardtype);
- setSaveAll(false);
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- addTarget("V4L", new V4LConfigurationGroup(parent));
- # ifdef USING_IVTV
- addTarget("MPEG", new MPEGConfigurationGroup(parent));
-@@ -2020,7 +2020,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
- # ifdef USING_HDPVR
- addTarget("HDPVR", new HDPVRConfigurationGroup(parent));
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_DVB
- addTarget("DVB", new DVBConfigurationGroup(parent));
-@@ -2201,7 +2201,7 @@ CardType::CardType(const CaptureCard &parent) :
-
- void CardType::fillSelections(SelectSetting* setting)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- setting->addSelection(
- QObject::tr("Analog V4L capture card"), "V4L");
- setting->addSelection(
-@@ -2214,7 +2214,7 @@ void CardType::fillSelections(SelectSetting* setting)
- setting->addSelection(
- QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR");
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_DVB
- setting->addSelection(
-@@ -2226,11 +2226,11 @@ void CardType::fillSelections(SelectSetting* setting)
- QObject::tr("FireWire cable box"), "FIREWIRE");
- #endif // USING_FIREWIRE
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- setting->addSelection(
- QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"),
- "GO7007");
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_HDHOMERUN
- setting->addSelection(
diff --git a/community-staging/mythtv/mythtv.install b/community-staging/mythtv/mythtv.install
deleted file mode 100644
index c29a53454..000000000
--- a/community-staging/mythtv/mythtv.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!"
-}
-
-post_upgrade() {
- return
-}
-
-post_remove() {
- echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'"
-}
diff --git a/community-staging/openscenegraph/PKGBUILD b/community-staging/openscenegraph/PKGBUILD
deleted file mode 100644
index fa2bee28b..000000000
--- a/community-staging/openscenegraph/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 61628 2012-01-04 23:17:02Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Hans Janssen <janserv@gmail.com>
-# Contributor: my64 <packages@obordes.com>
-# Contributor: Colin Pitrat <colin.pitrat@gmail.com>
-
-pkgname=openscenegraph
-pkgver=3.0.1
-pkgrel=3
-pkgdesc="An Open Source, high performance real-time graphics toolkit"
-arch=('i686' 'x86_64')
-license=('custom:OSGPL')
-url="http://www.openscenegraph.org"
-depends=('giflib' 'jasper' 'librsvg' 'xine-lib' 'curl' 'pth')
-makedepends=('cmake' 'libvncserver')
-optdepends=('libvncserver' 'gdal' 'openexr' 'poppler-glib')
-conflicts=('openthreads')
-provides=('openthreads')
-source=(http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-$pkgver/source/OpenSceneGraph-$pkgver.zip
- osg-xine-1.2.patch)
-#source=("http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-3.0/source/OpenSceneGraph-$pkgver.zip")
-md5sums=('c43a25d023e635c3566b2083d8e6d956'
- 'b05a486fdc2aaf06b29efb5e0714672e')
-
-build() {
- cd OpenSceneGraph-$pkgver
- [ $NOEXTRACT -eq 1 ] || cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
- sed -i 's|#include <curl/types.h>|//#include <curl/types.h>|' src/osgPlugins/curl/ReaderWriterCURL.cpp
- patch -p1 <$srcdir/osg-xine-1.2.patch
- make
-}
-
-package() {
- cd OpenSceneGraph-$pkgver
- make DESTDIR="$pkgdir" install
- install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
- [ -d "$pkgdir/usr/lib64" ] && mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib" || true
-}
diff --git a/community-staging/openscenegraph/osg-xine-1.2.patch b/community-staging/openscenegraph/osg-xine-1.2.patch
deleted file mode 100644
index c73b588dc..000000000
--- a/community-staging/openscenegraph/osg-xine-1.2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -wbBur OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c
---- OpenSceneGraph-3.0.1/src/osgPlugins/xine/video_out_rgb.c 2009-11-20 14:46:20.000000000 +0300
-+++ OpenSceneGraph-3.0.1.my/src/osgPlugins/xine/video_out_rgb.c 2012-01-05 02:15:38.000000000 +0400
-@@ -2769,8 +2769,8 @@
- clear(rgb_class, sizeof(rgbout_class_t));
-
- rgb_class->driver_class.open_plugin = open_plugin;
-- rgb_class->driver_class.get_identifier = get_identifier;
-- rgb_class->driver_class.get_description = get_description;
-+ rgb_class->driver_class.identifier = get_identifier(NULL);
-+ rgb_class->driver_class.description = get_description(NULL);
- rgb_class->driver_class.dispose = dispose_class;
-
- return(rgb_class);
diff --git a/community-staging/opensips/PKGBUILD b/community-staging/opensips/PKGBUILD
deleted file mode 100644
index f39c698be..000000000
--- a/community-staging/opensips/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 60687 2011-12-16 21:39:12Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=opensips
-pkgver=1.6.4
-pkgrel=2
-pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..."
-url="http://www.opensips.org"
-depends=('gcc-libs' 'openssl' 'db' 'attr' 'kernel-headers' 'libxml2')
-makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmysqlclient' 'lynx')
-optdepends=('postgresql-libs'
- 'unixodbc'
- 'libldap'
- 'libmysqlclient'
- 'libsasl'
- 'python2'
- 'pcre')
-backup=("etc/opensips/opensips.cfg"
- "etc/opensips/dictionary.radius"
- "etc/opensips/opensipsctlrc")
-arch=('i686' 'x86_64')
-license=('GPL')
-install=opensips.install
-options=('!emptydirs' 'zipman' '!makeflags' 'docs')
-source=(#http://switch.dl.sourceforge.net/sourceforge/opensips/opensips-$pkgver-tls_src.tar.gz
- http://opensips.org/pub/opensips/$pkgver/src/opensips-$pkgver-2-tls_src.tar.gz
- opensips.init)
-md5sums=('e9869d9a726d70f83de4a1e77cd24d40'
- '685fbe00826df1285b410d4610dcbb0c')
-
-build()
-{
- cd $srcdir/$pkgname-$pkgver-2-tls/
-
- # python2 fix
- for file in $(find . -name '*.py' -print); do
- sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
- sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
- done
-
- make \
- include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \
- TLS=1 DESTDIR=$pkgdir/usr LIBDIR=lib install
-
- # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards)
- mkdir -p $pkgdir/etc/
- mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/
- sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg
-
- # Install starting script
- mkdir -p $pkgdir/etc/rc.d/
- cp ../opensips.init $pkgdir/etc/rc.d/opensips
- chmod 755 $pkgdir/etc/rc.d/opensips
-
- # fix bad paths
- cd $pkgdir/usr/share
- find -type f -exec sed -i "s#$pkgdir##" {} \;
-
- cd $pkgdir/usr/lib/opensips/opensipsctl
- find -type f -exec sed -i "s#$pkgdir##" {} \;
-
- cd $pkgdir/usr/sbin
- sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole
-
- cd $pkgdir/etc
- find -type f -exec sed -i "s#$pkgdir##" {} \;
-}
diff --git a/community-staging/opensips/opensips.init b/community-staging/opensips/opensips.init
deleted file mode 100644
index 1c883c4c2..000000000
--- a/community-staging/opensips/opensips.init
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-BINNAME=opensips
-OSRDIR=/usr/sbin
-OPENSIPS=$OSRDIR/$BINNAME
-
-TMPDIR=/var/tmp
-CORE=$TMPDIR/core
-
-ETC=/etc/opensips/opensips.cfg
-PIDFILE=/var/run/opensips.pid
-
-case "$1" in
- start)
- stat_busy "Starting OpenSIPS server"
- cd $TMPDIR
- $OPENSIPS -f $ETC -w $TMPDIR -P $PIDFILE 2>&1 > /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon opensips
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping OpenSIPS server"
- if [ -r $PIDFILE ]
- then
- cat $PIDFILE | xargs kill
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon opensips
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community-staging/opensips/opensips.install b/community-staging/opensips/opensips.install
deleted file mode 100644
index 9e8f2a47b..000000000
--- a/community-staging/opensips/opensips.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install()
-{
- echo "To use MySQL, you should install mysql package and run '/usr/sbin/openser_mysql.sh create'"
- /bin/true
-}
diff --git a/community-staging/paraview/PKGBUILD b/community-staging/paraview/PKGBUILD
deleted file mode 100644
index e00e14038..000000000
--- a/community-staging/paraview/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 60750 2011-12-17 14:48:07Z andrea $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Michele Mocciola <mickele>
-# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
-
-pkgname=paraview
-pkgver=3.10.1
-pkgrel=5
-pkgdesc='Parallel Visualization Application using VTK'
-arch=('i686' 'x86_64')
-url='http://www.paraview.org'
-license=('custom')
-depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt'
- 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5'
-makedepends=('cmake' 'desktop-file-utils')
-source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz"
- 'paraview.png'
- 'paraview.desktop'
- 'fixkernelversioncheck.diff')
-md5sums=('d8a9d4a997a720589ffd57568bcdd449'
- 'db623002bc71a257ddfdd0c9c7b14c3f'
- '4e4b7172ed18171c37446fd7c4f1e8f5'
- '9e137af23701f76fc727222ebac23389')
-
-build() {
- cd ParaView-${pkgver}
-
- # patch vtk to fix http://www.vtk.org/Bug/view.php?id=12568
- # remove next pkgver bump
- cd VTK
- patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
- cd ..
-
- sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx
- sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx
- sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx
-
- # Paraview wants to be built out of source
- mkdir -p build
- cd build
-
- # use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html
- cmake \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_USE_PTHREADS:BOOL=ON \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_SKIP_RPATH:BOOL=YES \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
- -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DBUILD_DOCUMENTATION:BOOL=OFF \
- -DBUILD_EXAMPLES:BOOL=OFF \
- -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
- -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
- -DVTK_USE_SYSTEM_PNG:BOOL=ON \
- -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
- -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
- -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
- -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
- -DVTK_USE_BOOST:BOOL=OFF \
- -DVTK_USE_OFFSCREEN=TRUE \
- -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
- -DPARAVIEW_USE_MPI:BOOL=ON \
- -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
- -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
- -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \
- ..
-
- make
-}
-
-package() {
- cd ParaView-${pkgver}/build
-
- make DESTDIR=${pkgdir} install
-
- # Install license
- install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE
-
- # Install desktop shortcuts
- install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png
- desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop
-
- # Removes VTK plugin for designer - if you need, you can install vtk
- #rm -rf ${pkgdir}/opt/paraview/plugins
-}
diff --git a/community-staging/paraview/fixkernelversioncheck.diff b/community-staging/paraview/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-staging/paraview/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
-
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
- # Linux Specific flags
- ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
- OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
- IF (HDF5_ENABLE_LARGE_FILE)
- SET (LARGEFILE 1)
- ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
- SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-staging/paraview/paraview.desktop b/community-staging/paraview/paraview.desktop
deleted file mode 100644
index 2f5b8ec69..000000000
--- a/community-staging/paraview/paraview.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=ParaView
-GenericName=Data Viewer
-Comment=ParaView allows visualization of large data sets
-Type=Application
-Terminal=false
-Icon=paraview
-Categories=Graphics;
-Exec=/usr/bin/paraview
diff --git a/community-staging/paraview/paraview.png b/community-staging/paraview/paraview.png
deleted file mode 100644
index 6e39f3d4f..000000000
--- a/community-staging/paraview/paraview.png
+++ /dev/null
Binary files differ
diff --git a/community-staging/perl-dbd-odbc/PKGBUILD b/community-staging/perl-dbd-odbc/PKGBUILD
deleted file mode 100644
index 12eaf6370..000000000
--- a/community-staging/perl-dbd-odbc/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 60689 2011-12-16 21:39:55Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: François Charette <firmicus ατ gmx δοτ net>
-
-pkgname=perl-dbd-odbc
-pkgver=1.33
-pkgrel=2
-pkgdesc="ODBC Driver for DBI"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/DBD-ODBC/"
-license=('GPL' 'PerlArtistic')
-depends=('perl-dbi' 'perl' 'unixodbc')
-options=('!emptydirs')
-source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz")
-md5sums=('3e44ea4eb4b0bb711eea93632b76de17')
-
-build() {
- cd DBD-ODBC-${pkgver}
- PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
- make
-}
-
-package() {
- cd DBD-ODBC-${pkgver}
- make install DESTDIR=${pkgdir}
- find ${pkgdir} -name '.packlist' -delete
- find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/community-staging/pkgtools/PKGBUILD b/community-staging/pkgtools/PKGBUILD
deleted file mode 100644
index 922bb5fa3..000000000
--- a/community-staging/pkgtools/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Maintainer: Daenyth <Daenyth+Arch AT gmail DOT com>
-# Contributor: Daenyth <Daenyth+Arch AT gmail DOT com>
-pkgname=pkgtools
-pkgver=23
-pkgrel=3
-pkgdesc="A collection of scripts for Arch Linux packages"
-arch=('i686' 'x86_64')
-url="http://bbs.archlinux.org/viewtopic.php?pid=384196"
-license=('GPL')
-source=(v$pkgver::http://github.com/Daenyth/pkgtools/tarball/v$pkgver)
-backup=('etc/pkgtools/newpkg.conf' 'etc/pkgtools/pkgfile.conf' 'etc/pkgtools/spec2arch.conf')
-install=pkgtools.install
-provides=(newpkg pkgfile)
-depends=('bash>=4' 'pcre' 'libarchive' 'python')
-optdepends=('cron: For pkgfile --update entry'
- 'abs: Provides proto packaging files for newpkg'
- 'python-yaml: for gem2arch'
- 'python2: for pkgconflict')
-md5sums=('5361111e31741f8d7ff8ca45c7996b6b')
-
-build() {
- cd "$srcdir/Daenyth-$pkgname"-*
-
- make
-}
-
-package() {
- cd "$srcdir/Daenyth-$pkgname"-*
-
- make DESTDIR="$pkgdir" install
-
- # fix infinite loop in autotools configure scripts
- sed -i '/export -f command_not_found_handle/d' "$pkgdir/usr/share/pkgtools/pkgfile-hook.bash"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/pkgtools/pkgtools.install b/community-staging/pkgtools/pkgtools.install
deleted file mode 100644
index bcbf2f85c..000000000
--- a/community-staging/pkgtools/pkgtools.install
+++ /dev/null
@@ -1,66 +0,0 @@
-_MSG_UPDATE=" - Make sure to run pkgfile --update before use"
-_MSG_CRON=" - An entry has been placed in /etc/cron.daily to run pkgfile --update
- If you do not want this functionality, set UPDATE_CRON=0 in /etc/pkgtools/pkgfile.conf"
-_MSG_HOOK=" - pkgfile includes a \"command not found\" hook for both zsh and bash.
- This will automatically run pkgfile whenever you run
- a command which the shell cannot find. If you want
- this functionality, set CMD_SEARCH_ENABLED to 1 in
- /etc/pkgtools/pkgfile.conf (or per-user by copying
- that file to \${XDG_CONFIG_HOME}/pkgtools/pkgfile.conf), then
- in your current shell run:
- source /etc/profile"
-
-is_update_from() {
- res="`vercmp $1 $2`"
- case $res in
- '-1'|'0') return 0;;
- '1') return 1;;
- esac
-}
-
-## arg 1: the new package version
-post_install() {
- echo "$_MSG_UPDATE"
- echo "$_MSG_HOOK"
- echo "$_MSG_CRON"
-}
-
-## arg 1: the new package version
-## arg 2: the old package version
-post_upgrade() {
- if is_update_from $2 11-1; then
- echo " - All bugs related to pkgfile -b should be fixed in this update."
- fi
- if is_update_from $2 12-1; then
- echo " - NOTE: pkgtools' \"command not found\" hook configuration has changed."
- echo " Please remove any old symlinks relating to it."
- echo "$_MSG_HOOK"
- fi
- if is_update_from $2 15-1; then
- echo " - pkgtools now uses \$XDG_CONFIG_HOME for all user-specific configuration."
- echo " run «mv ~/.pkgtools \"\$XDG_CONFIG_HOME/pkgtools\"»"
- fi
- if is_update_from $2 18-1; then
- echo " - newpkg has been rewritten to be completely modular. See here for more info: http://github.com/Daenyth/pkgtools/commit/2d37197"
- fi
- if is_update_from $2 19-1; then
- echo " ! This version contains an important bugfix for pkgfile. Previously, package updates would cause the pkgfile --update cron job to"
- echo " regain +x mode, causing updates to run even when manually disabled. This version disables the cronjob by setting UPDATE_CRON=0"
- echo " in /etc/pkgtools/pkgfile.conf"
- echo " - This version of pkgtools contains a new tool called 'maintpkg'"
- echo " It sets the Maintainer in a PKGBUILD to your PACKAGER while preserving old Contributors"
- fi
- if is_update_from $2 22-1; then
- echo " - This is the largest release in a long time. This updates all python scripts to py3k."
- echo " - This version of pkgtools includes a new tool called gem2arch, for automating ruby gem packaging"
- fi
-}
-
-## arg 1: the old package version
-post_remove() {
- cat << _EOM
- - You may want to clean /var/cache/pkgtools/lists
-_EOM
-}
-
-# vim:set ts=2 sw=2 et filetype=sh:
diff --git a/community-staging/psqlodbc/PKGBUILD b/community-staging/psqlodbc/PKGBUILD
deleted file mode 100644
index 67de1cefe..000000000
--- a/community-staging/psqlodbc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 60691 2011-12-16 21:40:31Z spupykin $
-# Maintainer:
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux-br.org>
-# Contributor: Rick Rein <jeebusroxors@gmail.com>
-
-pkgname=psqlodbc
-pkgver=09.00.0310
-pkgrel=2
-pkgdesc="PostgreSQL ODBC driver"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.postgresql.org"
-depends=('unixodbc' 'postgresql-libs')
-makedepends=('postgresql')
-options=('!libtool')
-source=(ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz
- fix-function-declarations.patch)
-md5sums=('78144d9ea6c40f0a0a0b92128e6b0e05'
- 'f1189f9c6ae0b5bfb5ee8423eaa4076f')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-# patch -p1 -i "$srcdir/fix-function-declarations.patch"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/psqlodbc/fix-function-declarations.patch b/community-staging/psqlodbc/fix-function-declarations.patch
deleted file mode 100644
index 4504661b0..000000000
--- a/community-staging/psqlodbc/fix-function-declarations.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -upr psqlodbc-08.04.0100.orig/odbcapi30.c psqlodbc-08.04.0100/odbcapi30.c
---- psqlodbc-08.04.0100.orig/odbcapi30.c 2008-10-07 00:46:09.000000000 +0300
-+++ psqlodbc-08.04.0100/odbcapi30.c 2009-09-19 20:13:57.000000000 +0300
-@@ -118,13 +118,7 @@ SQLColAttribute(SQLHSTMT StatementHandle
- SQLPOINTER CharacterAttribute,
- SQLSMALLINT BufferLength,
- SQLSMALLINT *StringLength,
--#if defined(_WIN64)
- SQLLEN *NumericAttribute
--#elif defined(WITH_UNIXODBC) || defined(WIN32)
-- SQLPOINTER NumericAttribute
--#else
-- SQLLEN *NumericAttribute
--#endif
- )
- {
- CSTR func = "SQLColAttribute";
-diff -upr psqlodbc-08.04.0100.orig/odbcapi30w.c psqlodbc-08.04.0100/odbcapi30w.c
---- psqlodbc-08.04.0100.orig/odbcapi30w.c 2009-03-22 16:17:10.000000000 +0200
-+++ psqlodbc-08.04.0100/odbcapi30w.c 2009-09-19 20:22:17.000000000 +0300
-@@ -262,11 +262,7 @@ SQLRETURN SQL_API SQLColAttributeW(
- SQLPOINTER pCharAttr,
- SQLSMALLINT cbCharAttrMax,
- SQLSMALLINT *pcbCharAttr,
--#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64))
-- SQLPOINTER pNumAttr
--#else
- SQLLEN *pNumAttr
--#endif
- )
- {
- CSTR func = "SQLColAttributeW";
-diff -upr psqlodbc-08.04.0100.orig/odbcapi.c psqlodbc-08.04.0100/odbcapi.c
---- psqlodbc-08.04.0100.orig/odbcapi.c 2008-11-23 03:00:53.000000000 +0200
-+++ psqlodbc-08.04.0100/odbcapi.c 2009-09-19 20:13:56.000000000 +0300
-@@ -1111,11 +1111,7 @@ SQLExtendedFetch(
- HSTMT hstmt,
- SQLUSMALLINT fFetchType,
- SQLLEN irow,
--#ifdef WITH_UNIXODBC
-- SQLROWSETSIZE *pcrow,
--#else
- SQLULEN *pcrow,
--#endif /* WITH_UNIXODBC */
- SQLUSMALLINT *rgfRowStatus)
- {
- RETCODE ret;
diff --git a/community-staging/qbittorrent/PKGBUILD b/community-staging/qbittorrent/PKGBUILD
deleted file mode 100644
index e26f76684..000000000
--- a/community-staging/qbittorrent/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-
-pkgname=qbittorrent
-pkgver=2.9.2
-pkgrel=7
-pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
-arch=('i686' 'x86_64')
-url="http://www.qbittorrent.org/"
-license=('GPL')
-depends=('qt' 'libtorrent-rasterbar' 'xdg-utils')
-makedepends=('boost' 'geoip')
-optdepends=('python: needed for search'
- 'geoip: improves peer country resolution')
-install='qbittorrent.install'
-source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz")
-md5sums=('0c2188e0065be57e50c06f5934d5f7a2')
-
-build() {
- cd qbittorrent-${pkgver}
-
- ./configure \
- --prefix=/usr
-
- make
-}
-
-package() {
- cd qbittorrent-${pkgver}
-
- make INSTALL_ROOT=${pkgdir} install
-}
diff --git a/community-staging/qbittorrent/qbittorrent.install b/community-staging/qbittorrent/qbittorrent.install
deleted file mode 100644
index e70c054ec..000000000
--- a/community-staging/qbittorrent/qbittorrent.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-staging/qlandkartegt/PKGBUILD b/community-staging/qlandkartegt/PKGBUILD
deleted file mode 100644
index 2523f102e..000000000
--- a/community-staging/qlandkartegt/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 60737 2011-12-17 10:51:39Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Matthias Maennich <arch@maennich.net>
-# Contributor: <boenki@gmx.de>
-
-pkgname=qlandkartegt
-pkgver=1.3.1
-pkgrel=2
-pkgdesc="Use your GPS with Linux"
-arch=('i686' 'x86_64')
-url="http://www.qlandkarte.org/"
-license=('GPL')
-depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs'
- 'qt' 'shared-mime-info' 'qtwebkit')
-makedepends=('cmake' 'garmindev')
-optdepends=('garmindev: to connect garmin devices')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
- $pkgname-mimetypes.xml)
-sha256sums=('77a387856e2d41f9ea69f750cbac9bb49fa249d65bdef5e319bfa6f7c9f84121'
- 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
-
-build() {
- cd ${srcdir}/$pkgname-$pkgver
-
- cd ${srcdir}
- mkdir build
- cd build
-
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
- make
-}
-
-package(){
- cd ${srcdir}/build
-
- make DESTDIR=${pkgdir} install
-
- install -D -m644 ${srcdir}/$pkgname-mimetypes.xml \
- ${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml
-}
diff --git a/community-staging/qlandkartegt/qlandkartegt-mimetypes.xml b/community-staging/qlandkartegt/qlandkartegt-mimetypes.xml
deleted file mode 100644
index 46d3d402c..000000000
--- a/community-staging/qlandkartegt/qlandkartegt-mimetypes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
- <mime-type type="application/vnd.qlandkartegt.qlb">
- <comment>QLandkarteGT File</comment>
- <glob pattern="*.qlb"/>
- </mime-type>
-</mime-info>
diff --git a/community-staging/qlandkartegt/qlandkartegt.changelog b/community-staging/qlandkartegt/qlandkartegt.changelog
deleted file mode 100644
index 59d0e9a59..000000000
--- a/community-staging/qlandkartegt/qlandkartegt.changelog
+++ /dev/null
@@ -1,30 +0,0 @@
-2011-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.3.1-1
-
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.2.4-1
-
-2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.2.3-1
-
-2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.2.2-1
-
-2011-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.2.1-1
-
-2011-06-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.2.0-1
-
-2011-05-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.1.2-1
-
-2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.1.1-1
-
-2011-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.1.0-1
-
-2011-02-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.0.1-2
- * moved to [community] with 59 AUR votes
diff --git a/community-staging/qlandkartegt/qlandkartegt.install b/community-staging/qlandkartegt/qlandkartegt.install
deleted file mode 100644
index e55805570..000000000
--- a/community-staging/qlandkartegt/qlandkartegt.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime > /dev/null
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/community-staging/qmc2/PKGBUILD b/community-staging/qmc2/PKGBUILD
deleted file mode 100644
index d87be2085..000000000
--- a/community-staging/qmc2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 60733 2011-12-17 10:34:47Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-
-pkgname=qmc2
-pkgver=0.34
-pkgrel=2
-pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME"
-url="http://qmc2.arcadehits.net"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('qtwebkit' 'phonon' 'sdl')
-makedepends=('rsync' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2")
-md5sums=('3439fb62c95ff702e3c4194c05353169')
-
-build() {
- cd "$srcdir/$pkgname"
- export CTIME=0
- make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr
-}
-
-package() {
- cd "$srcdir/$pkgname"
- make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install
- install -d $pkgdir/usr/share/{applications,pixmaps}
- install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps"
-}
diff --git a/community-staging/qtcreator/PKGBUILD b/community-staging/qtcreator/PKGBUILD
deleted file mode 100644
index c69d5a86b..000000000
--- a/community-staging/qtcreator/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 60765 2011-12-17 15:35:41Z svenstaro $
-# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dan Vratil <progdan@progdansoft.com>
-# Contributor: thotypous <matiasΘarchlinux-br·org>
-# Contributor: delor <bartekpiech gmail com>
-
-pkgname="qtcreator"
-pkgver=2.4.0
-_pkgver=2.4.0
-pkgrel=2
-pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=('i686' 'x86_64')
-url='http://qt.nokia.com/products/developer-tools'
-license=('LGPL')
-depends=('qt>=4.8.0')
-makedepends=('qt-private-headers>=4.8.0' 'git')
-options=('docs')
-optdepends=('qt-doc: for the integrated Qt documentation'
- 'gdb: for the debugger'
- 'cmake: for cmake project suppport'
- 'openssh-askpass: for ssh support'
- 'git: for git support'
- 'mercurial: for mercurial support'
- 'bzr: for bazaar support')
-install=qtcreator.install
-source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz"
- 'qtcreator.desktop')
-md5sums=('80c1a2be4c685ce147c42424ad977e1a'
- 'f1f4680b9838ff0b8f4cf11eb850d662')
-
-build() {
- cd ${srcdir}
-
- [[ -d build ]] && rm -r build
- mkdir build && cd build
-
- qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro
- make
-}
-
-package() {
- cd ${srcdir}/build
-
- make INSTALL_ROOT="${pkgdir}/usr/" install
-
- install -Dm644 ${srcdir}/qtcreator.desktop \
- ${pkgdir}/usr/share/applications/qtcreator.desktop
- install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \
- ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
-}
diff --git a/community-staging/qtcreator/qtcreator.desktop b/community-staging/qtcreator/qtcreator.desktop
deleted file mode 100644
index 0fd562bd9..000000000
--- a/community-staging/qtcreator/qtcreator.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/qtcreator
-Name=Qt-Creator
-GenericName=C++ IDE
-X-KDE-StartupNotify=true
-Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png
-Terminal=false
-Type=Application
-Categories=Qt;Development
diff --git a/community-staging/qtcreator/qtcreator.install b/community-staging/qtcreator/qtcreator.install
deleted file mode 100644
index 4d4a283db..000000000
--- a/community-staging/qtcreator/qtcreator.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-staging/root/PKGBUILD b/community-staging/root/PKGBUILD
deleted file mode 100644
index 729d3377f..000000000
--- a/community-staging/root/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Sebastian Voecking <voeck@web.de>
-
-pkgname=root
-pkgver=5.32.00
-pkgrel=2
-pkgdesc='C++ data analysis framework and interpreter from CERN.'
-arch=('i686' 'x86_64')
-url='http://root.cern.ch'
-license=('LGPL2.1')
-depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
- 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme')
-makedepends=('fftw')
-install='root.install'
-options=('!emptydirs')
-source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
- 'root.sh'
- 'rootd'
- 'root.xml')
-md5sums=('1c30e4e6eeae62ff1ad5118cd1309679'
- '0e883ad44f99da9bc7c23bc102800b62'
- 'efd06bfa230cc2194b38e0c8939e72af'
- 'e2cf69b204192b5889ceb5b4dedc66f7')
-
-build() {
- cd root
-
- if [ ${CARCH} == 'i686' ]; then
- TARGET=linux;
- else
- TARGET=linuxx8664gcc;
- fi
-
- # python2 switch
- find . -type f -exec sed -i -e 's_#!/usr/bin/env python_&2_' \
- -e 's/python -O/python2 -O/g' \
- -e 's/python -c/python2 -c/g' {} \;
- sed \
- -e 's/python 2/python2 2/g' \
- -i configure
- sed \
- -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \
- -i cint/reflex/python/genreflex/Makefile.am
- sed \
- -e 's/python /python2 /' \
- -i config/genreflex.in config/genreflex-rootcint.in
-
- ./configure \
- ${TARGET} \
- --prefix=/usr \
- --disable-builtin-ftgl \
- --disable-builtin-freetype \
- --disable-builtin-glew \
- --disable-builtin-pcre \
- --disable-builtin-zlib \
- --disable-builtin-lzma \
- --enable-gdml \
- --enable-gsl-shared \
- --enable-minuit2 \
- --enable-soversion \
- --enable-roofit \
- --enable-python \
- --with-python-incdir=/usr/include/python2.7 \
- --with-python-libdir=/usr/lib
-
- # move from aur
- #--disable-builtin-afterimage \
-
- make
-}
-
-package() {
- cd root
-
- make DESTDIR=${pkgdir} install
-
- install -D ${srcdir}/root.sh \
- ${pkgdir}/etc/profile.d/root.sh
- install -D ${srcdir}/rootd \
- ${pkgdir}/etc/rc.d/rootd
- install -D -m644 ${srcdir}/root.xml \
- ${pkgdir}/usr/share/mime/packages/root.xml
-
- install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \
- ${pkgdir}/usr/share/applications/root-system-bin.desktop
- # replace @prefix@ with /usr for the desktop
- sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop
-
- install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \
- ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png
-
- # use a file that pacman can track instead of adding directly to ld.so.conf
- install -d ${pkgdir}/etc/ld.so.conf.d
- echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf
-
- rm -rf ${pkgdir}/etc/root/daemons
-}
diff --git a/community-staging/root/root.install b/community-staging/root/root.install
deleted file mode 100644
index afabb7aea..000000000
--- a/community-staging/root/root.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
- update-desktop-database >/dev/null
-
- update-mime-database /usr/share/mime >/dev/null
-
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_remove() {
- # leave for pre 5.30.03-3
- if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then
- cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
- mv /tmp/.pacroot etc/ld.so.conf
- chmod 644 etc/ld.so.conf
- sbin/ldconfig -r .
- fi
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-staging/root/root.sh b/community-staging/root/root.sh
deleted file mode 100644
index 685e6036b..000000000
--- a/community-staging/root/root.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ $PYTHONPATH ]; then
- export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
-else
- export PYTHONPATH=/usr/lib/root;
-fi
diff --git a/community-staging/root/root.xml b/community-staging/root/root.xml
deleted file mode 100644
index af8dd69c5..000000000
--- a/community-staging/root/root.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
- <mime-type type="application/x-root">
- <comment>ROOT file</comment>
- <comment xml:lang="de">ROOT-Datei</comment>
- <glob pattern="*.root"/>
- <magic priority="80">
- <match value="root" type="string" offset="0:64"/>
- </magic>
- </mime-type>
-</mime-info>
diff --git a/community-staging/root/rootd b/community-staging/root/rootd
deleted file mode 100644
index fb2c3388c..000000000
--- a/community-staging/root/rootd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/rootd`
-case "$1" in
- start)
- stat_busy "Starting ROOT file server daemon"
- [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1
- if [ $? -gt 0 ]; then
- stat_fail
- else
- PID=`pidof -o %PPID /usr/sbin/rootd`
- echo $PID >/var/run/rootd.pid
- add_daemon rootd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping ROOT file server daemon"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon rootd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-staging/sigil/PKGBUILD b/community-staging/sigil/PKGBUILD
deleted file mode 100644
index 62c17c898..000000000
--- a/community-staging/sigil/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 60731 2011-12-17 10:21:12Z andrea $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-
-pkgname=sigil
-pkgver=0.4.2
-pkgrel=3
-pkgdesc="A WYSIWYG ebook editor"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/sigil/"
-license=('GPL3')
-depends=('qtwebkit')
-makedepends=('cmake')
-install=sigil.install
-source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip"
- "${pkgname}.desktop")
-md5sums=('ce27976254236f8b11b787fd05be9acb'
- 'fef6aa492af487ccccd6b133635cee5a')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake -G "Unix Makefiles" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
- -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON ..
-
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make install DESTDIR="${pkgdir}"
-
- install -d -m 0755 "${pkgdir}"/usr/share/applications
- install -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications
-
- for _pic in 16 32 48 128 256; do
- install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \
- "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png
- done
-}
diff --git a/community-staging/sigil/sigil.desktop b/community-staging/sigil/sigil.desktop
deleted file mode 100644
index 4f3a14d20..000000000
--- a/community-staging/sigil/sigil.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sigil
-Comment=E-book reader and WYSIWYG editor
-TryExec=sigil
-Exec=sigil
-Icon=sigil
-Categories=Office;
-Terminal=false
-StartupNotify=false
diff --git a/community-staging/sigil/sigil.install b/community-staging/sigil/sigil.install
deleted file mode 100644
index ec506fa93..000000000
--- a/community-staging/sigil/sigil.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-staging/swi-prolog/PKGBUILD b/community-staging/swi-prolog/PKGBUILD
deleted file mode 100644
index 5a43c9910..000000000
--- a/community-staging/swi-prolog/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=swi-prolog
-pkgver=5.10.5
-pkgrel=3
-pkgdesc='Prolog environment'
-arch=('i686' 'x86_64')
-url='http://www.swi-prolog.org/'
-license=('GPL' 'LGPL')
-depends=('gmp' 'readline' 'openssl')
-makedepends=('libxft' 'libjpeg' 'unixodbc' 'libxpm' 'libxinerama')
-optdepends=('unixodbc: for using the odbc4pl library'
- 'libjpeg: for using the pl2xpce library'
- 'libxpm: for using the pl2xpce library'
- 'libxinerama: for using the pl2xpce library'
- 'libxft: for using the pl2xpce library')
-options=('!makeflags')
-source=("http://www.swi-prolog.org/download/stable/src/pl-${pkgver}.tar.gz")
-md5sums=('1ca45eddd3590fb525085761e75a4ebd')
-
-build() {
- cd pl-${pkgver}
-
- # enable shared because x86 doesn't build with shared libs, upstream made it intentional...
- ./configure \
- --prefix=/usr \
- --with-world \
- --enable-shared
-
- make
-}
-
-check() {
- cd pl-${pkgver}
-
- make check || true
-}
-
-package() {
- cd pl-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- # fix https://bugs.archlinux.org/task/20873
- chmod +x ${pkgdir}/usr/lib/swipl-${pkgver}/library/dialect/sicstus/swipl-lfr.pl
-}
diff --git a/community-staging/texmaker/PKGBUILD b/community-staging/texmaker/PKGBUILD
deleted file mode 100644
index fef91aa12..000000000
--- a/community-staging/texmaker/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 60704 2011-12-17 04:26:21Z tdziedzic $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: furester <xfurester@hotmail.com>
-# Contributor: Firmicus <firmicus gmx net>
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-
-pkgname=texmaker
-pkgver=3.1
-pkgrel=2
-pkgdesc='Free cross-platform latex editor'
-arch=('i686' 'x86_64')
-url="http://www.xm1math.net/texmaker/index.html"
-license=('GPL')
-depends=('poppler-qt' 'ghostscript' 'qtwebkit')
-source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('10a14c75abbb7234d4e5e58a7c85b110')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- export INSTALL_ROOT=${pkgdir}
-
- qmake -unix PREFIX=//usr texmaker.pro
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- export INSTALL_PATH=${pkgdir}
-
- make install
-}
diff --git a/community-staging/vtk/PKGBUILD b/community-staging/vtk/PKGBUILD
deleted file mode 100644
index 2fda45d68..000000000
--- a/community-staging/vtk/PKGBUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-# $Id: PKGBUILD 60781 2011-12-17 22:15:08Z tdziedzic $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
-# Contributor: leepesjee <lpeschier at xs4all dot nl>
-# Contributor: Olivier Medoc
-# Contributor: ignotus
-# Contributor: Fabian Moser
-# Contributor: djscholl
-
-pkgname=vtk
-pkgver=5.8.0
-pkgrel=7
-pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
-arch=('i686' 'x86_64')
-url='http://www.vtk.org'
-license=('BSD')
-depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk')
-optdepends=('python2: python bindings'
- 'java-runtime: java bindings'
- 'tk: tcl bindings'
- 'gnuplot: plotting tools'
- 'graphviz: drawing tools')
-source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
- "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
- 'fixkernelversioncheck.diff'
- 'ffmpeg-0.8.diff'
- 'fix-boost-graph-api-changes.diff')
-md5sums=('37b7297d02d647cc6ca95b38174cb41f'
- 'a05295b81930e894fc0e31866f399151'
- '9e137af23701f76fc727222ebac23389'
- 'e992321c9d1def6034d0fa6607b40c5a'
- 'e715aef2aea26fc05f904efb5d0d5627')
-
-build() {
- cd VTK
-
- # fix compilation error: http://vtk.org/Bug/view.php?id=12568
- # remove next pkgver bump
- patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
-
- # fix compilation error:
- # remove next pkgver bump
- patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
-
- # fix compilation error: http://vtk.org/Bug/view.php?id=12772
- # remove next pkgver bump
- patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff
-
- cd ${srcdir}
-
- rm -rf build
- mkdir build
- cd build
-
- cmake \
- -Wno-dev \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
- -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \
- -DBUILD_DOCUMENTATION:BOOL=ON \
- -DDOCUMENTATION_HTML_HELP:BOOL=ON \
- -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
- -DBUILD_EXAMPLES:BOOL=ON \
- -DVTK_USE_HYBRID:BOOL=ON \
- -DVTK_USE_PARALLEL:BOOL=ON \
- -DVTK_USE_PATENTED:BOOL=ON \
- -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
- -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
- -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
- -DVTK_USE_SYSTEM_PNG:BOOL=ON \
- -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
- -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
- -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
- -DVTK_USE_BOOST:BOOL=ON \
- -DVTK_USE_INFOVIS:BOOL=ON \
- -DVTK_USE_GL2PS:BOOL=ON \
- -DVTK_USE_MYSQL:BOOL=ON \
- -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
- -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
- -DVTK_WRAP_JAVA:BOOL=ON \
- -DVTK_WRAP_PYTHON:BOOL=ON \
- -DVTK_WRAP_TCL:BOOL=ON \
- -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \
- -DVTK_USE_QT:BOOL=ON \
- -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
- -DVTK_USE_GUISUPPORT:BOOL=ON \
- -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
- -DPYTHON_EXECUTABLE=/usr/bin/python2 \
- ${srcdir}/VTK
-
- make
-}
-
-package() {
- cd build
-
- make DESTDIR=${pkgdir} install
-
- # Move the vtk.jar to the arch-specific location
- install -dv ${pkgdir}/usr/share/java/vtk
- mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \
- ${pkgdir}/usr/share/java/vtk
-
- # Install license
- install -dv ${pkgdir}/usr/share/licenses/vtk
- install -m644 ${srcdir}/VTK/Copyright.txt \
- ${pkgdir}/usr/share/licenses/vtk
-
- # Put an entry in /etc/ld.so.conf.d
- install -dv ${pkgdir}/etc/ld.so.conf.d
- echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf
-}
diff --git a/community-staging/vtk/ffmpeg-0.8.diff b/community-staging/vtk/ffmpeg-0.8.diff
deleted file mode 100644
index 523919d6f..000000000
--- a/community-staging/vtk/ffmpeg-0.8.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Upstream changes introduced in version 5.6.1-6.1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- vtk (5.6.1-6.1) unstable; urgency=low
- .
- [ Michael Schutte ]
- * Non-maintainer upload.
- * Remove absolute paths to required libraries from
- /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
- #506992. Due to the multiarch transition, the original behavior
- frequently causes reverse build-deps to FTBFS. This change should
- probably be reverted once all required libraries are multiarched.
- .
- [ Steve M. Robbins ]
- * Override lintian diagnostic about embedded libraries ftgl and sqlite.
- * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
- 0.7.
- .
- The person named in the Author field signed this changelog entry.
-Author: Steve M. Robbins <smr@debian.org>
-Bug-Debian: http://bugs.debian.org/506992
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
-+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
-@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
- }
-
- //choose avi media file format
-- this->avOutputFormat = guess_format("avi", NULL, NULL);
-+ this->avOutputFormat = av_guess_format("avi", NULL, NULL);
- if (!this->avOutputFormat)
- {
- vtkGenericWarningMacro (<< "Could not open the avi media file format.");
-@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
- //Set up the codec.
- AVCodecContext *c = this->avStream->codec;
- c->codec_id = (CodecID)this->avOutputFormat->video_codec;
-- c->codec_type = CODEC_TYPE_VIDEO;
-+ c->codec_type = AVMEDIA_TYPE_VIDEO;
- c->width = this->Dim[0];
- c->height = this->Dim[1];
- c->pix_fmt = PIX_FMT_YUVJ420P;
-@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
- pkt.stream_index = this->avStream->index;
- if (cc->coded_frame->key_frame) //treat keyframes well
- {
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- }
- pkt.duration = 0; //presentation duration in time_base units or 0 if NA
- pkt.pos = -1; //byte position in stream or -1 if NA
diff --git a/community-staging/vtk/fix-boost-graph-api-changes.diff b/community-staging/vtk/fix-boost-graph-api-changes.diff
deleted file mode 100644
index 2162e7a28..000000000
--- a/community-staging/vtk/fix-boost-graph-api-changes.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-commit d3ecc2c459dd1df937fc97887581ace1036da533
-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
-Date: Tue Dec 13 15:36:06 2011 -0500
-
- BUG: 12772 fixes for change in Boost graph API
-
- This fixes bug 12772, where an API change in Boost was causing
- compilation failures using Boost 1.38. Thanks to Orion Poplawski for
- reporting the issue and posting the patch.
-
- Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06
-
-diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-index c789f6b..cf7cd47 100644
---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-@@ -47,6 +47,15 @@ using namespace boost;
- vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
-
-
-+namespace {
-+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
-+ return e.Id;
-+ }
-+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
-+ return e.underlying_desc.Id;
-+ }
-+}
-+
- // Redefine the bfs visitor, the only visitor we
- // are using is the tree_edge visitor.
- template <typename IdMap>
-@@ -95,7 +104,8 @@ public:
-
- // Copy the vertex and edge data from the graph to the tree.
- tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
-- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
-+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
-+ unwrap_edge_id(e), tree_e.Id);
- }
-
- private:
diff --git a/community-staging/vtk/fixkernelversioncheck.diff b/community-staging/vtk/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-staging/vtk/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
-
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
- # Linux Specific flags
- ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
- OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
- IF (HDF5_ENABLE_LARGE_FILE)
- SET (LARGEFILE 1)
- ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
- SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-staging/wkhtmltopdf/PKGBUILD b/community-staging/wkhtmltopdf/PKGBUILD
deleted file mode 100644
index e2e5a4802..000000000
--- a/community-staging/wkhtmltopdf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 60727 2011-12-17 10:09:56Z andrea $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-
-pkgname=wkhtmltopdf
-pkgver=0.9.9
-pkgrel=2
-pkgdesc="Simple shell utility to convert html to pdf using the webkit rendering engine, and qt"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/wkhtmltopdf/"
-license=('GPL3')
-depends=('qtwebkit')
-optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate')
-source=(http://wkhtmltopdf.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('41f598c0103326e7c13101391447b0284b4ba3cb')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- qmake wkhtmltopdf.pro
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make INSTALL_ROOT="$pkgdir/usr" install
-
- # Generate and install man page
- install -d "$pkgdir/usr/share/man/man1"
- ./wkhtmltopdf --manpage >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1"
-}
diff --git a/community-staging/xfmedia/PKGBUILD b/community-staging/xfmedia/PKGBUILD
deleted file mode 100644
index 31b0dee11..000000000
--- a/community-staging/xfmedia/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 61612 2012-01-04 21:37:20Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer : Tom Killian <tomk@runbox.com>
-# Contributor: Spider.007 <archPackage@spider007.net>
-
-pkgname=xfmedia
-pkgver=0.9.2
-pkgrel=10
-pkgdesc="xfce media player"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://spuriousinterrupt.org/projects/xfmedia/"
-depends=('xine-lib' 'taglib' 'exo' 'libxtst' 'libxss' 'libxfcegui4' 'dbus-glib')
-makedepends=('intltool' 'libxt')
-install=xfmedia.install
-source=(http://spuriousinterrupt.org/files/$pkgname/$pkgname-$pkgver.tar.bz2
- xfmedia-dbus-0.6-support.patch
- xfmedia-empty-prev-next-fix.patch
- xfmedia-exo-0.6.patch
- xfmedia-xine-1.2.0.patch)
-md5sums=('6eb8bd1f67201f829e0f45e733c02bd5'
- '8f2aa12eea584de65d8ed28179e56b51'
- '650f8cb9e2ddd9a8a2a03748b8757110'
- 'f5e17fcdf2056dcc8ca8aae8600c0132'
- '934603c7d3a1a0a66edb847bcb930df1')
-
-build() {
- cd ${srcdir}/$pkgname-$pkgver
- patch -Np1 -i ../xfmedia-dbus-0.6-support.patch
- patch -Np1 -i ../xfmedia-empty-prev-next-fix.patch
- patch -Np1 -i ../xfmedia-exo-0.6.patch
- patch -Np1 -i ../xfmedia-xine-1.2.0.patch
- LDFLAGS="$LDFLAGS -lXext -lm" ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/$pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
diff --git a/community-staging/xfmedia/xfmedia-dbus-0.6-support.patch b/community-staging/xfmedia/xfmedia-dbus-0.6-support.patch
deleted file mode 100644
index 9b1eb3678..000000000
--- a/community-staging/xfmedia/xfmedia-dbus-0.6-support.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur xfmedia-0.9.1.orig/src/remote.c xfmedia-0.9.1/src/remote.c
---- xfmedia-0.9.1.orig/src/remote.c 2005-09-05 00:56:37.000000000 -0400
-+++ xfmedia-0.9.1/src/remote.c 2006-04-08 00:27:18.000000000 -0400
-@@ -55,6 +55,10 @@
- #define DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER DBUS_SERVICE_REPLY_PRIMARY_OWNER
- #endif
-
-+#ifndef DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT
-+#define DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT DBUS_NAME_FLAG_DO_NOT_QUEUE
-+#endif
-+
- #endif /* HAVE_DBUS */
-
- #include <libxfce4util/libxfce4util.h>
diff --git a/community-staging/xfmedia/xfmedia-empty-prev-next-fix.patch b/community-staging/xfmedia/xfmedia-empty-prev-next-fix.patch
deleted file mode 100644
index e2d0d8166..000000000
--- a/community-staging/xfmedia/xfmedia-empty-prev-next-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -wbBur xfmedia-0.9.2/src/mainwin.c xfmedia-0.9.2.my/src/mainwin.c
---- xfmedia-0.9.2/src/mainwin.c 2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/mainwin.c 2010-11-01 13:01:17.000000000 +0000
-@@ -1865,6 +1865,10 @@
- gboolean use_playlist_q = xfmedia_playlist_queue_n_entries(mwin->playlist_q);
- gboolean ret = FALSE;
-
-+ if(xfmedia_playlist_get_n_entries(mwin->plist) == 0)
-+// if(xfmedia_playlist_queue_is_empty(mwin->plist))
-+ return;
-+
- if(mwin->cur_playing
- && xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")
- && !use_playlist_q )
-@@ -1899,6 +1903,10 @@
- {
- gint tot_items, idx = -1;
-
-+ if(xfmedia_playlist_get_n_entries(mwin->plist) == 0)
-+// if(xfmedia_playlist_queue_is_empty(mwin->plist))
-+ return;
-+
- if(xfmedia_settings_get_bool("/xfmedia/playlist/shuffle")) {
- XfmediaPlaylistEntryRef *ref = NULL;
- gboolean playing = FALSE;
diff --git a/community-staging/xfmedia/xfmedia-exo-0.6.patch b/community-staging/xfmedia/xfmedia-exo-0.6.patch
deleted file mode 100644
index 1de611c82..000000000
--- a/community-staging/xfmedia/xfmedia-exo-0.6.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-diff -wbBur xfmedia-0.9.2/configure xfmedia-0.9.2.my/configure
---- xfmedia-0.9.2/configure 2006-11-27 20:20:59.000000000 +0000
-+++ xfmedia-0.9.2.my/configure 2011-01-31 17:15:58.000000000 +0000
-@@ -27417,7 +27417,7 @@
-
-
- if test x"$xdt_cv_EXO_check" = x"yes"; then
-- if $PKG_CONFIG --exists "exo-0.3 >= 0.3.0" >/dev/null 2>&1; then
-+ if $PKG_CONFIG --exists "exo-1 >= 0.3.0" >/dev/null 2>&1; then
-
-
- # minimum supported version of pkg-config
-@@ -27501,22 +27501,22 @@
- fi
-
-
-- { echo "$as_me:$LINENO: checking for exo-0.3 >= 0.3.0" >&5
--echo $ECHO_N "checking for exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
-- if $PKG_CONFIG "--atleast-version=0.3.0" "exo-0.3" >/dev/null 2>&1; then
-- EXO_VERSION=`$PKG_CONFIG --modversion "exo-0.3"`
-+ { echo "$as_me:$LINENO: checking for exo-1 >= 0.3.0" >&5
-+echo $ECHO_N "checking for exo-1 >= 0.3.0... $ECHO_C" >&6; }
-+ if $PKG_CONFIG "--atleast-version=0.3.0" "exo-1" >/dev/null 2>&1; then
-+ EXO_VERSION=`$PKG_CONFIG --modversion "exo-1"`
- { echo "$as_me:$LINENO: result: $EXO_VERSION" >&5
- echo "${ECHO_T}$EXO_VERSION" >&6; }
-
- { echo "$as_me:$LINENO: checking EXO_CFLAGS" >&5
- echo $ECHO_N "checking EXO_CFLAGS... $ECHO_C" >&6; }
-- EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-0.3"`
-+ EXO_CFLAGS=`$PKG_CONFIG --cflags "exo-1"`
- { echo "$as_me:$LINENO: result: $EXO_CFLAGS" >&5
- echo "${ECHO_T}$EXO_CFLAGS" >&6; }
-
- { echo "$as_me:$LINENO: checking EXO_LIBS" >&5
- echo $ECHO_N "checking EXO_LIBS... $ECHO_C" >&6; }
-- EXO_LIBS=`$PKG_CONFIG --libs "exo-0.3"`
-+ EXO_LIBS=`$PKG_CONFIG --libs "exo-1"`
- { echo "$as_me:$LINENO: result: $EXO_LIBS" >&5
- echo "${ECHO_T}$EXO_LIBS" >&6; }
-
-@@ -27535,15 +27535,15 @@
-
- EXO_FOUND="yes"
-
-- elif $PKG_CONFIG --exists "exo-0.3" >/dev/null 2>&1; then
-- xdt_cv_version=`$PKG_CONFIG --modversion "exo-0.3"`
-+ elif $PKG_CONFIG --exists "exo-1" >/dev/null 2>&1; then
-+ xdt_cv_version=`$PKG_CONFIG --modversion "exo-1"`
- { echo "$as_me:$LINENO: result: found, but $xdt_cv_version" >&5
- echo "${ECHO_T}found, but $xdt_cv_version" >&6; }
-
-
-- echo "*** The required package exo-0.3 was found on your system,"
-+ echo "*** The required package exo-1 was found on your system,"
- echo "*** but the installed version ($xdt_cv_version) is too old."
-- echo "*** Please upgrade exo-0.3 to atleast version 0.3.0, or adjust"
-+ echo "*** Please upgrade exo-1 to atleast version 0.3.0, or adjust"
- echo "*** the PKG_CONFIG_PATH environment variable if you installed"
- echo "*** the new version of the package in a nonstandard prefix so"
- echo "*** pkg-config is able to find it."
-@@ -27554,8 +27554,8 @@
- echo "${ECHO_T}not found" >&6; }
-
-
-- echo "*** The required package exo-0.3 was not found on your system."
-- echo "*** Please install exo-0.3 (atleast version 0.3.0) or adjust"
-+ echo "*** The required package exo-1 was not found on your system."
-+ echo "*** Please install exo-1 (atleast version 0.3.0) or adjust"
- echo "*** the PKG_CONFIG_PATH environment variable if you"
- echo "*** installed the package in a nonstandard prefix so that"
- echo "*** pkg-config is able to find it."
-@@ -27564,14 +27564,14 @@
- fi
-
- else
-- { echo "$as_me:$LINENO: checking for optional package exo-0.3 >= 0.3.0" >&5
--echo $ECHO_N "checking for optional package exo-0.3 >= 0.3.0... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: checking for optional package exo-1 >= 0.3.0" >&5
-+echo $ECHO_N "checking for optional package exo-1 >= 0.3.0... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: not found" >&5
- echo "${ECHO_T}not found" >&6; }
- fi
- else
-- { echo "$as_me:$LINENO: checking for optional package exo-0.3" >&5
--echo $ECHO_N "checking for optional package exo-0.3... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: checking for optional package exo-1" >&5
-+echo $ECHO_N "checking for optional package exo-1... $ECHO_C" >&6; }
- { echo "$as_me:$LINENO: result: disabled" >&5
- echo "${ECHO_T}disabled" >&6; }
- fi
-diff -wbBur xfmedia-0.9.2/src/main.c xfmedia-0.9.2.my/src/main.c
---- xfmedia-0.9.2/src/main.c 2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/main.c 2011-02-01 11:08:02.000000000 +0000
-@@ -388,6 +388,23 @@
- return optind;
- }
-
-+/**
-+ * exo_str_get_md5_str:
-+ * @contents : The string to create a digest of.
-+ *
-+ * Creates a character array MD5 digestof the string
-+ * @contents.
-+ *
-+ * Return value: A newly-allocated character array which
-+ * should be free with g_free() when no
-+ * longer needed.
-+ **/
-+gchar*
-+exo_str_get_md5_str (const gchar *contents)
-+{
-+ return g_compute_checksum_for_string (G_CHECKSUM_MD5, contents, -1);
-+}
-+
- int
- main(int argc, char **argv)
- {
-diff -wbBur xfmedia-0.9.2/src/mediamarks.c xfmedia-0.9.2.my/src/mediamarks.c
---- xfmedia-0.9.2/src/mediamarks.c 2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/mediamarks.c 2011-02-01 11:04:42.000000000 +0000
-@@ -684,9 +684,9 @@
-
- render = exo_cell_renderer_ellipsized_text_new();
- if(gtk_major_version == 2 && gtk_minor_version >= 6)
-- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- else {
-- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- "ellipsize-set", TRUE, NULL);
- }
- gtk_tree_view_column_pack_start(col, render, TRUE);
-@@ -1693,9 +1693,9 @@
-
- render = exo_cell_renderer_ellipsized_text_new();
- if(gtk_major_version == 2 && gtk_minor_version >= 6)
-- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- else {
-- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- "ellipsize-set", TRUE, NULL);
- }
- gtk_tree_view_column_pack_start(col, render, TRUE);
-@@ -1705,9 +1705,9 @@
-
- render = exo_cell_renderer_ellipsized_text_new();
- if(gtk_major_version == 2 && gtk_minor_version >= 6)
-- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- else {
-- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- "ellipsize-set", TRUE, NULL);
- }
- col = gtk_tree_view_column_new_with_attributes(_("Location"), render,
-diff -wbBur xfmedia-0.9.2/src/playlist.c xfmedia-0.9.2.my/src/playlist.c
---- xfmedia-0.9.2/src/playlist.c 2006-11-27 07:21:22.000000000 +0000
-+++ xfmedia-0.9.2.my/src/playlist.c 2011-02-01 11:04:47.000000000 +0000
-@@ -1409,9 +1409,9 @@
-
- render = exo_cell_renderer_ellipsized_text_new();
- if(gtk_major_version == 2 && gtk_minor_version >= 6)
-- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END, NULL);
-+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- else {
-- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- "ellipsize-set", TRUE, NULL);
- }
- col = gtk_tree_view_column_new_with_attributes(_("Title"), render, "text",
-diff -wbBur xfmedia-0.9.2/src/settings-dialog.c xfmedia-0.9.2.my/src/settings-dialog.c
---- xfmedia-0.9.2/src/settings-dialog.c 2006-11-27 07:21:23.000000000 +0000
-+++ xfmedia-0.9.2.my/src/settings-dialog.c 2011-02-01 11:04:53.000000000 +0000
-@@ -552,7 +552,7 @@
- render = exo_cell_renderer_ellipsized_text_new();
- col = gtk_tree_view_column_new_with_attributes("name", render,
- "text", PLUGINS_NAME, NULL);
-- g_object_set(G_OBJECT(render), "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+ g_object_set(G_OBJECT(render), "ellipsize", PANGO_ELLIPSIZE_END,
- "ellipsize-set", TRUE, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), col);
-
-diff -wbBur xfmedia-0.9.2/src/xfmedia-playlist-queue.c xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c
---- xfmedia-0.9.2/src/xfmedia-playlist-queue.c 2006-11-27 07:21:22.000000000 +0000
-+++ xfmedia-0.9.2.my/src/xfmedia-playlist-queue.c 2011-02-01 11:04:57.000000000 +0000
-@@ -171,7 +171,7 @@
-
- render = exo_cell_renderer_ellipsized_text_new();
- g_object_set(G_OBJECT(render),
-- "ellipsize", EXO_PANGO_ELLIPSIZE_END,
-+ "ellipsize", PANGO_ELLIPSIZE_END,
- "ellipsize-set", TRUE,
- NULL);
- col = gtk_tree_view_column_new_with_attributes("display-name", render,
diff --git a/community-staging/xfmedia/xfmedia-xine-1.2.0.patch b/community-staging/xfmedia/xfmedia-xine-1.2.0.patch
deleted file mode 100644
index 2e04ac80a..000000000
--- a/community-staging/xfmedia/xfmedia-xine-1.2.0.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.c xfmedia-0.9.2.my/src/xfmedia-xine.c
---- xfmedia-0.9.2/src/xfmedia-xine.c 2006-11-27 10:21:23.000000000 +0300
-+++ xfmedia-0.9.2.my/src/xfmedia-xine.c 2012-01-05 01:23:21.000000000 +0400
-@@ -1450,17 +1450,6 @@
- }
-
- gboolean
--xfmedia_xine_trick_mode(XfmediaXine * xfx, gint mode, gint value)
--{
--
-- g_return_val_if_fail(xfx != NULL, 0);
-- g_return_val_if_fail(XFMEDIA_IS_XINE(xfx), 0);
-- g_return_val_if_fail(xfx->priv->stream != NULL, 0);
--
-- return xine_trick_mode(xfx->priv->stream, mode, value);
--}
--
--gboolean
- xfmedia_xine_get_pos_length(XfmediaXine *xfx, gint *pos_stream,
- gint *pos_time, gint *length_time)
- {
-diff -wbBur xfmedia-0.9.2/src/xfmedia-xine.h xfmedia-0.9.2.my/src/xfmedia-xine.h
---- xfmedia-0.9.2/src/xfmedia-xine.h 2006-11-27 10:21:23.000000000 +0300
-+++ xfmedia-0.9.2.my/src/xfmedia-xine.h 2012-01-05 01:20:47.000000000 +0400
-@@ -87,9 +87,6 @@
- gboolean xfmedia_xine_play (XfmediaXine *xfx,
- gint pos,
- gint start_time);
--gboolean xfmedia_xine_trick_mode (XfmediaXine *xfx,
-- gint mode,
-- gint value);
- gint xfmedia_xine_get_stream_info (XfmediaXine *xfx,
- gint info);
- G_CONST_RETURN gchar *xfmedia_xine_get_meta_info (XfmediaXine *xfx,
diff --git a/community-staging/xfmedia/xfmedia.install b/community-staging/xfmedia/xfmedia.install
deleted file mode 100644
index b95cc069d..000000000
--- a/community-staging/xfmedia/xfmedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
diff --git a/community-testing/bibletime/PKGBUILD b/community-testing/bibletime/PKGBUILD
deleted file mode 100644
index a9213371c..000000000
--- a/community-testing/bibletime/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 60878 2011-12-19 18:07:11Z andrea $
-# Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Tobias T. <OldShatterhand at gmx-topmail dot de>
-pkgname=bibletime
-pkgver=2.9.0
-pkgrel=2
-pkgdesc="Bible study tool for KDE4"
-arch=('x86_64' 'i686')
-url="http://www.bibletime.info/"
-license=('GPL2')
-depends=('qt' 'sword' 'openssl' 'clucene' 'qtwebkit')
-makedepends=('cmake' 'boost-libs')
-install=$pkgname.install
-source=("http://sourceforge.net/projects/$pkgname/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('0190b64de5892fc5f45e9a3d46bb29d6')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- cmake -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release "$srcdir/$pkgname-$pkgver"
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/bibletime/bibletime.install b/community-testing/bibletime/bibletime.install
deleted file mode 100644
index ad97d7bab..000000000
--- a/community-testing/bibletime/bibletime.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_install() {
- post_upgrade
-}
-
-post_remove() {
- post_upgrade
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/binutils-avr/PKGBUILD b/community-testing/binutils-avr/PKGBUILD
deleted file mode 100644
index 1dfbbe0d7..000000000
--- a/community-testing/binutils-avr/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 60056 2011-12-04 14:59:45Z jelle $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: danst0 <danst0@west.de>
-
-pkgname=binutils-avr
-pkgver=2.22
-pkgrel=1
-pkgdesc="A set of programs to assemble and manipulate binary and object files for the avr architecture"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-depends=('glibc>=2.12-5' 'zlib')
-options=('!libtool' '!distcc' '!ccache')
-source=(http://ftp.gnu.org/gnu/${pkgname/-avr}/${pkgname/-avr}-${pkgver}.tar.bz2{,.sig})
-md5sums=('ee0f10756c84979622b992a4a61ea3f5'
- '6aea2485019497583e5c3f5fc4a39cd5')
-
-build() {
- cd ${srcdir}/${pkgname/-avr}-${pkgver}
-
- mkdir build
- cd build
-
- CC="gcc -L$(pwd)/bfd/.libs/"
- if [ "${CARCH}" = "x86_64" ]; then
- ../configure --build=$(../config.guess) \
- --disable-multilib \
- --disable-nls \
- --enable-64-bit-bfd \
- --enable-install-libbfd \
- --includedir=/usr/$(../config.guess)/include \
- --infodir=/usr/share/info \
- --libdir=/usr/lib \
- --mandir=/usr/share/man \
- --prefix=/usr \
- --target=avr
- else
- ../configure --build=$(../config.guess) \
- --disable-nls \
- --enable-install-libbfd \
- --includedir=/usr/$(../config.guess)/include \
- --infodir=/usr/share/info \
- --libdir=/usr/lib \
- --mandir=/usr/share/man \
- --prefix=/usr \
- --target=avr
- fi
-
- # This checks the host environment and makes sure all the necessary tools are available to compile Binutils.
- make configure-host
-
- make tooldir=/usr
-}
-
-package() {
- cd ${srcdir}/${pkgname/-avr}-${pkgver}
-
- cd build
- make DESTDIR=${pkgdir} tooldir=/usr install
-
- rm -f ${pkgdir}/usr/lib/libiberty.a
-
- for bin in addr2line ar as c++filt gprof ld nm objcopy objdump ranlib readelf size strings strip ; do
- rm -f ${pkgdir}/usr/bin/${bin} || return 1
- done
-
- for info in as bfd binutils configure gprof ld standards; do
- mv ${pkgdir}/usr/share/info/${info}.info ${pkgdir}/usr/share/info/avr-${info}.info
- done
-}
-
diff --git a/community-testing/fatrat/PKGBUILD b/community-testing/fatrat/PKGBUILD
deleted file mode 100644
index 869af5da2..000000000
--- a/community-testing/fatrat/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 60880 2011-12-19 18:07:16Z andrea $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-
-pkgname=fatrat
-pkgver=1.2.0_beta1
-pkgrel=3
-pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
-arch=('i686' 'x86_64')
-url="http://fatrat.dolezel.info/"
-license=('GPL')
-depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
-makedepends=('boost' 'cmake' 'java-environment')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.gz)
-md5sums=('7ce4d5e6318361f36ba5ac86a5755da9')
-
-build() {
- cd $pkgname-$pkgver
-
- . /etc/profile.d/jre.sh
- . /etc/profile.d/jdk.sh
-
- cmake \
- -DWITH_EVERYTHING=ON \
- -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS="-lpthread" \
- -DCMAKE_CXX_FLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=2" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- .
-
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
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 16a70055a..000000000
--- a/community-testing/fpc/PKGBUILD
+++ /dev/null
@@ -1,51 +0,0 @@
-# $Id: PKGBUILD 61547 2012-01-02 19:53:55Z 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.6.0
-pkgrel=1
-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)
-md5sums=('17375e665a4e1311f85812fe2754f609')
-
-build() {
- cd ${srcdir}/fpcbuild-$pkgver
- pushd fpcsrc/compiler
- fpcmake -Tall
- popd
- make NOGDB=1 build
-}
-
-package() {
- cd ${srcdir}/fpcbuild-$pkgver
-
- export HOME=$srcdir
-
- make -j1 NOGDB=1 PREFIX=${pkgdir}/usr install
-
- export PATH=$pkgdir/usr/bin:$PATH
-
- install -Dm0644 fpcsrc/rtl/COPYING.FPC ${pkgdir}/usr/share/licenses/${pkgname}/COPYING.FPC
-
- [ "$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/
-
- mkdir -p ${pkgdir}/etc
- ${pkgdir}/usr/lib/fpc/${pkgver}/samplecfg $pkgdir/usr/lib/fpc/${pkgver} ${pkgdir}/etc
-
- mv $pkgdir/usr/man $pkgdir/usr/share/
-
- find $pkgdir/etc/ -type f -exec sed -i "s|$pkgdir||g" {} \;
-}
diff --git a/community-testing/freeradius/PKGBUILD b/community-testing/freeradius/PKGBUILD
deleted file mode 100644
index 9cf91bac6..000000000
--- a/community-testing/freeradius/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 60918 2011-12-19 18:09:51Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jason R Begley (jayray@digitalgoat.com>
-
-pkgname=freeradius
-pkgver=2.1.12
-pkgrel=3
-pkgdesc="The premier open source RADIUS server"
-arch=('i686' 'x86_64')
-url="http://www.freeradius.org/"
-license=("GPL")
-depends=('openssl' 'krb5' 'pth' 'libldap>=2.4.18' 'net-snmp' 'pam'
- 'postgresql-libs>=9.0.3' 'libtool' 'libmysqlclient' 'gdbm' 'shadow')
-makedepends=('libpcap' 'unixodbc' 'python2')
-optdepends=('libpcap' 'unixodbc' 'python2')
-options=('!libtool' 'emptydirs' '!makeflags')
-install=$pkgname.install
-source=(ftp://ftp.freeradius.org/pub/radius/freeradius-server-$pkgver.tar.bz2
- radiusd
- krb5-build-fix.patch)
-md5sums=('862d3a2c11011e61890ba84fa636ed8c'
- 'f1a6530b1b69d2fa793aa45b2de379bb'
- 'c6a61de7576933f59154a53bfc12a2d2')
-
-build() {
- cd $srcdir/freeradius-server-$pkgver
- export CFLAGS="$CFLAGS -fno-strict-aliasing"
- sed -i 's/ -DKRB5_DEPRECATED//' src/modules/rlm_krb5/Makefile.in
- patch -p1 <$srcdir/krb5-build-fix.patch
- ./configure --with-system-libtool --with-system-libltdl \
- --prefix=/usr --enable-heimdal-krb5 \
- --localstatedir=/var \
- --sysconfdir=/etc \
- --libdir=/usr/lib/freeradius
- make
-}
-
-package() {
- cd $srcdir/freeradius-server-$pkgver
- make install R=$pkgdir
- install -D -m755 ../radiusd $pkgdir/etc/rc.d/radiusd
- chmod o+r $pkgdir/etc/raddb/*
- mv $pkgdir/etc/raddb $pkgdir/etc/raddb.default
- rm -rf $pkgdir/var/run
-}
diff --git a/community-testing/freeradius/freeradius.install b/community-testing/freeradius/freeradius.install
deleted file mode 100644
index c3b9f9415..000000000
--- a/community-testing/freeradius/freeradius.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- groupadd -r radiusd
- useradd -r -m -d /var/lib/radiusd -g radiusd -s /bin/false radiusd
-
- touch /var/log/radius/radius.log
- chown -R radiusd.radiusd /var/log/radius/radius.log
-
- [ -d /etc/raddb ] || cp -a /etc/raddb.default /etc/raddb
-
- /bin/true
-}
-
-pre_remove() {
- /etc/rc.d/radiusd stop
- /bin/true
-}
-
-post_remove() {
- userdel radiusd
- groupdel radiusd
- /bin/true
-}
diff --git a/community-testing/freeradius/krb5-build-fix.patch b/community-testing/freeradius/krb5-build-fix.patch
deleted file mode 100644
index 11dae7090..000000000
--- a/community-testing/freeradius/krb5-build-fix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -wbBur freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c
---- freeradius-server-2.1.10/src/modules/rlm_krb5/rlm_krb5.c 2010-09-28 11:03:56.000000000 +0000
-+++ freeradius-server-2.1.10.my/src/modules/rlm_krb5/rlm_krb5.c 2011-04-29 09:26:10.000000000 +0000
-@@ -375,7 +375,7 @@
- * Heimdal krb5 verification
- */
- radlog(L_AUTH, "rlm_krb5: Parsed name is: %s@%s\n",
-- *userP->name.name_string.val,
-+ "-" /* *userP->name.name_string.val*/,
- userP->realm);
-
- krb5_cc_default(context, &id);
-@@ -390,7 +390,7 @@
-
- radlog(L_AUTH, "rlm_krb5: failed verify_user: %s (%s@%s )",
- error_message(ret),
-- *userP->name.name_string.val,
-+ "-" /* *userP->name.name_string.val */,
- userP->realm);
-
- return RLM_MODULE_REJECT;
diff --git a/community-testing/freeradius/radiusd b/community-testing/freeradius/radiusd
deleted file mode 100644
index bf872b6f2..000000000
--- a/community-testing/freeradius/radiusd
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/radiusd`
-case "$1" in
- start)
- stat_busy "Starting radiusd Server"
-
- [ -d /var/run/radiusd ] || mkdir -p /var/run/radiusd
- [ -f /var/run/radiusd/radiusd.pid ] || touch /var/run/radiusd/radiusd.pid
- chown -R radiusd.radiusd /var/run/radiusd
-
- [ -z "$PID" ] && /usr/sbin/radiusd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- echo $PID > /var/run/radiusd.pid
- add_daemon radiusd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping radiusd Server"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm /var/run/radiusd.pid
- rm_daemon radiusd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/gambas2/PKGBUILD b/community-testing/gambas2/PKGBUILD
deleted file mode 100644
index e2c8abe77..000000000
--- a/community-testing/gambas2/PKGBUILD
+++ /dev/null
@@ -1,950 +0,0 @@
-# $Id: PKGBUILD 60920 2011-12-19 18:10:09Z andrea $
-# Maintainer : Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Biru Ionut <ionut@archlinux.ro>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Toni Foerster <stonerl@skeps.de>
-
-pkgbase="gambas2"
-pkgname=('gambas2-meta' 'gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
- 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
- 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
- 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3'
- 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
- 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
- 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
- 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
- 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
- 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
- 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
- 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
-pkgver=2.23.1
-pkgrel=6
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net"
-depends=('libffi' 'bzip2' 'libfbclient' 'zlib' 'kdelibs3' 'libgl' 'gtk2' 'librsvg' 'xdg-utils'
- 'postgresql-libs>=8.4.1' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3'
- 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_image' 'libxtst' 'pcre' 'omniorb' 'libxft'
- 'libxcursor' 'libsm')
-makedepends=('intltool' 'mysql' 'postgresql')
-license=('GPL2')
-options=('!emptydirs' '!makeflags')
-groups=('gambas2')
-replaces=('gambas2')
-conflicts=('gambas2')
-source=(http://downloads.sourceforge.net/gambas/$pkgbase-$pkgver.tar.bz2
- 'fix-gbi-gba-path.patch' 'db.firebird.gcc-4.6.0-fix.patch'
- 'poppler-0.18.patch'
- 'gambas2-script.install' 'gambas2-runtime.install')
-md5sums=('ff8d2c1f310222c150b114e7ce247dfd'
- '9dda03a1bbfb7e7ba8b6a4ae91b6752b'
- 'ac9703b390502ed3242c8d34485c9236'
- 'a551b4b216bbdb3489f3c264bf73ee66'
- '870ff5b4b33cd75aa9c290539e6fdd5d'
- 'ab5667175c4945282d2f40a35d0e9e5b')
-_gbfiles="${srcdir}/$pkgbase-$pkgver/main/gbc"
-
-_buildgbcomp() {
- cd ${srcdir}/${pkgbase}-${pkgver}/comp/src/$1
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
- install $1.gambas ${pkgdir}/usr/lib/gambas2/
- install .component ${pkgdir}/usr/lib/gambas2/$1.component
- chmod a-x ${pkgdir}/usr/lib/gambas2/$1.component
- install .info ${pkgdir}/usr/share/gambas2/info/$1.info
- chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.info
- install .list ${pkgdir}/usr/share/gambas2/info/$1.list
- chmod a-x ${pkgdir}/usr/share/gambas2/info/$1.list
- if test -d control; then
- install -d ${pkgdir}/usr/share/gambas2/control/$1
- install control/*.png ${pkgdir}/usr/share/gambas2/control/$1
- chmod a-x ${pkgdir}/usr/share/gambas2/control/$1/*.png
- fi
-}
-
-build() {
- cd "${srcdir}/$pkgbase-$pkgver"
-
- ## workaround to allow package splitting
- msg "Applying patches ..."
- patch -Np1 -i "${srcdir}/fix-gbi-gba-path.patch"
- # merged upstream
- patch -Np3 -i "${srcdir}/db.firebird.gcc-4.6.0-fix.patch"
- patch -Np2 -i "${srcdir}/poppler-0.18.patch"
- ./reconf-all
- ##
-
- . /etc/profile.d/kde3.sh
- . /etc/profile.d/qt3.sh
-
- ./configure -C --disable-qte --prefix=/usr
- make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas2-meta() {
- depends=('gambas2-runtime' 'gambas2-devel' 'gambas2-ide' 'gambas2-examples' 'gambas2-help'
- 'gambas2-script' 'gambas2-gb-chart' 'gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
- 'gambas2-gb-db' 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
- 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3'
- 'gambas2-gb-desktop' 'gambas2-gb-form' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
- 'gambas2-gb-gtk' 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
- 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
- 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
- 'gambas2-gb-pdf' 'gambas2-gb-qt' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
- 'gambas2-gb-qt-kde' 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
- 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
- 'gambas2-gb-web' 'gambas2-gb-xml' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
- pkgdesc="Gambas2 meta package"
-}
-
-package_gambas2-runtime() {
- depends=('libffi' 'xdg-utils')
- pkgdesc="Gambas2 runtime environment"
- install=gambas2-runtime.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/lib/gb.component \
- ${pkgdir}/usr/lib/gambas2
- ln -s gbx2 ${pkgdir}/usr/bin/gbr2
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- rm -f ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
-
- ## needed for postinst with xdg-utils
- install -d -m755 ${pkgdir}/usr/share/gambas2/mime
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/* \
- ${pkgdir}/usr/share/gambas2/mime/
- install -d -m755 ${pkgdir}/usr/share/gambas2/icons
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/main/mime/application-x-gambas.png \
- ${pkgdir}/usr/share/gambas2/icons/application-x-gambas.png
-}
-
-package_gambas2-devel() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 development environment"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-ide() {
- depends=('gambas2-gb-qt-ext' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi' 'gambas2-gb-settings'
- 'gambas2-gb-db' 'gambas2-gb-desktop' 'gambas2-devel')
- pkgdesc="Gambas2 Integrated Development Environment"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/debug
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- _buildgbcomp gb.form
- _buildgbcomp gb.form.dialog
- _buildgbcomp gb.form.mdi
- _buildgbcomp gb.settings
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
- cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gambas2-database-manager
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
- cd ${srcdir}/${pkgbase}-${pkgver}/app/src/
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
- rm ${pkgdir}/usr/bin/gbx2
- ##
-
- install -m755 gambas2/gambas2.gambas ${pkgdir}/usr/bin
- install -m755 gambas2-database-manager/gambas2-database-manager.gambas ${pkgdir}/usr/bin
- ln -s gambas2.gambas ${pkgdir}/usr/bin/gambas2
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.desktop \
- ${pkgdir}/usr/share/applications/gambas2.desktop
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas2.png \
- ${pkgdir}/usr/share/pixmaps/gambas2.png
-}
-
-package_gambas2-examples() {
- depends=('gambas2-gb-compress' 'gambas2-gb-corba' 'gambas2-gb-crypt'
- 'gambas2-gb-db-firebird' 'gambas2-gb-db-form' 'gambas2-gb-db-mysql'
- 'gambas2-gb-db-odbc' 'gambas2-gb-db-postgresql' 'gambas2-gb-db-sqlite2' 'gambas2-gb-db-sqlite3'
- 'gambas2-gb-desktop' 'gambas2-gb-form-dialog' 'gambas2-gb-form-mdi'
- 'gambas2-gb-gtk-ext' 'gambas2-gb-gtk-svg' 'gambas2-gb-gui'
- 'gambas2-gb-image' 'gambas2-gb-info' 'gambas2-gb-net' 'gambas2-gb-net-curl'
- 'gambas2-gb-net-smtp' 'gambas2-gb-opengl' 'gambas2-gb-option' 'gambas2-gb-pcre'
- 'gambas2-gb-pdf' 'gambas2-gb-qt-ext' 'gambas2-gb-qt-opengl'
- 'gambas2-gb-qt-kde-html' 'gambas2-gb-report' 'gambas2-gb-sdl'
- 'gambas2-gb-sdl-sound' 'gambas2-gb-settings' 'gambas2-gb-v4l' 'gambas2-gb-vb'
- 'gambas2-gb-web' 'gambas2-gb-xml-rpc' 'gambas2-gb-xml-xslt')
- pkgdesc="Gambas2 examples"
-# arch=('any')
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- rm -r ${pkgdir}/usr/bin ${pkgdir}/usr/lib
- rm -r ${pkgdir}/usr/share/gambas2/{help,info}
-}
-
-package_gambas2-help() {
- depends=()
- pkgdesc="Gambas2 help files"
-# arch=('any')
-
- cd ${srcdir}/${pkgbase}-${pkgver}/help
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- #fix help
- chown root:root -R ${pkgdir}/usr/share/gambas2/help/help
-}
-
-package_gambas2-script() {
- depends=('gambas2-devel')
- pkgdesc="Gambas2 scripter and server programs support"
- install=gambas2-script.install
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/eval
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/app/src/gbs2
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbc2 -ag -r ${pkgdir}/usr
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gba2
- install -m755 gbs2.gambas ${pkgdir}/usr/bin
-
- ln -s gbs2.gambas ${pkgdir}/usr/bin/gbs2
- ln -s gbs2.gambas ${pkgdir}/usr/bin/gbw2
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/share ${pkgdir}/usr/lib
- rm ${pkgdir}/usr/bin/gbx2
- ##
-
- ## needed for postinst with xdg-utils
- cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
- install -d -m755 ${pkgdir}/usr/share/gambas2/mime
- install -D -m644 *.xml ${pkgdir}/usr/share/gambas2/mime/
- install -D -m644 *.png ${pkgdir}/usr/share/gambas2/mime/
- ##
-}
-
-package_gambas2-gb-chart() {
- depends=('gambas2-gb-form')
- pkgdesc="Gambas2 chart component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.form
- _buildgbcomp gb.chart
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.form*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.form*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-compress() {
- depends=('gambas2-runtime' 'bzip2' 'zlib')
- pkgdesc="Gambas2 compression support component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/compress
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-corba() {
- depends=('gambas2-runtime' 'omniorb')
- pkgdesc="Gambas2 corba component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.corba
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-crypt() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 MD5/DES crypting component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-firebird() {
- depends=('gambas2-gb-db' 'libfbclient')
- pkgdesc="Gambas2 Firebird database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.firebird
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-form() {
- depends=('gambas2-gb-db' 'gambas2-gb-form')
- pkgdesc="Gambas2 database form component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.db.form
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*,gb.db.{info,list}}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*,gb.db.{so*,la,component}}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-db-mysql() {
- depends=('gambas2-gb-db' 'libmysqlclient')
- pkgdesc="Gambas2 MySQL database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-odbc() {
- depends=('gambas2-gb-db' 'unixodbc')
- pkgdesc="Gambas2 ODBC database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-postgresql() {
- depends=('gambas2-gb-db' 'postgresql-libs>=8.4.1')
- pkgdesc="Gambas2 PostgreSQL database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-sqlite2() {
- depends=('gambas2-gb-db' 'sqlite2')
- pkgdesc="Gambas2 Sqlite2 database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-db-sqlite3() {
- depends=('gambas2-gb-db' 'sqlite3')
- pkgdesc="Gambas2 Sqlite3 database access component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-desktop() {
- depends=('gambas2-runtime' 'libsm' 'libxtst')
- pkgdesc="Gambas2 desktop component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.{so*,la},gb.qt*,gb.draw*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-form() {
- depends=('gambas2-gb-gui')
- pkgdesc="Gambas2 form component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.form
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*,gb.gui*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.gui*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-form-dialog() {
- depends=('gambas2-gb-form')
- pkgdesc="Gambas2 form dialog component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.form
- _buildgbcomp gb.form.dialog
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-form-mdi() {
- depends=('gambas2-gb-form')
- pkgdesc="Gambas2 form MDI component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.form
- _buildgbcomp gb.form.mdi
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-gtk() {
- depends=('gambas2-runtime' 'gtk2')
- pkgdesc="Gambas2 graphical GTK+ toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.gtk.ext*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.gtk.ext*,gb.{so*,la}}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-gtk-ext() {
- depends=('gambas2-gb-gtk')
- pkgdesc="Gambas2 graphical GTK+ toolkit extension component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk/src/ext
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-gtk-svg() {
- depends=('gambas2-gb-gtk' 'librsvg')
- pkgdesc="Gambas2 graphical GTK+ toolkit svg component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk.svg
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-gui() {
- depends=('gambas2-gb-qt' 'gambas2-gb-gtk')
- pkgdesc="Gambas2 automatic gui toolkit chooser"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la}}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-image() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 image processing component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.image
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-info() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 info component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- _buildgbcomp gb.info
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-net() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 networking component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-net-curl() {
- depends=('gambas2-runtime' 'curl')
- pkgdesc="Gambas2 advanced networking component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-net-smtp() {
- depends=('gambas2-runtime' 'glib2')
- pkgdesc="Gambas2 SMTP component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-opengl() {
- depends=('gambas2-runtime' 'libgl' 'mesa')
- pkgdesc="Gambas2 OpenGL component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-option() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 command-line options component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/option
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-pcre() {
- depends=('gambas2-runtime' 'pcre')
- pkgdesc="Gambas2 PCRE component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-pdf() {
- depends=('gambas2-runtime' 'poppler-glib')
- pkgdesc="Gambas2 PDF component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-qt() {
- depends=('gambas2-runtime' 'qt3')
- pkgdesc="Gambas2 graphical QT toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.qt.ext*,gb.qt.opengl*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt.ext*,gb.qt.opengl*,gb.{so*,la}}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-qt-ext() {
- depends=('gambas2-gb-qt')
- pkgdesc="Gambas2 graphical QT toolkit extension component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/ext
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-qt-opengl() {
- depends=('gambas2-gb-qt' 'libgl')
- pkgdesc="Gambas2 graphical QT toolkit OpenGL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt/src/opengl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-qt-kde() {
- depends=('gambas2-gb-qt' 'kdelibs3')
- pkgdesc="Gambas2 KDE component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- rm ${pkgdir}/usr/share/gambas2/info/gb.qt.kde.html*
- rm ${pkgdir}/usr/lib/gambas2/gb.qt.kde.html*
-}
-
-package_gambas2-gb-qt-kde-html() {
- depends=('gambas2-gb-qt-kde')
- pkgdesc="Gambas2 KHTML component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt.kde/src/html
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-report() {
- depends=('gambas2-runtime' 'gambas2-gb-form')
- pkgdesc="Gambas2 report component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/draw
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/db
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- _buildgbcomp gb.form
- _buildgbcomp gb.report
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.{info,list},gb.form.{info,list},gb.qt*,gb.gui*,gb.db*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.draw*,gb.qt*,gb.{so*,la},gb.form.{component,gambas},gb.gui*,gb.db*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-sdl() {
- depends=('gambas2-runtime' 'sdl_image' 'libxft' 'libxcursor' 'libgl')
- pkgdesc="Gambas2 SDL component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-sdl-sound() {
- depends=('gambas2-runtime' 'sdl_mixer')
- pkgdesc="Gambas2 SDL sound component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-settings() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 settings management component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- _buildgbcomp gb.settings
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-v4l() {
- depends=('gambas2-runtime' 'libjpeg' 'libpng')
- pkgdesc="Gambas2 V4L component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-vb() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 VB transitional component"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/vb
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-}
-
-package_gambas2-gb-web() {
- depends=('gambas2-runtime')
- pkgdesc="Gambas2 CGI component"
-# arch=('any')
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- _buildgbcomp gb.web
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-xml() {
- depends=('gambas2-runtime' 'libxml2')
- pkgdesc="Gambas2 xml component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/{gb.xml.{xslt*,rpc*},gb.{info,list},gb.net*}
- rm ${pkgdir}/usr/lib/gambas2/{gb.xml.{xslt*,rpc*},gb.{so*,la},gb.net*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-xml-rpc() {
- depends=('gambas2-gb-xml' 'gambas2-gb-net' 'gambas2-gb-net-curl')
- pkgdesc="Gambas2 xml-rpc component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{{info,list},xml.{info,list},xml.xslt.{info,list},net.*}
- rm ${pkgdir}/usr/lib/gambas2/gb.{{so*,la},xml.{so*,la,component},xml.xslt.*,net.*}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
-
-package_gambas2-gb-xml-xslt() {
- depends=('gambas2-gb-xml' 'libxslt')
- pkgdesc="Gambas2 xml-xslt component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbx
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
- mkdir -p ${pkgdir}/usr/share/gambas2/info
- ${srcdir}/${pkgbase}-${pkgver}/main/gbc/gbi2 -r ${pkgdir}/usr gb
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
- make DESTDIR="${pkgdir}" GBFILES="${_gbfiles}" install
-
- ## cleanup the workaround
- rm ${pkgdir}/usr/share/gambas2/info/gb.{info,list}
- rm ${pkgdir}/usr/lib/gambas2/gb.{so*,la}
- rm -rf ${pkgdir}/usr/bin
- ##
-}
diff --git a/community-testing/gambas2/db.firebird.gcc-4.6.0-fix.patch b/community-testing/gambas2/db.firebird.gcc-4.6.0-fix.patch
deleted file mode 100644
index 0b6e68df3..000000000
--- a/community-testing/gambas2/db.firebird.gcc-4.6.0-fix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:01:54 3864
-+++ gambas/branches/2.0/gb.db.firebird/src/main.cpp 2011/05/27 15:26:41 3865
-@@ -1216,7 +1216,8 @@
- GB.StoreVariant(&fantom, &buffer[i]);
- }
- else{
-- GB.StoreVariant(&res->GetData(pos,i), &buffer[i]);
-+ GB_VARIANT val = res->GetData(pos,i);
-+ GB.StoreVariant(&val , &buffer[i]);
- }
- }
- }
-@@ -1874,6 +1875,8 @@
- static char query[SQLMAXLEN];
- int type;
- std::string str1,str2;
-+ GB_VARIANT varval;
-+ char* charval;
- snprintf(query,SQLMAXLEN-1,"select b.RDB$field_name,a.RDB$field_type,b.rdb$null_flag,b.rdb$default_source,a.RDB$field_length from RDB$fields a,RDB$relation_fields b where a.RDB$field_name=b.RDB$field_source and b.RDB$relation_name=upper('%s') and b.rdb$field_name=upper('%s')",table,field);
- if (do_query(db, query, &res, "Unable to get the field from the table")){
- delete res;
-@@ -1900,9 +1903,11 @@
- str1=res->GetData(0,3).value.value._string;
- if(str1!="")
- str2=str1.assign(str1,8,str1.length()-8);
-- GB.FreeString(&res->GetData(0,3).value.value._string);
-+ charval = res->GetData(0,3).value.value._string;
-+ GB.FreeString(&charval);
- res->SetData(0,3,str2);
-- GB.StoreVariant(&res->GetData(0,3), &info->def);
-+ varval = res->GetData(0,3);
-+ GB.StoreVariant(&varval, &info->def);
- }
- delete res;
- return FALSE;
diff --git a/community-testing/gambas2/fix-gbi-gba-path.patch b/community-testing/gambas2/fix-gbi-gba-path.patch
deleted file mode 100644
index 9be8e921e..000000000
--- a/community-testing/gambas2/fix-gbi-gba-path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- component.am 2010-03-15 20:54:43.000000000 +0100
-+++ ../component.am 2010-04-30 15:00:47.218700833 +0200
-@@ -6,17 +6,17 @@
- @if test -d $(COMPONENT); then \
- echo "Compiling the $(COMPONENT) project..."; \
- ( \
-- $(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
-+ $(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT); \
- cd $(COMPONENT); \
-- $(DESTDIR)$(bindir)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
-- $(DESTDIR)$(bindir)/gba$(GAMBAS_VERSION); \
-+ $(GBFILES)/gbc$(GAMBAS_VERSION) -ag -r $(DESTDIR)$(prefix); \
-+ $(GBFILES)/gba$(GAMBAS_VERSION); \
- rm -rf .gambas; \
- $(INSTALL) $(COMPONENT).gambas $(DESTDIR)$(gblibdir); \
- ) \
- fi
- @echo
- @echo "Creating the information files for $(COMPONENT) component..."
-- @$(DESTDIR)$(bindir)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
-+ @$(GBFILES)/gbi$(GAMBAS_VERSION) -r $(DESTDIR)$(prefix) $(COMPONENT)
- @echo
-
- uninstall-hook:
diff --git a/community-testing/gambas2/gambas2-runtime.install b/community-testing/gambas2/gambas2-runtime.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-testing/gambas2/gambas2-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
- xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
- xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gambas2/gambas2-script.install b/community-testing/gambas2/gambas2-script.install
deleted file mode 100644
index 86558e434..000000000
--- a/community-testing/gambas2/gambas2-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas2/mime/application-x-gambasscript.png application-x-gambasscript
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas2/mime/application-x-gambasserverpage.png application-x-gambasserverpage
- xdg-mime install /usr/share/gambas2/mime/application-x-gambasscript.xml
- xdg-mime install /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
- xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasscript.xml
- xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-testing/gambas2/gambas2.install b/community-testing/gambas2/gambas2.install
deleted file mode 100644
index 4729f7ef6..000000000
--- a/community-testing/gambas2/gambas2.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas2/mime/application-x-gambas.png application-x-gambas
- xdg-mime install /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas
- xdg-mime uninstall /usr/share/gambas2/mime/application-x-gambas.xml
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/gambas2/poppler-0.18.patch b/community-testing/gambas2/poppler-0.18.patch
deleted file mode 100644
index fbcc430bf..000000000
--- a/community-testing/gambas2/poppler-0.18.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- gambas/trunk/gb.pdf/configure.ac 2010/07/14 01:50:18 3038
-+++ gambas/trunk/gb.pdf/configure.ac 2011/08/09 10:43:30 3997
-@@ -22,6 +22,8 @@
- AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_8, $((1-$?)), Poppler version >= 0.8)
- pkg-config --atleast-version=0.11.3 poppler
- AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_11_3, $((1-$?)), Poppler version >= 0.11.3)
-+ pkg-config --atleast-version=0.17.0 poppler
-+ AC_DEFINE_UNQUOTED(POPPLER_VERSION_0_17, $((1-$?)), Poppler version >= 0.17)
- fi
-
- AC_OUTPUT( \
-
---- gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/06/03 00:51:09 3870
-+++ gambas/trunk/gb.pdf/src/CPdfDocument.cpp 2011/08/09 10:43:30 3997
-@@ -44,6 +44,7 @@
- #include <Outline.h>
- #include <Link.h>
- #include <Gfx.h>
-+#include <glib/poppler-features.h>
-
- /*****************************************************************************
-
-@@ -956,12 +957,17 @@
- Bookmarks of a PDF page
-
- ******************************************************************************/
-+
- void aux_fill_links(void *_object)
- {
-+ #if POPPLER_VERSION_0_17
-+ THIS->links = new Links (THIS->page->getAnnots (THIS->doc->getCatalog()));
-+ #else
- Object obj;
-
- THIS->links = new Links (THIS->page->getAnnots (&obj),THIS->doc->getCatalog()->getBaseURI ());
- obj.free();
-+ #endif
- }
-
- BEGIN_PROPERTY (PDFPAGELINKS_count)
diff --git a/community-testing/gambas3/PKGBUILD b/community-testing/gambas3/PKGBUILD
deleted file mode 100644
index 85b161fbc..000000000
--- a/community-testing/gambas3/PKGBUILD
+++ /dev/null
@@ -1,1097 +0,0 @@
-# $Id: PKGBUILD 60882 2011-12-19 18:07:26Z andrea $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-
-pkgbase=gambas3
-pkgname=('gambas3-runtime' 'gambas3-devel' 'gambas3-ide' 'gambas3-script' 'gambas3-examples' 'gambas3-gb-cairo' 'gambas3-gb-chart'
- 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db' 'gambas3-gb-db-form' 'gambas3-gb-db-mysql'
- 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2' 'gambas3-gb-db-sqlite3'
- 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form'
- 'gambas3-gb-form-dialog' 'gambas3-gb-form-mdi' 'gambas3-gb-form-stock' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image'
- 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib' 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl'
- 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glu' 'gambas3-gb-opengl-glsl' 'gambas3-gb-option' 'gambas3-gb-pcre'
- 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl' 'gambas3-gb-qt4-webkit'
- 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
- 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
-pkgver=2.99.6
-pkgrel=5
-pkgdesc="A free development environment based on a Basic interpreter."
-arch=('i686' 'x86_64')
-url="http://gambas.sourceforge.net/"
-license=('GPL')
-groups=('gambas3')
-makedepends=('intltool' 'mysql' 'postgresql' 'libffi' 'bzip2' 'glib2' 'v4l-utils'
- 'zlib' 'mesa' 'libgl' 'glew' 'xdg-utils' 'gtk2' 'imlib2' 'gdk-pixbuf2'
- 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite2' 'sqlite3' 'librsvg'
- 'curl' 'poppler-glib' 'sdl_mixer' 'sdl_ttf' 'libxtst' 'pcre' 'qtwebkit'
- 'libxcursor' 'libsm' 'dbus-core' 'libxml2' 'libxslt' 'libgnome-keyring')
-options=('!emptydirs' '!makeflags')
-source=("http://downloads.sourceforge.net/gambas/${pkgbase}-${pkgver}.tar.bz2"
- 'gambas3-script.install' 'gambas3-runtime.install')
-md5sums=('746aaae5494c4b267bdae802c5c006d5'
- 'b284be39d147ec799f1116a6abc068b4'
- 'b5cc403990f31b8ea1c5cf37366d3d29')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- ./reconf-all
- ./configure --prefix=/usr -C
-
- make bindir=${pkgdir}/usr/bin
-}
-
-package_gambas3-runtime() {
- depends=('libffi' 'xdg-utils')
- pkgdesc="Runtime environment"
- install=gambas3-runtime.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
- make DESTDIR="${pkgdir}" install
-
- cd ../gbx
- make DESTDIR="${pkgdir}" install
- cd ../lib/debug
- make DESTDIR="${pkgdir}" install
- cd ../eval
- make DESTDIR="${pkgdir}" install
- cd ../draw
- make DESTDIR="${pkgdir}" install
- install -D -m644 ../gb.component \
- ${pkgdir}/usr/lib/gambas3
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- ln -s gbx3 ${pkgdir}/usr/bin/gbr3
- gbc/gbi3 -r ${pkgdir}/usr gb
- rm -f ${pkgdir}/usr/lib/gambas3/gb.{so*,la}
-
- ## needed for postinst with xdg-utils
- install -d -m755 ${pkgdir}/usr/share/gambas3/mime
- install -D -m644 mime/* \
- ${pkgdir}/usr/share/gambas3/mime/
- install -d -m755 ${pkgdir}/usr/share/gambas3/icons
- install -D -m644 mime/application-x-gambas3.png \
- ${pkgdir}/usr/share/gambas3/icons/application-x-gambas3.png
-
- cd gbc
- make DESTDIR="${pkgdir}" uninstall
-}
-
-package_gambas3-devel() {
- depends=('gambas3-runtime')
- pkgdesc="Development environment"
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/gbc
- make DESTDIR="${pkgdir}" install
-}
-
-package_gambas3-ide() {
- depends=('gambas3-devel' 'gambas3-gb-db-form' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight'
- 'gambas3-gb-form-dialog' 'gambas3-gb-settings' 'gambas3-gb-form-mdi' 'gambas3-gb-image-effect'
- 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-webkit')
- pkgdesc="Integrated Development Environment"
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
-#!! with the ide !!
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.desktop \
- ${pkgdir}/usr/share/applications/gambas3.desktop
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/app/desktop/gambas3.png \
- ${pkgdir}/usr/share/pixmaps/gambas3.png
-
- rm -r ${pkgdir}/usr/bin/gb*
- rm -r ${pkgdir}/usr/lib
- rm -r ${pkgdir}/usr/share/gambas3
-}
-
-package_gambas3-script() {
- depends=('gambas3-devel')
- pkgdesc="Scripter and server programs support"
- install=gambas3-script.install
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## needed for postinst with xdg-utils
- cd ${srcdir}/${pkgbase}-${pkgver}/app/mime
- install -d -m755 ${pkgdir}/usr/share/gambas3/mime
- install -D -m644 *.xml ${pkgdir}/usr/share/gambas3/mime/
- install -D -m644 *.png ${pkgdir}/usr/share/gambas3/mime/
- ##
-
- rm -r ${pkgdir}/usr/bin/{gambas*,gb{[a-r]*,x*}}
- rm -r ${pkgdir}/usr/lib
- rm -r ${pkgdir}/usr/share/gambas3/[c-i]*
-}
-
-package_gambas3-examples() {
- depends=('gambas3-gb-cairo' 'gambas3-gb-chart' 'gambas3-gb-dbus' 'gambas3-gb-compress' 'gambas3-gb-crypt' 'gambas3-gb-db'
- 'gambas3-gb-db-form' 'gambas3-gb-db-mysql' 'gambas3-gb-db-odbc' 'gambas3-gb-db-postgresql' 'gambas3-gb-db-sqlite2'
- 'gambas3-gb-db-sqlite3' 'gambas3-gb-desktop' 'gambas3-gb-eval-highlight' 'gambas3-gb-form' 'gambas3-gb-form-dialog'
- 'gambas3-gb-form-mdi' 'gambas3-gb-gtk' 'gambas3-gb-gui' 'gambas3-gb-image' 'gambas3-gb-image-effect' 'gambas3-gb-image-imlib'
- 'gambas3-gb-image-io' 'gambas3-gb-net' 'gambas3-gb-net-curl' 'gambas3-gb-net-smtp' 'gambas3-gb-opengl' 'gambas3-gb-opengl-glsl'
- 'gambas3-gb-option' 'gambas3-gb-pcre' 'gambas3-gb-pdf' 'gambas3-gb-qt4' 'gambas3-gb-qt4-ext' 'gambas3-gb-qt4-opengl'
- 'gambas3-gb-qt4-webkit' 'gambas3-gb-report' 'gambas3-gb-sdl' 'gambas3-gb-sdl-sound' 'gambas3-gb-settings' 'gambas3-gb-signal'
- 'gambas3-gb-v4l' 'gambas3-gb-vb' 'gambas3-gb-xml' 'gambas3-gb-xml-rpc' 'gambas3-gb-xml-xslt' 'gambas3-gb-web')
- pkgdesc="Applications examples"
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- rm -r ${pkgdir}/usr/{bin,lib}
- rm -r ${pkgdir}/usr/share/gambas3/{info,control,gb.sdl}
-}
-
-package_gambas3-gb-cairo() {
- depends=('gambas3-runtime' 'cairo')
- pkgdesc="Cairo component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.cairo
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-chart() {
- depends=('gambas3-gb-form')
- pkgdesc="Chart component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[d-w]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-w]*
- ##
-}
-
-package_gambas3-gb-compress() {
- depends=('gambas3-runtime' 'bzip2' 'zlib')
- pkgdesc="Compression support component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.bzlib2
- make DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.compress.zlib
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.component,gb.[d-v]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[d-v]*
- ##
-}
-
-package_gambas3-gb-crypt() {
- depends=('gambas3-runtime')
- pkgdesc="MD5/DES crypting component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.crypt
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db() {
- depends=('gambas3-runtime')
- pkgdesc="Database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.comp*,gb.d{e,r}*,gb.[e-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.comp*,gb.de*,gb.[e-z]*}
- ##
-}
-
-package_gambas3-gb-db-form() {
- depends=('gambas3-gb-db' 'gambas3-gb-form')
- pkgdesc="Database form component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{chart*,[e-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{chart*,[e-z]*}
- ##
-}
-
-package_gambas3-gb-db-mysql() {
- depends=('gambas3-gb-db' 'libmysqlclient')
- pkgdesc="MySQL database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.mysql
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-odbc() {
- depends=('gambas3-gb-db' 'unixodbc')
- pkgdesc="ODBC database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.odbc
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-postgresql() {
- depends=('gambas3-gb-db' 'postgresql-libs')
- pkgdesc="PostgreSQL database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.postgresql
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-sqlite2() {
- depends=('gambas3-gb-db' 'sqlite2')
- pkgdesc="Sqlite2 database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite2
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-db-sqlite3() {
- depends=('gambas3-gb-db' 'sqlite3')
- pkgdesc="Sqlite3 database access component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.db.sqlite3
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-desktop() {
- depends=('gambas3-gb-image' 'libsm' 'libxtst' 'libgnome-keyring')
- pkgdesc="Desktop component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.desktop
- make DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-dbus() {
- depends=('gambas3-runtime' 'dbus-core')
- pkgdesc="DBUS component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.dbus
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-eval-highlight() {
- depends=('gambas3-runtime')
- pkgdesc="Expression evaluator highlight component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[f-z]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[f-z]*
- ##
-}
-
-package_gambas3-gb-form() {
- depends=('gambas3-gb-gui')
- pkgdesc="Form component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form.*,gb.report}
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{d*,m*,s*}}
- ##
-}
-
-package_gambas3-gb-form-dialog() {
- depends=('gambas3-gb-form')
- pkgdesc="Form dialog component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,g*,m*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,m*,s*}}
- ##
-}
-
-package_gambas3-gb-form-mdi() {
- depends=('gambas3-gb-form')
- pkgdesc="Form MDI component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/{gb.db*,gb.form,gb.report}
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-e]*,[m-w]*,form.{c*,d*,g*,s*}}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-e]*,[m-w]*,form.{i*,l*,d*,s*}}
- ##
-}
-
-package_gambas3-gb-form-stock() {
- depends=('gambas3-runtime')
- pkgdesc="Default stock icons component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{eval*,[m-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{eval*,[m-w]*}
- ##
-}
-
-package_gambas3-gb-gtk() {
- depends=('gambas3-gb-image' 'gtk2' 'librsvg')
- pkgdesc="GTK+ toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.gtk
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-gui() {
- depends=('gambas3-gb-qt4' 'gambas3-gb-gtk')
- pkgdesc="Automatic gui toolkit chooser"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/main/lib/gui
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-e]*,gb.[i-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-e]*,gb.[i-z]*}
- ##
-}
-
-package_gambas3-gb-image() {
- depends=('gambas3-runtime')
- pkgdesc="Image component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.e*,gb.[j-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.e*,gb.[j-z]*}
- ##
-}
-
-package_gambas3-gb-image-effect() {
- depends=('gambas3-gb-image')
- pkgdesc="Image effect component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-g]*,gb.image.{c*,l*,s*},gb.[j-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-g]*,gb.info,gb.image.{i*,l*},gb.[j-z]*}
- ##
-}
-
-package_gambas3-gb-image-imlib() {
- depends=('gambas3-gb-image' 'imlib2')
- pkgdesc="Imlib component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.imlib
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-image-io() {
- depends=('gambas3-gb-image' 'gdk-pixbuf2')
- pkgdesc="Input/Output component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.image.io
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net() {
- depends=('gambas3-runtime')
- pkgdesc="Network component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net-curl() {
- depends=('gambas3-gb-net' 'curl')
- pkgdesc="Curl component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-net-smtp() {
- depends=('gambas3-runtime' 'glib2')
- pkgdesc="SMTP component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.smtp
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl() {
- depends=('gambas3-runtime' 'libgl' 'glew')
- pkgdesc="OpenGL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl-glu() {
- depends=('gambas3-gb-opengl')
- pkgdesc="GL Utility component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glu
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-opengl-glsl() {
- depends=('gambas3-gb-opengl')
- pkgdesc="GLSL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.opengl/src/glsl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-option() {
- depends=('gambas3-runtime')
- pkgdesc="Getopt component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[a-n]*,gb.[p-z]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[a-n]*,gb.[p-z]*}
- ##
-}
-
-package_gambas3-gb-pcre() {
- depends=('gambas3-runtime' 'pcre')
- pkgdesc="PCRE component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pcre
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-pdf() {
- depends=('gambas3-runtime' 'poppler')
- pkgdesc="PDF component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.pdf
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4() {
- depends=('gambas3-gb-image' 'qt')
- pkgdesc="Qt4 toolkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-ext() {
- depends=('gambas3-gb-qt4')
- pkgdesc="Qt4 toolkit extended component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/ext
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-opengl() {
- depends=('gambas3-gb-qt4' 'libgl')
- pkgdesc="Qt4 toolkit OpenGL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/opengl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-qt4-webkit() {
- depends=('gambas3-gb-qt4' 'qtwebkit')
- pkgdesc="Qt4 toolkit webkit component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4/src/webkit
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-report() {
- depends=('gambas3-gb-form' 'gambas3-gb-image-io')
- pkgdesc="Report component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.qt4
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/share/gambas3/control/gb.[d-f]*
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-m]*,[s-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-m]*,[s-w]*}
- ##
-}
-
-package_gambas3-gb-sdl() {
- depends=('gambas3-gb-image-io' 'sdl_ttf' 'libxcursor' 'glew' 'libgl')
- pkgdesc="SDL component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-sdl-sound() {
- depends=('gambas3-runtime' 'sdl_mixer')
- pkgdesc="SDL sound component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.sdl.sound
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-settings() {
- depends=('gambas3-runtime')
- pkgdesc="Setting component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.{[c-r]*,[t-w]*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.{[c-r]*,[t-w]*}
- ##
-}
-
-package_gambas3-gb-signal() {
- depends=('gambas3-runtime')
- pkgdesc="Signal component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## cleanup the workaround
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/{gb.[c-r]*,gb.[t-z]*,gb.so*}
- rm -r ${pkgdir}/usr/share/gambas3/info/{gb.[c-r]*,gb.[t-z]*}
- ##
-}
-
-package_gambas3-gb-v4l() {
- depends=('gambas3-runtime' 'v4l-utils' 'libjpeg' 'libpng')
- pkgdesc="Video4linux component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.v4l
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-vb() {
- depends=('gambas3-runtime')
- pkgdesc="VB transitional component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- ## Workaround for splitting
- rm -r ${pkgdir}/usr/bin
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[a-u]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[a-u]*
- ##
-}
-
-package_gambas3-gb-xml() {
- depends=('gambas3-runtime' 'libxml2')
- pkgdesc="XML component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/rpc
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-xml-rpc() {
- depends=('gambas3-gb-xml' 'gambas3-gb-net' 'gambas3-gb-net-curl')
- pkgdesc="XML-RPC component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.net.curl
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.xml.{[c-l]*,xslt*,so*}
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.xml.{[i-l]*,x*}
- ##
-}
-
-package_gambas3-gb-xml-xslt() {
- depends=('gambas3-gb-xml' 'libxslt')
- pkgdesc="XML-XSLT component"
-
- ## workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/gb.xml/src/xslt
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
-
- ## cleanup the workaround
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- ##
-}
-
-package_gambas3-gb-web() {
- depends=('gambas3-runtime')
- pkgdesc="CGI component"
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" install
- ##
-
- cd ${srcdir}/${pkgbase}-${pkgver}/comp
- make DESTDIR="${pkgdir}" install
-
- ## Workaround for splitting
- cd ${srcdir}/${pkgbase}-${pkgver}/main
- make XDG_UTILS='' DESTDIR="${pkgdir}" uninstall
- rm -r ${pkgdir}/usr/lib/gambas3/gb.[c-v]*
- rm -r ${pkgdir}/usr/share/gambas3/info/gb.[c-v]*
- ##
-}
diff --git a/community-testing/gambas3/gambas3-runtime.install b/community-testing/gambas3/gambas3-runtime.install
deleted file mode 100644
index 6c8201a6a..000000000
--- a/community-testing/gambas3/gambas3-runtime.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambas.png application-x-gambas3
- xdg-mime install /usr/share/gambas3/mime/application-x-gambas3.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambas3
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambas3.xml
-}
diff --git a/community-testing/gambas3/gambas3-script.install b/community-testing/gambas3/gambas3-script.install
deleted file mode 100644
index 77c1aa52f..000000000
--- a/community-testing/gambas3/gambas3-script.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambasscript.png application-x-gambasscript
- xdg-icon-resource install --context mimetypes --size 64 \
- /usr/share/gambas3/mime/application-x-gambasserverpage.png application-x-gambasserverpage
- xdg-mime install /usr/share/gambas3/mime/application-x-gambasscript.xml
- xdg-mime install /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
-
-pre_remove() {
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasscript
- xdg-icon-resource uninstall --context mimetypes --size 64 application-x-gambasserverpage
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasscript.xml
- xdg-mime uninstall /usr/share/gambas3/mime/application-x-gambasserverpage.xml
-}
diff --git a/community-testing/goldendict/PKGBUILD b/community-testing/goldendict/PKGBUILD
deleted file mode 100644
index 052e25df8..000000000
--- a/community-testing/goldendict/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 60884 2011-12-19 18:07:35Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: m0rph <m0rph.mailbox@gmail.com>
-
-pkgname=goldendict
-pkgver=1.0.1
-pkgrel=5
-pkgdesc="Feature-rich dictionary lookup program"
-arch=('i686' 'x86_64')
-url="http://goldendict.berlios.de/"
-license=('GPL3')
-depends=('hunspell' 'libvorbis' 'libxtst' 'libzip' 'qt' 'qtwebkit' 'phonon')
-makedepds=('patch')
-provides=('stardict')
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver-src.tar.bz2
- $pkgname-paths.diff)
-sha256sums=('b3fb0405a5edb38f02ef881b48c36e46e2eacf641b0caf8d99403f595a4be9a6'
- '1dacae7b7a7d7c20a22b4595c07dbd65fdad134a0d4cf283312ea3bdb5f42589')
-
-build(){
- cd ${srcdir}
-
- patch -Np0 -i ${srcdir}/$pkgname-paths.diff
-
- qmake
- make
- qmake
-}
-
-package() {
- cd ${srcdir}
-
- make INSTALL_ROOT=${pkgdir} install
-
- #removing unneeded
- rm -rf ${pkgdir}/usr/share/app-install
-}
diff --git a/community-testing/goldendict/goldendict-paths.diff b/community-testing/goldendict/goldendict-paths.diff
deleted file mode 100644
index 812dfdb97..000000000
--- a/community-testing/goldendict/goldendict-paths.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- goldendict.pro~ 2010-12-27 22:52:21.000000000 +0100
-+++ goldendict.pro 2010-12-27 22:52:21.000000000 +0100
-@@ -63,2 +63,2 @@
-- isEmpty( PREFIX ):PREFIX = /usr/local
-- DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/apps/goldendict/\\\"
-+ isEmpty( PREFIX ):PREFIX = /usr
-+ DEFINES += PROGRAM_DATA_DIR=\\\"$$PREFIX/share/goldendict/\\\"
-@@ -66 +66 @@
-- locale.path = $$PREFIX/share/apps/goldendict/locale/
-+ locale.path = $$PREFIX/share/goldendict/locale/
diff --git a/community-testing/goldendict/goldendict.changelog b/community-testing/goldendict/goldendict.changelog
deleted file mode 100644
index a42c630d3..000000000
--- a/community-testing/goldendict/goldendict.changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-2011-12-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * goldendict 1.0.1-5 libQtWebKit.so.4 now in new qtwebkit package
-
-2010-12-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release 1.0.1
-
-2010-02-16 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * FS#18350 fixed in 0.9.0-5
-
-2009-06-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Package moved to [community] in v0.9.0
diff --git a/community-testing/google-gadgets/PKGBUILD b/community-testing/google-gadgets/PKGBUILD
deleted file mode 100644
index ff4cb1675..000000000
--- a/community-testing/google-gadgets/PKGBUILD
+++ /dev/null
@@ -1,158 +0,0 @@
-# $Id: PKGBUILD 60886 2011-12-19 18:07:48Z andrea $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-
-pkgbase=google-gadgets
-pkgname=('google-gadgets-common' 'google-gadgets-gtk' 'google-gadgets-qt')
-_realname=$pkgbase-for-linux
-_basedir="$startdir/pkg/base"
-pkgver=0.11.2
-_sover=1.0
-_sobump=0.0.0
-pkgrel=5
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/google-gadgets-for-linux/"
-license=('APACHE')
-makedepends=('gstreamer0.10-base-plugins' 'libwebkit'
- 'desktop-file-utils' 'xdg-utils'
- 'librsvg' 'curl' 'libsoup-gnome'
- 'qt' 'qtwebkit'
- 'networkmanager'
- 'zip' 'flex')
-options=('!libtool')
-source=("http://google-gadgets-for-linux.googlecode.com/files/$_realname-$pkgver.tar.bz2"
- "wifi-types.patch")
-md5sums=('279305553bcbf74f3e3615f6abc36a5e'
- 'f0df71c60a174e9d629db87b8bd9e102')
-
-build() {
- cd "$srcdir/$_realname-$pkgver"
-
- # Building thrice is expensive;
- # we move files around instead
- #
- # xulrunner 2.0 is incompatible;
- # we build without smjs-script/browser-element
-
- patch -p1 <$srcdir/wifi-types.patch
- ./configure --prefix=/usr \
- --disable-werror \
- --disable-update-desktop-database \
- --disable-update-mime-database \
- --with-oem-brand=Arch \
- --with-ssl-ca-file=/etc/ssl/certs/ca-certificates.crt \
- --with-browser-plugins-dir=/usr/lib/mozilla/plugins \
- --disable-gtkmoz-browser-element \
- --disable-smjs-script-runtime
- make
-}
-
-package_google-gadgets-common() {
- pkgdesc="Desktop widgets from Google (common files)"
- install=$pkgbase-common.install
- depends=('hicolor-icon-theme' 'shared-mime-info')
- optdepends=('google-gadgets-gtk: GTK+ (full) UI'
- 'google-gadgets-qt: Qt (partial) UI')
-
- cd "$srcdir/$_realname-$pkgver"
-
- make -j1 DESTDIR="$pkgdir/" install
-
- # we need to remove stuff in this package
- cp -a "$pkgdir" "$_basedir"
-
- # do not force any removal; we want to know in case files change
- cd "$pkgdir/usr"
- rm -r bin
- rm -r share/applications
-
- cd "$pkgdir/usr/lib/$pkgbase"
-
- # gtk-related
- #rm gtkmoz-browser-child
- rm ../lib*gtk*
- rm modules/gtk*.so
-
- # qt-related
- rm ../lib*qt*
- rm modules/qt*.so
-}
-
-package_google-gadgets-gtk() {
- pkgdesc="Desktop widgets from Google (full GTK+ front-end)"
- groups=('google-gadgets')
- install=$pkgbase.install
- depends=('google-gadgets-common'
- 'desktop-file-utils' 'xdg-utils'
- 'gstreamer0.10-base-plugins' 'libwebkit' 'libsoup-gnome'
- 'librsvg' 'curl')
- optdepends=('networkmanager: desktop integration')
-
- # install the gtk binary
- cd "$_basedir"
- install -Dm755 "usr/bin/ggl-gtk" "$pkgdir/usr/bin/ggl-gtk"
-
- # gtk-only browser stuff
- #install -Dm755 usr/lib/$pkgbase/gtkmoz-browser-child \
- # "$pkgdir/usr/lib/$pkgbase/gtkmoz-browser-child"
-
- # now the gtk libraries
- mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
- install -m755 usr/lib/$pkgbase/modules/gtk*.so \
- "$pkgdir/usr/lib/$pkgbase/modules/"
-
- install -m755 usr/lib/lib*gtk* "$pkgdir/usr/lib"
-
- # fix permissions and symlinks
- find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
- ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-gtk-$_sover.so"
-
- ln -sf /usr/lib/libggadget-gtk-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-gtk-$_sover.so.0"
-
- # freedesktop.org for gtk
- install -Dm644 usr/share/applications/ggl-gtk.desktop \
- "$pkgdir/usr/share/applications/ggl-gtk.desktop"
-
- install -m644 usr/share/applications/ggl-designer.desktop \
- "$pkgdir/usr/share/applications/"
-}
-
-package_google-gadgets-qt() {
- pkgdesc="Desktop widgets from Google (partial Qt front-end)"
- groups=('google-gadgets')
- install=$pkgbase.install
- depends=('google-gadgets-common' 'qt' 'qtwebkit'
- 'desktop-file-utils' 'xdg-utils'
- 'gstreamer0.10-base-plugins' 'libwebkit')
- optdepends=('networkmanager: desktop integration')
-
- # install the qt binary
- cd "$_basedir"
- install -Dm755 usr/bin/ggl-qt "$pkgdir/usr/bin/ggl-qt"
-
- # the qt libraries
- mkdir -p "$pkgdir/usr/lib/$pkgbase/modules"
-
- install -m755 usr/lib/$pkgbase/modules/qt*.so \
- "$pkgdir/usr/lib/$pkgbase/modules/"
-
- install -m755 usr/lib/lib*qt* "$pkgdir/usr/lib/"
-
- # fix permissions and symlinks
- find "$pkgdir/usr/lib" -name *.a -exec chmod 644 {} \;
-
- ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-qt-$_sover.so"
-
- ln -sf /usr/lib/libggadget-qt-$_sover.so.$_sobump \
- "$pkgdir/usr/lib/libggadget-qt-$_sover.so.0"
-
- # freedesktop.org for qt
- install -Dm644 usr/share/applications/ggl-qt.desktop \
- "$pkgdir/usr/share/applications/ggl-qt.desktop"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/google-gadgets/google-gadgets-common.install b/community-testing/google-gadgets/google-gadgets-common.install
deleted file mode 100644
index 210cbc869..000000000
--- a/community-testing/google-gadgets/google-gadgets-common.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo "==> Updating desktop database..."
- gtk-update-icon-cache --quiet usr/share/icons/hicolor
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/google-gadgets/google-gadgets.changelog b/community-testing/google-gadgets/google-gadgets.changelog
deleted file mode 100644
index 5b8f85a71..000000000
--- a/community-testing/google-gadgets/google-gadgets.changelog
+++ /dev/null
@@ -1,8 +0,0 @@
-25 Mar 2011 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 0.11.2-3:
- xulrunner rebuild
- - undepend on xulrunner (2.0 incompatible)
- - disable smjs-script/browser-element
- Cleaned up scriptlets (too many blank lines)
- Added this changelog
diff --git a/community-testing/google-gadgets/google-gadgets.install b/community-testing/google-gadgets/google-gadgets.install
deleted file mode 100644
index fd88688fc..000000000
--- a/community-testing/google-gadgets/google-gadgets.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- echo "==> Updating desktop database..."
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/google-gadgets/wifi-types.patch b/community-testing/google-gadgets/wifi-types.patch
deleted file mode 100644
index be9383a61..000000000
--- a/community-testing/google-gadgets/wifi-types.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/network.cc 2009-03-15 04:12:42.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/network.cc 2011-04-08 20:57:16.000000000 +0000
-@@ -23,17 +23,9 @@
- namespace framework {
- namespace linux_system {
-
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
-
--#ifdef NM_DEVICE_TYPE_ETHERNET
- static const int kDeviceTypeEthernet = NM_DEVICE_TYPE_ETHERNET;
--#else
--static const int kDeviceTypeEthernet = DEVICE_TYPE_802_3_ETHERNET;
--#endif
-
- static const int kDeviceTypeUnknown = 0;
-
-diff -wbBur google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc
---- google-gadgets-for-linux-0.11.2/extensions/linux_system_framework/wireless.cc 2009-12-28 10:39:53.000000000 +0000
-+++ google-gadgets-for-linux-0.11.2.my/extensions/linux_system_framework/wireless.cc 2011-04-08 20:57:39.000000000 +0000
-@@ -77,11 +77,7 @@
-
- using namespace ggadget::dbus;
-
--#ifdef NM_DEVICE_TYPE_WIFI
- static const int kDeviceTypeWifi = NM_DEVICE_TYPE_WIFI;
--#else
--static const int kDeviceTypeWifi = DEVICE_TYPE_802_11_WIRELESS;
--#endif
-
- // Defined in nm 0.7
- static const int kDeviceStateActivated = 8;
diff --git a/community-testing/gpac/PKGBUILD b/community-testing/gpac/PKGBUILD
deleted file mode 100644
index 8e66362d6..000000000
--- a/community-testing/gpac/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 61561 2012-01-03 00:05:30Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=gpac
-pkgver=3824
-pkgrel=1
-pkgdesc="A multimedia framework based on the MPEG-4 Systems standard"
-arch=('i686' 'x86_64')
-url="http://gpac.sourceforge.net"
-license=('LGPL')
-depends=('ffmpeg' 'libjpeg' 'libpng' 'mesa')
-makedepends=('jack' 'a52dec' 'freetype2' 'libxv' 'faad2' 'libmad')
-optdepends=('jack: for jack support' 'a52dec: for A52 support'
- 'faad2: for AAC support' 'libmad: for mp3 support')
-options=('!makeflags')
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('bf7039c2585d539475babc7996851627efd7ec59')
-
-# source PKGBUILD && mksource
-mksource() {
- [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
- _svnver=$pkgver
- _svntrunk="https://gpac.svn.sourceforge.net/svnroot/gpac/trunk/gpac"
- _svnmod="$pkgname-$pkgver"
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- echo "#define GPAC_SVN_REVISION \"$_svnver\"" > ${pkgname}-$pkgver/include/gpac/version.h
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --mandir=/usr/share/man --X11-path=/usr --use-js=no
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install install-lib
-}
diff --git a/community-testing/gpsbabel/PKGBUILD b/community-testing/gpsbabel/PKGBUILD
deleted file mode 100644
index a80a79296..000000000
--- a/community-testing/gpsbabel/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 60888 2011-12-19 18:07:53Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=gpsbabel
-pkgver=1.4.2
-pkgrel=4
-pkgdesc="Reads, writes, and manipulates GPS waypoints in a variety of formats"
-arch=('i686' 'x86_64')
-url="http://www.gpsbabel.org"
-license=('GPL')
-depends=('libusb-compat' 'expat')
-makedepends=('fop' 'qt' 'libxml2' 'libxslt' 'gtk2' 'lcms2' 'qtwebkit')
-optdepends=('qt' 'qtwebkit')
-options=('docs')
-source=("gpsbabel-$pkgver.tar.gz::http://archlinux-stuff.googlecode.com/files/gpsbabel-$pkgver.tar.gz"
- "gpsbabel.desktop::http://pkgs.fedoraproject.org/gitweb/?p=gpsbabel.git;a=blob_plain;f=gpsbabel.desktop;hb=HEAD")
-md5sums=('76ea9f7852be2e98aa18976c4697ca93'
- '7bdbd243e29a8831842d31c079f04c45')
-
-build() {
- cd $srcdir/gpsbabel-$pkgver
- ./configure --prefix=/usr
- make
- make doc
- (cd gui && qmake && make)
-}
-
-package() {
- cd $srcdir/gpsbabel-$pkgver
- make DESTDIR=$pkgdir install
-
- # GUI
- install -Dm755 gui/objects/gpsbabelfe-bin ${pkgdir}/usr/bin/gpsbabelfe-bin
- install -Dm644 gui/images/appicon.png $pkgdir/usr/share/pixmaps/gpsbabel.png
- install -Dm644 $srcdir/gpsbabel.desktop $pkgdir/usr/share/applications/gpsbabel.desktop
-
- # Header install
- mkdir -p $pkgdir/usr/include/gpsbabel
- cp {defs.h,queue.h,gbtypes.h,filterdefs.h,cet.h,cet_util.h,garmin_tables.h} \
- $pkgdir/usr/include/gpsbabel
-
- # Doc install
- mkdir -p $pkgdir/usr/share/doc/$pkgname
- cp -r $srcdir/babelweb/* $pkgdir/usr/share/doc/$pkgname/
- cp README* $pkgdir/usr/share/doc/$pkgname/
-}
diff --git a/community-testing/kadu/PKGBUILD b/community-testing/kadu/PKGBUILD
deleted file mode 100644
index 582eb9632..000000000
--- a/community-testing/kadu/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 60890 2011-12-19 18:07:57Z andrea $
-# Maintainer: Bartłomiej Piotrowski <barthalion@gmail.com>
-# Contributor: Mateusz Herych
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-
-pkgname=kadu
-pkgver=0.10.1
-pkgrel=3
-pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
-arch=('i686' 'x86_64')
-url="http://www.kadu.net/"
-license=('GPL')
-depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
-source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('6211a9a9e02d645268cbf055892601a0')
-
-build() {
- cd "$srcdir"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}"
- rm -rf "$pkgdir/usr/share/kadu/{HISTORY,README}"
-}
diff --git a/community-testing/kvirc/PKGBUILD b/community-testing/kvirc/PKGBUILD
deleted file mode 100644
index be00731a3..000000000
--- a/community-testing/kvirc/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 60892 2011-12-19 18:08:03Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=kvirc
-pkgver=4.0.4
-pkgrel=4
-pkgdesc="Qt-based IRC client"
-url="http://www.kvirc.net"
-depends=('python2' 'qt' 'libxss' 'qtwebkit')
-arch=(i686 x86_64)
-makedepends=('cmake')
-license=('GPL')
-options=("!libtool")
-install=kvirc.install
-source=(ftp://ftp.kvirc.de/pub/kvirc/$pkgver/source/$pkgname-$pkgver.tar.bz2)
-md5sums=('26fd24979ae4a29bac9309b3b0c98788')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DWANT_KDE4=OFF \
- -DWANT_PERL=ON \
- -DWANT_PHONON=OFF \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd ${srcdir}/build
- make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/kvirc/kvirc.install b/community-testing/kvirc/kvirc.install
deleted file mode 100644
index 8f76d007f..000000000
--- a/community-testing/kvirc/kvirc.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
- true
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
- true
-}
diff --git a/community-testing/lazarus/ChangeLog b/community-testing/lazarus/ChangeLog
deleted file mode 100644
index 79ed3b287..000000000
--- a/community-testing/lazarus/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2008-01-21 JJDaNiMoTh <jjdanimoth.aur@gmail.com>
-
- * PKGBUILD: moved man pages to /usr/share
diff --git a/community-testing/lazarus/PKGBUILD b/community-testing/lazarus/PKGBUILD
deleted file mode 100644
index 5bba33fb7..000000000
--- a/community-testing/lazarus/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 61551 2012-01-02 20:07:08Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Jens Adam (byte/jra) <j_adam@web.de>
-
-pkgname=lazarus
-pkgver=0.9.30.2
-pkgrel=2
-pkgdesc='Delphi-like IDE for FreePascal'
-url='http://www.lazarus.freepascal.org/'
-license=('GPL2' 'MPL' 'custom:LGPL')
-arch=('i686' 'x86_64')
-depends=('fpc' 'fpc-src' 'gtk2')
-#makedepends=(rpmextract)
-options=('!emptydirs' '!makeflags')
-source=(http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-src.tar.bz2)
-md5sums=('0dcf54613c2f9d38a32d183431e2dfc9')
-
-build() {
- cd $srcdir/${pkgname}
- make FPC=/usr/bin/fpc clean bigide
-}
-
-package() {
- cd $srcdir/${pkgname}
-
- # skip the 'make install' mess completely and do everything manually
- mkdir -p $pkgdir/usr/lib/lazarus $pkgdir/usr/bin $pkgdir/usr/share/man/man1 $pkgdir/usr/share/doc
- rm -r debian
- cp -R . $pkgdir/usr/lib/lazarus
-
- ln -s /usr/lib/lazarus/lazarus $pkgdir/usr/bin/lazarus
- ln -s /usr/lib/lazarus/startlazarus $pkgdir/usr/bin/startlazarus
- ln -s /usr/lib/lazarus/lazbuild $pkgdir/usr/bin/lazbuild
-
- cp -R install/man/man1/* $pkgdir/usr/share/man/man1/
-
- mv $pkgdir/usr/lib/lazarus/docs $pkgdir/usr/share/doc/lazarus
-
- # make 'desktop-file-validate' happy and fix missing .png icon
- sed -e 's|\(Categories\).*|\1=IDE;Development;|' \
- -e 's|\.png|\.xpm|' -i install/lazarus.desktop
- install -Dm644 install/lazarus.desktop $pkgdir/usr/share/applications/lazarus.desktop
- install -Dm644 images/ide_icon48x48.png $pkgdir/usr/share/pixmaps/lazarus.png
- rm -r $pkgdir/usr/lib/lazarus/install
-
- # license files: /usr/lib/lazarus/COPYING*
- install -D -m644 COPYING.modifiedLGPL.txt $pkgdir/usr/share/licenses/$pkgname/COPYING.modifiedLGPL
-
- # strip
- find $pkgdir -perm /ugo+x -type f -exec strip {} \;
- find $pkgdir -name \*.so -type f -exec strip {} \;
-}
diff --git a/community-testing/libgda3/PKGBUILD b/community-testing/libgda3/PKGBUILD
deleted file mode 100644
index 0ede4da51..000000000
--- a/community-testing/libgda3/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 60922 2011-12-19 18:10:13Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=libgda3
-pkgver=3.1.5
-pkgrel=10
-pkgdesc="data abstraction layer; with mysql, pgsql, ldap, xml, sqlite providers"
-arch=('i686' 'x86_64')
-url="http://www.gnome-db.org/Download"
-license=('GPL')
-depends=('glib2' 'libxslt' 'popt' 'rarian' 'db' 'gnome-vfs'
- 'libmysqlclient' 'postgresql-libs>=8.4.1' 'libldap' 'unixodbc' 'sqlite3')
-makedepends=('intltool' 'pkgconfig' 'gtk-doc' 'util-linux-ng')
-options=('!libtool' '!distcc')
-source=(http://ftp.acc.umu.se/pub/GNOME/sources/libgda/3.1/libgda-$pkgver.tar.bz2)
-md5sums=('eb7da5286a112e7cff3111c89fba4456')
-
-build() {
- cd "$srcdir/libgda-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-package(){
- cd "$srcdir/libgda-$pkgver"
- make DESTDIR=$pkgdir install
- cd "$pkgdir" && find -name \*..so -exec rename '..so' '.a' {} \;
-}
diff --git a/community-testing/lilypond/PKGBUILD b/community-testing/lilypond/PKGBUILD
deleted file mode 100644
index 3e8fbbea7..000000000
--- a/community-testing/lilypond/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 60446 2011-12-14 11:46:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-# Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
-
-pkgname=lilypond
-pkgver=2.14.2
-pkgrel=3
-pkgdesc="An automated music engraving system"
-arch=('i686' 'x86_64')
-url="http://lilypond.org"
-license=('GPL')
-depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
-makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
- 'gsfonts' 'texi2html')
-options=('emptydirs')
-install=lilypond.install
-source=(http://download.linuxaudio.org/lilypond/sources/v2.14/$pkgname-$pkgver.tar.gz
- texlive-workaround.patch)
-md5sums=('4053a19e03181021893981280feb9aaa'
- 'ff32863f3eed67ac744e50bc4fc67a87')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # python2 fix
- for file in $(find . -name '*.py' -print); do
- sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
- sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
- done
-
- rm -rf python/out/
- patch -p1 <$srcdir/texlive-workaround.patch
-
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/lilypond/lilypond.install b/community-testing/lilypond/lilypond.install
deleted file mode 100644
index 934e7b435..000000000
--- a/community-testing/lilypond/lilypond.install
+++ /dev/null
@@ -1,48 +0,0 @@
-infodir=usr/share/info
-filelist=(music-glossary.info
- lilypond-web.info
- lilypond-contributor.info
- lilypond-contributor.info-1
- lilypond-contributor.info-2
- lilypond-internals.info-1
- lilypond-internals.info-2
- lilypond-internals.info-3
- lilypond-internals.info-4
- lilypond-internals.info-5
- lilypond-notation.info-1
- lilypond-notation.info-2
- lilypond-notation.info-3
- lilypond-notation.info-4
- lilypond-notation.info-5
- lilypond-notation.info-6
- lilypond-usage.info
- lilypond-learning.info
- lilypond-web.info-1
- lilypond-web.info-2
- lilypond-internals.info
- lilypond-essay.info
- lilypond-notation.info
- lilypond-learning.info-1
- lilypond-learning.info-2
- lilypond-extending.info
- lilypond-changes.info)
-
-post_install() {
- [[ -x usr/bin/install-info ]] || return 0
- for file in "${filelist[@]}"; do
- install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install "$1"
-}
-
-pre_remove() {
- [[ -x usr/bin/install-info ]] || return 0
- for file in "${filelist[@]}"; do
- install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
- done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-testing/lilypond/texlive-workaround.patch b/community-testing/lilypond/texlive-workaround.patch
deleted file mode 100644
index 1eb262863..000000000
--- a/community-testing/lilypond/texlive-workaround.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff --git a/mf/feta-autometric.mf b/mf/feta-autometric.mf
-index d5cbb7f..b25c4bc 100644
---- a/mf/feta-autometric.mf
-+++ b/mf/feta-autometric.mf
-@@ -149,7 +149,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
- & to_bp (w) & " "
- & to_bp (h);
- special "% MF2PT1: font_size " & decimal designsize;
-- special "% MF2PT1: font_slant " & decimal font_slant_;
-
- for fvar = "font_identifier",
- "font_coding_scheme",
-@@ -175,9 +174,6 @@ def set_char_box (expr b_sharp, w_sharp, d_sharp, h_sharp) =
- fi;
- endfor;
-
-- special "% MF2PT1: font_fixed_pitch "
-- & (if font_fixed_pitch_: "1" else: "0" fi);
--
- % this must come after the `font_size' special
- special "% MF2PT1: charwd " & decimal charwd;
- fi;
-diff --git a/mf/mf2pt1.mp b/mf/mf2pt1.mp
-index a8b45aa..c935628 100644
---- a/mf/mf2pt1.mp
-+++ b/mf/mf2pt1.mp
-@@ -61,7 +61,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
- def to_bp (expr num) = decimal (ceiling (num*bp_per_pixel)) enddef;
- special "% MF2PT1: glyph_dimensions 0 " & to_bp (-d) & " " & to_bp(w) & " " & to_bp(h);
- special "% MF2PT1: font_size " & decimal designsize;
-- special "% MF2PT1: font_slant " & decimal font_slant_;
- special "% MF2PT1: charwd " & decimal charwd; % Must come after the |font_size| |special|
- for fvar = "font_identifier", "font_coding_scheme", "font_version",
- "font_comment", "font_family", "font_weight", "font_unique_id",
-@@ -76,8 +75,6 @@ def beginchar(expr c,w_sharp,h_sharp,d_sharp) =
- scantokens ("decimal " & fvar & "_");
- fi;
- endfor;
-- special "% MF2PT1: font_fixed_pitch " &
-- (if font_fixed_pitch_: "1" else: "0" fi);
- enddef;
-
-
-@@ -91,19 +88,6 @@ enddef;
-
-
- %% \begin{explaincode}
--%% Store the value of \mfcomment
--% |font_slant_|, so we can recall it at each |beginchar|.
--%% \end{explaincode}
--
--font_slant_ := 0;
--
--def font_slant expr x =
-- font_slant_ := x;
-- fontdimen 1: x
--enddef;
--
--
--%% \begin{explaincode}
- %% Redefine \mfcomment
- % |bpppix_|, the number of ``big'' points per pixel. \mfcomment
- % This in turn redefines |mm|, |in|, |pt|, and other derived units.
-@@ -141,11 +125,6 @@ forsuffixes fvar = font_underline_position, font_underline_thickness:
- scantokens ("def " & str fvar & " expr x = " & str fvar & "_ := x enddef;");
- endfor;
-
--boolean font_fixed_pitch_;
--font_fixed_pitch_ := false;
--def font_fixed_pitch expr x = font_fixed_pitch_ := x enddef;
--
--
- %% \begin{explaincode}
- %% We'd like to be able to use calligraphic pens. Normally, MetaPost's
- %% output routine does all the work for us of converting these to filled
-diff --git a/scripts/build/mf2pt1.pl b/scripts/build/mf2pt1.pl
-index 95df0f8..20f410b 100644
---- a/scripts/build/mf2pt1.pl
-+++ b/scripts/build/mf2pt1.pl
-@@ -427,7 +427,7 @@ ENDHEADER
- sub get_bboxes ($)
- {
- execute_command 1, ("mpost", "-mem=mf2pt1", "-progname=mpost",
-- "\\mode:=localfont; mag:=$mag; bpppix $bpppix; input $mffile");
-+ "\\mode:=localfont; mag:=$mag; bpppix:=$bpppix; input $mffile");
- opendir (CURDIR, ".") || die "${progname}: $! ($filedir)\n";
- @charfiles = sort
- { ($a=~ /\.(\d+)$/)[0] <=> ($b=~ /\.(\d+)$/)[0] }
diff --git a/community-testing/luminancehdr/PKGBUILD b/community-testing/luminancehdr/PKGBUILD
deleted file mode 100644
index 172a7c279..000000000
--- a/community-testing/luminancehdr/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 60894 2011-12-19 18:08:13Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dmitry N. Shilov <stormblast@land.ru>
-
-pkgname=luminancehdr
-pkgver=2.1.0
-pkgrel=6
-pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging'
-arch=('i686' 'x86_64')
-url='http://qtpfsgui.sourceforge.net/'
-license=('GPL')
-depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit')
-optdepends=('hugin: align image stack functionality')
-install=$pkgname.install
-changelog=$pkgname.changelog
-options=('!emptydirs')
-source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-${pkgver}.tar.gz
- luminance-hdr-2.1.0-libraw.patch)
-sha256sums=('0b0f124ada6da62c379d6e4bd6fd150643115cb46f05c527c29113f475a5eeac'
- 'd3be7458713693382b64a6a1fa766c14bc16be2ff9c5a06567c0e5335581151c')
-
-build() {
- cd "${srcdir}/luminance-hdr-${pkgver}"
-
- # stolen from gentoo
- patch -Np1 -i ../luminance-hdr-2.1.0-libraw.patch
-
- if [ ${CARCH} = i686 ]; then
- sed -i 's/ -msse2//' project.pro
- fi
-
- lrelease project.pro
- qmake PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}/luminance-hdr-${pkgver}"
-
- make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/community-testing/luminancehdr/luminance-hdr-2.1.0-libraw.patch b/community-testing/luminancehdr/luminance-hdr-2.1.0-libraw.patch
deleted file mode 100644
index 8472a7422..000000000
--- a/community-testing/luminancehdr/luminance-hdr-2.1.0-libraw.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp.orig
-+++ luminance-hdr-2.1.0/src/Fileformat/pfsinraw.cpp
-@@ -94,7 +94,6 @@
- RawProcessor.set_progress_handler(cb, callback_data);
- int ret;
-
-- OUT.filtering_mode = LIBRAW_FILTERING_AUTOMATIC;
- OUT.output_bps = 16;
-
- //OUT.gamm[0] = 1/2.4; //sRGB
diff --git a/community-testing/luminancehdr/luminancehdr.changelog b/community-testing/luminancehdr/luminancehdr.changelog
deleted file mode 100644
index 378053ef5..000000000
--- a/community-testing/luminancehdr/luminancehdr.changelog
+++ /dev/null
@@ -1,33 +0,0 @@
-2011-08-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * luminancehdr 2.1.0-1
-
-2011-05-01 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * luminancehdr 2.0.2-1
-
-2010-10-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * exiv2 0.20 rebuild
-
-2010-10-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release 2.0.1
-
-2010-06-27 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Package renamed to LuminanceHDR
- * Update to major release 2.0.0
-
-2010-03-09 Andrea Scarpino <andrea@archlinux.org>
- * exiv2 0.19 rebuild
-
-2009-11-02 Biru Ionut <ionut@archlinux.ro>
- * add translation and fix segfault on old i686 procesors
-
-2009-04-29 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release v1.9.3
-
-2009-04-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Minor version (v1.9.2-3) update caused by exiv2 upgrade.
-
-2008-11-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Minor version (v1.9.2-2) update caused by openexr upgrade.
-
-2008-09-17 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Package moved to [community]
diff --git a/community-testing/luminancehdr/luminancehdr.install b/community-testing/luminancehdr/luminancehdr.install
deleted file mode 100644
index 279762804..000000000
--- a/community-testing/luminancehdr/luminancehdr.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/community-testing/myodbc/PKGBUILD b/community-testing/myodbc/PKGBUILD
deleted file mode 100644
index 7d75a198c..000000000
--- a/community-testing/myodbc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 60924 2011-12-19 18:10:28Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=myodbc
-pkgver=5.1.9
-pkgrel=2
-pkgdesc="ODBC driver/connector for MySQL"
-arch=(i686 x86_64)
-url="http://dev.mysql.com/downloads/connector/odbc/"
-depends=('unixodbc' 'libmysqlclient')
-license=('GPL')
-options=('libtool')
-source=("http://mysql.cce.usp.br/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-${pkgver}.tar.gz"
- myconf.h.in)
-md5sums=('80f146bd384a9011d968aa67df27e68e'
- '6c99c83e309b18d15ef0f07f0b461241')
-
-build() {
- cd $srcdir/mysql-connector-odbc-${pkgver}
- cp $srcdir/myconf.h.in driver/myconf.h.in
- [ -x configure ] || { aclocal; libtoolize; automake --add-missing; autoreconf; }
- [ -f Makefile ] || CFLAGS="$CFLAGS -DTHREAD" \
- ./configure --prefix=/usr --sysconfdir=/etc --with-unixODBC=/usr --with-odbc-ini=/etc/odbc.ini \
- --with-mysql-path=/usr --without-x --disable-gui --disable-test
- make
-}
-
-package() {
- cd $srcdir/mysql-connector-odbc-${pkgver}
- make DESTDIR=$pkgdir install
-}
diff --git a/community-testing/myodbc/myconf.h.in b/community-testing/myodbc/myconf.h.in
deleted file mode 100644
index 2a04eebba..000000000
--- a/community-testing/myodbc/myconf.h.in
+++ /dev/null
@@ -1,165 +0,0 @@
-/* driver/myconf.h.in. Generated from configure.in by autoheader. */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <iodbcinst.h> header file. */
-#undef HAVE_IODBCINST_H
-
-/* Define to 1 if you have the <isqlext.h> header file. */
-#undef HAVE_ISQLEXT_H
-
-/* Define to 1 if you have the <isqltypes.h> header file. */
-#undef HAVE_ISQLTYPES_H
-
-/* Define to 1 if you have the <isql.h> header file. */
-#undef HAVE_ISQL_H
-
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <odbcinst.h> header file. */
-#undef HAVE_ODBCINST_H
-
-/* Define to 1 if you have the <sqlext.h> header file. */
-#undef HAVE_SQLEXT_H
-
-/* Define if SQLGetPrivateProfileString is defined */
-#undef HAVE_SQLGETPRIVATEPROFILESTRING
-
-/* Define to 1 if you have the `SQLGetPrivateProfileStringW' function. */
-#undef HAVE_SQLGETPRIVATEPROFILESTRINGW
-
-/* Define to 1 if you have the <sqltypes.h> header file. */
-#undef HAVE_SQLTYPES_H
-
-/* Define to 1 if you have the <sql.h> header file. */
-#undef HAVE_SQL_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strndup' function. */
-#undef HAVE_STRNDUP
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
- */
-#undef LT_OBJDIR
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define if SQLCHAR is undefined */
-#undef SQLCHAR
-
-/* Define if SQLHDBC is undefined */
-#undef SQLHDBC
-
-/* Define if SQLHENV is undefined */
-#undef SQLHENV
-
-/* Define if SQLHSTMT is undefined */
-#undef SQLHSTMT
-
-/* Define if SQLHWND is undefined */
-#undef SQLHWND
-
-/* Define if SQLINTEGER is undefined */
-#undef SQLINTEGER
-
-/* Define if SQLPOINTER is undefined */
-#undef SQLPOINTER
-
-/* Define if SQLRETURN is undefined */
-#undef SQLRETURN
-
-/* Define if SQLSMALLINT is undefined */
-#undef SQLSMALLINT
-
-/* Define if SQLUINTEGER is undefined */
-#undef SQLUINTEGER
-
-/* Define if SQLUSMALLINT is undefined */
-#undef SQLUSMALLINT
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define path to system ODBC.INI file */
-#undef SYSTEM_ODBC_INI
-
-/* Define if compiler defines C99 __func__ macro */
-#undef USE_C99_FUNC_MACRO
-
-/* Define if compiler defines __FUNCTION__ */
-#undef USE_GNU_FUNC_MACRO
-
-/* use iODBC */
-#undef USE_IODBC
-
-/* Define if SQLColAttribute() last arg is compatible with SQLLEN* */
-#undef USE_SQLCOLATTRIBUTE_SQLLEN_PTR
-
-/* Define if SQLColAttribute() last arg is compatible with SQLPOINTER */
-#undef USE_SQLCOLATTRIBUTE_SQLPOINTER
-
-/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLUINTEGER
- */
-#undef USE_SQLPARAMOPTIONS_SQLUINTEGER_PTR
-
-/* Define if SQLParamOptions() 2nd and 3rd arg is compatible with SQLULEN */
-#undef USE_SQLPARAMOPTIONS_SQLULEN_PTR
-
-/* use unixODBC */
-#undef USE_UNIXODBC
-
-/* Version number of package */
-#undef VERSION
-
-/* Define to 1 if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
-
-/* Define if we are using unix build environment */
-#undef _UNIX_
diff --git a/community-testing/myodbc/myodbc-64bit.patch b/community-testing/myodbc/myodbc-64bit.patch
deleted file mode 100644
index ac62d816a..000000000
--- a/community-testing/myodbc/myodbc-64bit.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-Fix some 64-bitness issues arising from unixODBC 2.2.14 changes.
-
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c
---- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:15:37.516602586 -0500
-@@ -1205,7 +1205,7 @@
- {
- /* See comment for fill_transfer_oct_len_buff()*/
- SQLLEN size= get_display_size(stmt, field);
-- sprintf(buff,size == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), size);
-+ sprintf(buff, (size == SQL_NO_TOTAL ? "%ld" : "%lu"), size);
-
- return size;
- }
-@@ -1228,7 +1228,7 @@
- */
- SQLLEN len= get_transfer_octet_length(stmt, field);
-
-- sprintf(buff, len == SQL_NO_TOTAL ? "%d" : (sizeof(SQLLEN) == 4 ? "%lu" : "%lld"), len );
-+ sprintf(buff, (len == SQL_NO_TOTAL ? "%ld" : "%lu"), len );
-
- return len;
- }
-@@ -1245,8 +1245,7 @@
- SQLULEN fill_column_size_buff(char *buff, STMT *stmt, MYSQL_FIELD *field)
- {
- SQLULEN size= get_column_size(stmt, field);
-- sprintf(buff, (size== SQL_NO_TOTAL ? "%d" :
-- (sizeof(SQLULEN) == 4 ? "%lu" : "%llu")), size);
-+ sprintf(buff, (size== SQL_NO_TOTAL ? "%ld" : "%lu"), size);
- return size;
- }
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_catalog.c mysql-connector-odbc-5.1.8/test/my_catalog.c
---- mysql-connector-odbc-5.1.8.orig/test/my_catalog.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/test/my_catalog.c 2010-12-23 17:16:26.284605944 -0500
-@@ -599,7 +599,7 @@
- fprintf(stdout, "# Column Name : %s\n", szColName);
- fprintf(stdout, "# NameLengh : %d\n", pcbColName);
- fprintf(stdout, "# DataType : %d\n", pfSqlType);
-- fprintf(stdout, "# ColumnSize : %d\n", pcbColDef);
-+ fprintf(stdout, "# ColumnSize : %ld\n", pcbColDef);
- fprintf(stdout, "# DecimalDigits : %d\n", pibScale);
- fprintf(stdout, "# Nullable : %d\n", pfNullable);
-
-@@ -632,7 +632,7 @@
-
- rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, sizeof(db), &len);
- mycon(hdbc,rc);
-- fprintf(stdout,"current_catalog: %s (%ld)\n", db, len);
-+ fprintf(stdout,"current_catalog: %s (%d)\n", db, len);
- is_num(len, 4);
- is_str(db, "test", 5);
-
-@@ -653,7 +653,7 @@
-
- rc = SQLGetConnectAttr(hdbc, SQL_ATTR_CURRENT_CATALOG, db, 255, &len);
- mycon(hdbc,rc);
-- fprintf(stdout,"current_catalog: %s (%ld)\n", db, len);
-+ fprintf(stdout,"current_catalog: %s (%d)\n", db, len);
- is_num(len, 17);
- is_str(db, cur_db, 18);
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/test/my_cursor.c mysql-connector-odbc-5.1.8/test/my_cursor.c
---- mysql-connector-odbc-5.1.8.orig/test/my_cursor.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/test/my_cursor.c 2010-12-23 17:12:16.632676933 -0500
-@@ -711,7 +711,7 @@
-
- rc = SQLRowCount(hstmt1,&row_count);
- mystmt(hstmt1,rc);
-- fprintf(stdout, "rows affected: %d\n", row_count);
-+ fprintf(stdout, "rows affected: %ld\n", row_count);
- myassert(row_count == 1);
-
- rc = SQLExtendedFetch(hstmt,SQL_FETCH_NEXT,1,NULL,&rgfRowStatus);
-@@ -732,7 +732,7 @@
-
- rc = SQLRowCount(hstmt1,&row_count);
- mystmt(hstmt1,rc);
-- fprintf(stdout, "rows affected: %d\n", row_count);
-+ fprintf(stdout, "rows affected: %ld\n", row_count);
- myassert(row_count == 1);
-
- SQLFreeStmt(hstmt,SQL_UNBIND);
diff --git a/community-testing/myodbc/myodbc-add-mysys.patch b/community-testing/myodbc/myodbc-add-mysys.patch
deleted file mode 100644
index a30466114..000000000
--- a/community-testing/myodbc/myodbc-add-mysys.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Add files extracted from mysql into the driver build script.
-
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/util/Makefile.am mysql-connector-odbc-5.1.8/util/Makefile.am
---- mysql-connector-odbc-5.1.8.orig/util/Makefile.am 2010-10-28 14:33:17.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/util/Makefile.am 2010-12-23 18:09:00.359695597 -0500
-@@ -10,6 +10,22 @@
- installer.c \
- odbcinstw.c \
- unicode_transcode.c \
-+ array.c \
-+ list.c \
-+ my_alloc.c \
-+ my_malloc.c \
-+ string.c \
-+ int2str.c \
-+ is_prefix.c \
-+ longlong2str.c \
-+ strcend.c \
-+ strend.c \
-+ strfill.c \
-+ strmake.c \
-+ strmov.c \
-+ strxmov.c \
-+ mysys_err.h \
-+ mysys_priv.h \
- MYODBCUtil.h \
- MYODBCUtilAllocDataSource.c \
- MYODBCUtilAllocDriver.c \
diff --git a/community-testing/myodbc/myodbc-my-free.patch b/community-testing/myodbc/myodbc-my-free.patch
deleted file mode 100644
index cf7730a59..000000000
--- a/community-testing/myodbc/myodbc-my-free.patch
+++ /dev/null
@@ -1,253 +0,0 @@
-Once again, mysql can't manage to ship a mysql-connector-odbc release
-on time ... mysql 5.5 changed the my_free() function and the released
-connector version is not up to speed. Can't use NEAR anymore, either.
-
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog.c mysql-connector-odbc-5.1.8/driver/catalog.c
---- mysql-connector-odbc-5.1.8.orig/driver/catalog.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/catalog.c 2010-12-23 17:50:52.916552525 -0500
-@@ -94,11 +94,11 @@
- {
- if (stmt->result)
- {
-- my_free((char *)stmt->result, MYF(0));
-+ my_free((char *)stmt->result);
- }
- if (stmt->result_array)
- {
-- my_free((char *)stmt->result_array, MYF(0));
-+ my_free((char *)stmt->result_array);
- }
- set_mem_error(&stmt->dbc->mysql);
- return handle_connection_error(stmt);
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c
---- mysql-connector-odbc-5.1.8.orig/driver/catalog_no_i_s.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/catalog_no_i_s.c 2010-12-23 17:51:41.493551970 -0500
-@@ -269,13 +269,13 @@
- pthread_mutex_lock(&dbc->lock);
- if (mysql_query(mysql, select))
- {
-- my_free(select, MYF(0));
-+ my_free(select);
- pthread_mutex_unlock(&dbc->lock);
- return NULL;
- }
- result= mysql_store_result(&dbc->mysql);
- pthread_mutex_unlock(&dbc->lock);
-- my_free(select, MYF(0));
-+ my_free(select);
-
- return result;
- }
-@@ -1094,7 +1094,7 @@
- SQLFORE_KEYS_FIELDS *
- row_count,
- MYF(0));
-- my_free((char *)tempdata, MYF(0));
-+ my_free((char *)tempdata);
-
- if (!stmt->result_array)
- {
-@@ -1323,12 +1323,12 @@
- && (j != mypcREMARKS)
- && (j != mypcCOLUMN_DEF)
- && (j != mypcIS_NULLABLE))
-- my_free(((char**)cur_params->data)[j], MYF(0));
-+ my_free(((char**)cur_params->data)[j]);
- }
- /* cleanup the list */
- params= list_delete_forward(params);
-- my_free(cur_params->data, MYF(0));
-- my_free(cur_params, MYF(0));
-+ my_free(cur_params->data);
-+ my_free(cur_params);
- }
- }
- }
-@@ -1675,7 +1675,7 @@
- }
-
- dynstr_free(&dynQuery);
-- my_free(params_r, MYF(0));
-+ my_free(params_r);
-
- return nReturn;
- }
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/desc.c mysql-connector-odbc-5.1.8/driver/desc.c
---- mysql-connector-odbc-5.1.8.orig/driver/desc.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/desc.c 2010-12-23 17:51:06.532607921 -0500
-@@ -65,7 +65,7 @@
- */
- if (my_init_dynamic_array(&desc->records, sizeof(DESCREC), 0, 0))
- {
-- my_free((char *)desc, MYF(0));
-+ my_free((char *)desc);
- return NULL;
- }
- desc->desc_type= desc_type;
-@@ -111,7 +111,7 @@
- if (aprec->par.alloced)
- {
- aprec->par.alloced= FALSE;
-- my_free(aprec->par.value, MYF(0));
-+ my_free(aprec->par.value);
- }
- }
- }
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/driver.h mysql-connector-odbc-5.1.8/driver/driver.h
---- mysql-connector-odbc-5.1.8.orig/driver/driver.h 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/driver.h 2010-12-23 17:50:43.017608761 -0500
-@@ -113,7 +113,7 @@
- /* Max Primary keys in a cursor * WHERE clause */
- #define MY_MAX_PK_PARTS 32
-
--#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); }
-+#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); }
-
-
- /* We don't make any assumption about what the default may be. */
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/execute.c mysql-connector-odbc-5.1.8/driver/execute.c
---- mysql-connector-odbc-5.1.8.orig/driver/execute.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/execute.c 2010-12-23 17:49:52.799552481 -0500
-@@ -96,7 +96,7 @@
- exit:
- pthread_mutex_unlock(&stmt->dbc->lock);
- if ( query != stmt->query )
-- my_free(query,MYF(0));
-+ my_free(query);
-
- /*
- If the original query was modified, we reset stmt->query so that the
-@@ -104,7 +104,7 @@
- */
- if (stmt->orig_query)
- {
-- my_free(stmt->query,MYF(0));
-+ my_free(stmt->query);
- stmt->query= stmt->orig_query;
- stmt->query_end= stmt->orig_query_end;
- stmt->orig_query= NULL;
-@@ -625,7 +625,7 @@
-
- out:
- if (free_data)
-- my_free(data, MYF(0));
-+ my_free(data);
-
- *toptr= to;
- return SQL_SUCCESS;
-@@ -1060,7 +1060,7 @@
- if ( cbValue == SQL_NULL_DATA )
- {
- if ( aprec->par.alloced )
-- my_free(aprec->par.value,MYF(0));
-+ my_free(aprec->par.value);
- aprec->par.alloced= FALSE;
- aprec->par.value= NULL;
- return SQL_SUCCESS;
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/handle.c mysql-connector-odbc-5.1.8/driver/handle.c
---- mysql-connector-odbc-5.1.8.orig/driver/handle.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/handle.c 2010-12-23 17:50:17.425586339 -0500
-@@ -112,7 +112,7 @@
- GlobalUnlock(GlobalHandle((HGLOBAL) henv));
- GlobalFree(GlobalHandle((HGLOBAL) henv));
- #else
-- if (henv) my_free((char*) henv,MYF(0));
-+ if (henv) my_free((char*) henv);
- myodbc_end();
- #endif /* _UNIX_ */
- return(SQL_SUCCESS);
-@@ -251,7 +251,8 @@
- LIST *next;
-
- dbc->env->connections= list_delete(dbc->env->connections,&dbc->list);
-- my_free(dbc->database,MYF(MY_ALLOW_ZERO_PTR));
-+ if (dbc->database)
-+ my_free(dbc->database);
- if (dbc->ds)
- ds_delete(dbc->ds);
- pthread_mutex_destroy(&dbc->lock);
-@@ -268,7 +269,7 @@
- GlobalUnlock(GlobalHandle((HGLOBAL) hdbc));
- GlobalFree(GlobalHandle((HGLOBAL) hdbc));
- #else
-- my_free((char*) hdbc,MYF(0));
-+ my_free((char*) hdbc);
- #endif
- return SQL_SUCCESS;
- }
-@@ -513,7 +514,7 @@
- GlobalUnlock(GlobalHandle ((HGLOBAL) hstmt));
- GlobalFree(GlobalHandle((HGLOBAL) hstmt));
- #else
-- my_free((char*) hstmt,MYF(0));
-+ my_free((char*) hstmt);
- #endif /* _UNIX_*/
- return SQL_SUCCESS;
- }
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/options.c mysql-connector-odbc-5.1.8/driver/options.c
---- mysql-connector-odbc-5.1.8.orig/driver/options.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/options.c 2010-12-23 17:50:28.864604596 -0500
-@@ -301,7 +301,7 @@
- return SQL_ERROR;
- }
- }
-- my_free(dbc->database,MYF(0));
-+ my_free(dbc->database);
- dbc->database= my_strdup(db,MYF(MY_WME));
- pthread_mutex_unlock(&dbc->lock);
- }
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/prepare.c mysql-connector-odbc-5.1.8/driver/prepare.c
---- mysql-connector-odbc-5.1.8.orig/driver/prepare.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/prepare.c 2010-12-23 17:51:17.175676805 -0500
-@@ -93,7 +93,7 @@
- CLEAR_STMT_ERROR(stmt);
-
- if (stmt->query)
-- my_free(stmt->query, MYF(0));
-+ my_free(stmt->query);
-
- if (dupe && szSqlStr)
- stmt->query= (char *)szSqlStr;
-@@ -223,7 +223,7 @@
- {
- aprec->par.alloced= FALSE;
- assert(aprec->par.value);
-- my_free(aprec->par.value,MYF(0));
-+ my_free(aprec->par.value);
- aprec->par.value = NULL;
- }
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/utility.c mysql-connector-odbc-5.1.8/driver/utility.c
---- mysql-connector-odbc-5.1.8.orig/driver/utility.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/utility.c 2010-12-23 17:49:05.498552376 -0500
-@@ -930,7 +930,7 @@
- ulong max_length= stmt->stmt_options.max_length;
- ulong *offset= &stmt->getdata.src_offset;
- #if MYSQL_VERSION_ID >= 40100
-- char NEAR _dig_vec[] =
-+ char _dig_vec[] =
- "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
- #endif
-
-@@ -2154,7 +2154,7 @@
-
- my_bool reget_current_catalog(DBC FAR *dbc)
- {
-- my_free(dbc->database,MYF(0));
-+ my_free(dbc->database);
- dbc->database= NULL;
-
- if ( odbc_stmt(dbc, "select database()") )
-diff -Naur mysql-connector-odbc-5.1.8.orig/util/stringutil.h mysql-connector-odbc-5.1.8/util/stringutil.h
---- mysql-connector-odbc-5.1.8.orig/util/stringutil.h 2010-10-28 14:33:17.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/util/stringutil.h 2010-12-23 17:51:51.848676475 -0500
-@@ -41,7 +41,7 @@
- #include <sqlext.h>
-
- #ifndef x_free
--#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp,MYF(MY_WME+MY_FAE)); }
-+#define x_free(A) { void *tmp= (A); if (tmp) my_free((char *) tmp); }
- #endif
-
- #define myodbc_min(a, b) ((a) < (b) ? (a) : (b))
diff --git a/community-testing/myodbc/myodbc-shutdown.patch b/community-testing/myodbc/myodbc-shutdown.patch
deleted file mode 100644
index ec0cf3d36..000000000
--- a/community-testing/myodbc/myodbc-shutdown.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-myodbc_end is really only usable during Windows DLL unload, since it's not
-connection-specific and not thread-safe either. This bit of brain fade
-accounts for our bug #185343 and several bugs filed at mysql.com.
-
-Furthermore, my_end() isn't exported from libmysqlclient anymore.
-Hence, best fix is to turn the function into a no-op.
-
-
-diff -Naur mysql-connector-odbc-5.1.8.orig/driver/dll.c mysql-connector-odbc-5.1.8/driver/dll.c
---- mysql-connector-odbc-5.1.8.orig/driver/dll.c 2010-10-28 14:33:18.000000000 -0400
-+++ mysql-connector-odbc-5.1.8/driver/dll.c 2010-12-23 15:05:49.394608226 -0500
-@@ -94,6 +94,7 @@
- */
- void myodbc_end()
- {
-+#if 0
- if (!--myodbc_inited)
- {
- my_free(decimal_point,MYF(0));
-@@ -121,6 +122,7 @@
- my_end(0);
- #endif
- }
-+#endif
- }
-
-
diff --git a/community-testing/mythtv/PKGBUILD b/community-testing/mythtv/PKGBUILD
deleted file mode 100644
index 25b7d684d..000000000
--- a/community-testing/mythtv/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 60896 2011-12-19 18:08:28Z andrea $
-# Maintainer: Jonathan Conder <jonno.conder@gmail.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: <kleptophobiac@gmail.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=mythtv
-pkgver=0.24.1
-pkgrel=4
-epoch=1
-pkgdesc="A Homebrew PVR project"
-arch=('i686' 'x86_64')
-url="http://www.mythtv.org/"
-license=('GPL')
-depends=('lame' 'libavc1394' 'libiec61883' 'libpulse' 'libvdpau' 'libxinerama'
- 'libxvmc' 'libxxf86vm' 'lirc-utils' 'mesa' 'mysql-clients'
- 'mysql-python' 'perl-dbd-mysql' 'perl-libwww' 'perl-net-upnp'
- 'python-lxml' 'wget' 'qtwebkit')
-makedepends=('yasm')
-optdepends=('xmltv: to download tv listings')
-backup=('etc/conf.d/mythbackend')
-install='mythtv.install'
-source=("ftp://ftp.osuosl.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2"
- 'mythbackend.rc'
- 'mythbackend.conf'
- 'mythtv-v4l2-fix.patch'
- 'build.patch')
-md5sums=('6870c679619ec58456e76839745411d8'
- 'feadcc9ad064d93d6dceab1efc0bd9ed'
- 'bb8e4033d82428d827570fae9ba15e6a'
- 'ba5c91df80f0d3f7563a873e71a3725c'
- '3188962917e98c4e07818dccd64bc423')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- find 'bindings/python' 'contrib' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
-
- patch -Np2 -i ${srcdir}/mythtv-v4l2-fix.patch
- patch -Np1 -i ${srcdir}/build.patch
-
- ARCH="${CARCH/_/-}"
- ./configure --prefix=/usr --cpu="$ARCH" \
- --enable-mmx \
- --enable-audio-oss \
- --enable-audio-alsa \
- --disable-audio-jack \
- --enable-audio-pulse \
- --disable-altivec \
- --disable-distcc \
- --disable-ccache \
- --enable-vdpau \
- --enable-dvb \
- --dvb-path=/usr/include \
- --enable-lirc \
- --enable-joystick-menu \
- --enable-v4l \
- --enable-ivtv \
- --enable-xvmc \
- --enable-xvmcw \
- --enable-xvmc-vld \
- --enable-firewire \
- --enable-opengl-vsync \
- --enable-xrandr \
- --enable-xv \
- --enable-x11 \
- --with-bindings=perl,python \
- --python=python2
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make INSTALL_ROOT="$pkgdir" install
-
- install -D -m755 "$srcdir/mythbackend.rc" "$pkgdir/etc/rc.d/mythbackend"
- install -D -m644 "$srcdir/mythbackend.conf" "$pkgdir/etc/conf.d/mythbackend"
- install -D -m644 'database/mc.sql' "$pkgdir/usr/share/mythtv/mc.sql"
-
- mkdir -p "$pkgdir/usr/share/mythtv"
- cp -R 'contrib' "$pkgdir/usr/share/mythtv"
-}
diff --git a/community-testing/mythtv/build.patch b/community-testing/mythtv/build.patch
deleted file mode 100644
index 35dccd618..000000000
--- a/community-testing/mythtv/build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nru a/libs/libmythui/mythrender_opengl.cpp b/libs/libmythui/mythrender_opengl.cpp
---- a/libs/libmythui/mythrender_opengl.cpp 2011-05-16 08:57:52.000000000 +1200
-+++ b/libs/libmythui/mythrender_opengl.cpp 2011-10-23 15:05:33.178392264 +1300
-@@ -2,6 +2,8 @@
- #include "mythrender_opengl.h"
- #include "mythxdisplay.h"
-
-+#include <GL/glu.h>
-+
- #define LOC QString("OpenGL: ")
- #define LOC_ERR QString("OpenGL Error: ")
-
-Binary files a/libs/libmythui/.mythrender_opengl.cpp.swp and b/libs/libmythui/.mythrender_opengl.cpp.swp differ
diff --git a/community-testing/mythtv/mythbackend.conf b/community-testing/mythtv/mythbackend.conf
deleted file mode 100644
index e004ae5bd..000000000
--- a/community-testing/mythtv/mythbackend.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-#
-# Rename this file to:
-#
-# /etc/config.d/mythbackend
-#
-###############################################################################
-#
-# Copyright (c) by the MythTV Development Team.
-#
-# Derived from work by:
-#
-# Michael Thomson <linux at m-thomson dot net>
-# Stu Tomlinson <stu at nosnilmot dot com>
-# Axel Thimm <axel.thimm at atrpms dot net>
-# Adopted for ArchLinux:
-# Jürgen Hoetzel <juergen@archinux.org>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-###############################################################################
-#
-# Config variables for the mythbackend startup script, which is usually
-# located in /etc/rc.d/mythbackend
-#
-# When the startup script is executed, it sources this file if it exists,
-# otherwise it will fall back on default values.
-#
-# Leave variables commented out to use default values in init script
-# (/etc/rc.d/mythbackend).
-#
-# To override defaults, uncomment the relevant variable definition and
-# edit as required.
-#
-
-#
-# User who should start the mythbackend processes
-#
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# MBE_USER='root'
-
-#
-# Directory holding the mythbackend binary (empty means autodetect).
-#
-# MBE_DIR=''
-
-#
-# Name of mythbackend binary.
-#
-# MBE_PROG='mythbackend'
-
-#
-# Other startup options for mythbackend (see 'mythbackend --help' for a list).
-#
-# MBE_OPTIONS=''
-
-#
-# Directory holding the mythbackend log file
-#
-# LOG_DIR='/var/log/mythtv'
-
-#
-# Name of mythbackend log file.
-#
-# NOTE: If you are running as non-root take care to ensure the mythbackend user
-# has permission to write to this log file.
-#
-# LOG_FILE='mythbackend.log'
-
-#
-# Logging options for mythbackend (see 'mythbackend -v help' for a list)
-#
-# LOG_OPTS=''
diff --git a/community-testing/mythtv/mythbackend.rc b/community-testing/mythtv/mythbackend.rc
deleted file mode 100644
index 410e8de41..000000000
--- a/community-testing/mythtv/mythbackend.rc
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-# Default values to use if none are supplied in the config file.
-
-# Running mythbackend as non-root requires you to ensure that audio/video
-# devices used for recording have suitable user permissions. One way
-# to achieve this is to modify existing or create new udev rules which
-# assign these devices to a non-root group with rw permissions and add
-# your mythbackend user to that group. Be aware that console.perms can
-# also affect device permissions and may need additional configuration.
-# Running as non-root may also introduce increased process latency.
-#
-# User who should start the mythbackend processes
-MBE_USER='root'
-
-# Startup options for mythbackend
-MBE_OPTIONS=''
-
-# Name of mythbackend log file
-LOG_FILE='/var/log/mythbackend.log'
-
-# Logging options for mythbackend (empty means '-v important,general')
-LOG_OPTS=''
-
-###############################################################################
-
-CONFIG_FILE=/etc/conf.d/mythbackend
-PIDFILE=/var/run/mythbackend.pid
-
-if [[ -f ${CONFIG_FILE} ]]; then
- . ${CONFIG_FILE}
-fi
-
-pid="$(cat ${PIDFILE} 2>/dev/null || pidof mythbackend)";
-
-# fix FS#11890
-mbe_user_home="$(getent passwd ${MBE_USER}|cut -d : -f 6)"
-
-case "$1" in
- start)
- stat_busy "Starting MythTV Backend"
-
- # already running ?
- if [[ "${pid}" -gt 0 ]] && kill -0 "${pid}"; then
- stat_fail
- exit 1;
- fi
- touch ${PIDFILE} ${LOG_FILE}
- chown "$MBE_USER" ${PIDFILE} ${LOG_FILE}
- if su "$MBE_USER" -c "HOME=${mbe_user_home} mythbackend \
- --daemon \
- --logfile $LOG_FILE $LOG_OPTS \
- --pidfile ${PIDFILE} $MBE_OPTIONS";
- then
- add_daemon mythbackend
- stat_done
- else
- stat_fail
- fi
- ;;
-
- stop)
- stat_busy "Stopping MythTV Backend"
- if [[ "${pid}" -gt 0 ]] && kill $pid &>/dev/null; then
- rm_daemon mythbackend
- stat_done
- rm ${PIDFILE} 2>/dev/null
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/mythtv/mythtv-v4l2-fix.patch b/community-testing/mythtv/mythtv-v4l2-fix.patch
deleted file mode 100644
index e26e16615..000000000
--- a/community-testing/mythtv/mythtv-v4l2-fix.patch
+++ /dev/null
@@ -1,724 +0,0 @@
-diff --git a/mythtv/configure b/mythtv/configure
-index 1efe803..7bcdf06 100755
---- a/mythtv/configure
-+++ b/mythtv/configure
-@@ -109,7 +109,8 @@ Advanced options (experts only):
- --disable-iptv disable support for recording RTSP/UDP/RTP streams
- --disable-hdhomerun disable support for HDHomeRun boxes
- --disable-v4l disable Video4Linux support
-- --disable-ivtv disable ivtv support (PVR-x50) req. v4l support
-+ --disable-v4l2 disable Video4Linux2 support
-+ --disable-ivtv disable ivtv support (PVR-x50) req. v4l2 support
- --disable-hdpvr disable HD-PVR support
- --disable-dvb disable DVB support
- --dvb-path=HDRLOC location of directory containing
-@@ -1315,6 +1316,7 @@ MYTHTV_CONFIG_LIST='
- qtwebkit
- quartz_video
- v4l
-+ v4l2
- valgrind
- x11
- xrandr
-@@ -1706,8 +1708,8 @@ audio_oss_deps_any="soundcard_h sys_soundcard_h"
- dvb_deps="backend"
- firewire_deps="backend"
- iptv_deps="backend"
--ivtv_deps="backend v4l"
--hdpvr_deps="backend v4l"
-+ivtv_deps="backend v4l2"
-+hdpvr_deps="backend v4l2"
- hdhomerun_deps="backend"
- mpegtsraw_demuxer_deps="merge_libavformat_mpegts_c"
- mythtranscode_deps="backend frontend"
-@@ -1715,6 +1717,7 @@ opengl_deps_any="agl_h GL_gl_h darwin windows x11"
- opengl_video_deps="opengl"
- opengl_vsync_deps="opengl"
- v4l_deps="backend linux_videodev_h linux_videodev2_h"
-+v4l2_deps="backend linux_videodev2_h"
- vdpau_deps="opengl vdpau_vdpau_h vdpau_vdpau_x11_h"
- xrandr_deps="x11"
- xv_deps="x11"
-@@ -1933,6 +1936,7 @@ enable opengl_vsync
- enable opengl_video
- enable quartz_video
- enable v4l
-+enable v4l2
- enable x11
- enable xrandr
- enable xv
-@@ -3062,6 +3066,7 @@ EOF
- fi
- disable opengl_vsync
- disable v4l
-+ disable v4l2
- disable x11
- # Workaround compile errors from missing gmtime_r/localtime_r/uint def
- CFLAGS=`echo $CFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
-@@ -3106,6 +3111,7 @@ EOF
- fi
- disable symver
- disable v4l
-+ disable v4l2
- enable windows
- disable x11
- ###### Standard ffmpeg configure stuff follows:
-@@ -4375,6 +4381,7 @@ enabled stripping || strip="echo skipping strip"
-
- if enabled backend; then
- echo "Video4Linux sup. ${v4l-no}"
-+ echo "Video4Linux2 sup. ${v4l2-no}"
- echo "ivtv support ${ivtv-no}"
- echo "HD-PVR support ${hdpvr-no}"
- echo "FireWire support ${firewire-no}"
-diff --git a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-index 739634d..39e5956 100644
---- a/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-+++ b/mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
-@@ -42,9 +42,13 @@ extern "C" {
- #include "libswscale/swscale.h"
- }
-
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
-
- #include "go7007_myth.h"
-
-@@ -55,9 +59,9 @@ extern "C" {
- extern "C" {
- #include "vbitext/vbi.h"
- }
--#else // USING_V4l
-+#else // USING_V4L || USING_V4L2
- #define VT_WIDTH 0
--#endif // USING_V4l
-+#endif // USING_V4l || USING_V4L2
-
- #define KEYFRAMEDIST 30
-
-@@ -1019,7 +1023,7 @@ bool NuppelVideoRecorder::Open(void)
-
- void NuppelVideoRecorder::ProbeV4L2(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- usingv4l2 = true;
-
- struct v4l2_capability vcap;
-@@ -1049,7 +1053,7 @@ void NuppelVideoRecorder::ProbeV4L2(void)
- QString driver = (char *)vcap.driver;
- if (driver == "go7007")
- go7007 = true;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
-
- void NuppelVideoRecorder::StartRecording(void)
-@@ -2460,7 +2464,7 @@ void NuppelVideoRecorder::doAudioThread(void)
- audio_device->Close();
- }
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- struct VBIData
- {
- NuppelVideoRecorder *nvr;
-@@ -2634,9 +2638,9 @@ void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata)
- act_text_buffer = 0;
- textbuffer[act]->freeToEncode = 1;
- }
--#else // USING_V4L
-+#else // USING_V4L || USING_V4L2
- void NuppelVideoRecorder::FormatTeletextSubtitles(struct VBIData *vbidata) {}
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- void NuppelVideoRecorder::FormatCC(struct cc *cc)
- {
-@@ -2863,7 +2867,7 @@ void NuppelVideoRecorder::doVbiThread(void)
- //VERBOSE(VB_RECORD, LOC + "vbi end");
- }
-
--#else // USING_V4L
-+#else // USING_V4L
- void NuppelVideoRecorder::doVbiThread(void) { }
- #endif // USING_V4L
-
-diff --git a/mythtv/libs/libmythtv/analogsignalmonitor.cpp b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-index 2a4f4c5..fa5823a 100644
---- a/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/analogsignalmonitor.cpp
-@@ -6,7 +6,9 @@
- #include <sys/ioctl.h>
- #include <poll.h>
-
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-
- #include "mythverbose.h"
- #include "analogsignalmonitor.h"
-@@ -151,6 +153,7 @@ void AnalogSignalMonitor::UpdateValues(void)
- }
- else
- {
-+#ifdef USING_V4L
- struct video_tuner tuner;
- bzero(&tuner, sizeof(tuner));
-
-@@ -163,6 +166,7 @@ void AnalogSignalMonitor::UpdateValues(void)
- {
- isLocked = tuner.signal;
- }
-+#endif
- }
-
- {
-diff --git a/mythtv/libs/libmythtv/cardutil.cpp b/mythtv/libs/libmythtv/cardutil.cpp
-index 8852682..494f48a 100644
---- a/mythtv/libs/libmythtv/cardutil.cpp
-+++ b/mythtv/libs/libmythtv/cardutil.cpp
-@@ -4,7 +4,7 @@
-
- #include <algorithm>
-
--#if defined(USING_V4L) || defined(USING_DVB)
-+#if defined(USING_V4L) || defined(USING_V4L2) || defined(USING_DVB)
- #include <sys/ioctl.h>
- #endif
-
-@@ -28,6 +28,8 @@
-
- #ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
-
-@@ -1455,15 +1457,15 @@ uint CardUtil::GetQuickTuning(uint cardid, const QString &input_name)
- bool CardUtil::hasV4L2(int videofd)
- {
- (void) videofd;
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- struct v4l2_capability vcap;
- bzero(&vcap, sizeof(vcap));
-
- return ((ioctl(videofd, VIDIOC_QUERYCAP, &vcap) >= 0) &&
- (vcap.capabilities & V4L2_CAP_VIDEO_CAPTURE));
--#else // if !USING_V4L
-+#else // if !USING_V4L2
- return false;
--#endif // !USING_V4L
-+#endif // !USING_V4L2
- }
-
- bool CardUtil::GetV4LInfo(
-@@ -1475,7 +1477,7 @@ bool CardUtil::GetV4LInfo(
- if (videofd < 0)
- return false;
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- // First try V4L2 query
- struct v4l2_capability capability;
- bzero(&capability, sizeof(struct v4l2_capability));
-@@ -1487,11 +1489,13 @@ bool CardUtil::GetV4LInfo(
- }
- else // Fallback to V4L1 query
- {
-+#ifdef USING_V4L
- struct video_capability capability;
- if (ioctl(videofd, VIDIOCGCAP, &capability) >= 0)
- card = QString::fromAscii((const char*)capability.name);
-+#endif //USING_V4L
- }
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
-
- if (!driver.isEmpty())
- driver.remove( QRegExp("\\[[0-9]\\]$") );
-@@ -1506,9 +1510,9 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
- InputNames list;
- ok = false;
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- bool usingv4l2 = hasV4L2(videofd);
--
-+#ifdef USING_V4L2
- // V4L v2 query
- struct v4l2_input vin;
- bzero(&vin, sizeof(vin));
-@@ -1523,8 +1527,10 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
- ok = true;
- return list;
- }
-+#endif
-
- // V4L v1 query
-+#ifdef USING_V4L
- struct video_capability vidcap;
- bzero(&vidcap, sizeof(vidcap));
- if (ioctl(videofd, VIDIOCGCAP, &vidcap) != 0)
-@@ -1552,15 +1558,15 @@ InputNames CardUtil::ProbeV4LVideoInputs(int videofd, bool &ok)
-
- list[i] = test.name;
- }
--
-+#endif
- // Create an input on single input cards that don't advertise input
- if (!list.size())
- list[0] = "Television";
-
- ok = true;
--#else // if !USING_V4L
-+#else // if !USING_V4L || USING_V4L2
- list[-1] += QObject::tr("ERROR, Compile with V4L support to query inputs");
--#endif // !USING_V4L
-+#endif // !USING_V4L || USING_V4L2
- return list;
- }
-
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-index 832d0a8..e35b186 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscan_sm.cpp
-@@ -1394,7 +1394,7 @@ const DVBChannel *ChannelScanSM::GetDVBChannel(void) const
-
- V4LChannel *ChannelScanSM::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- return dynamic_cast<V4LChannel*>(channel);
- #else
- return NULL;
-diff --git a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-index 1595d6a..4d2b2cf 100644
---- a/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/channelscanner.cpp
-@@ -342,7 +342,7 @@ void ChannelScanner::PreScanCommon(
- channel = new DVBChannel(device);
- #endif
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- if (("V4L" == card_type) || ("MPEG" == card_type))
- channel = new V4LChannel(NULL, device);
- #endif
-diff --git a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-index 00fd9d3..70e3469 100644
---- a/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-+++ b/mythtv/libs/libmythtv/channelscan/scanwizardconfig.cpp
-@@ -27,14 +27,14 @@ static QString card_types(void)
- cardTypes += "'DVB'";
- #endif // USING_DVB
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- if (!cardTypes.isEmpty())
- cardTypes += ",";
- cardTypes += "'V4L'";
- # ifdef USING_IVTV
- cardTypes += ",'MPEG'";
- # endif // USING_IVTV
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_IPTV
- if (!cardTypes.isEmpty())
-diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
-index 3d26e0a..ea06ee7 100644
---- a/mythtv/libs/libmythtv/libmythtv.pro
-+++ b/mythtv/libs/libmythtv/libmythtv.pro
-@@ -119,7 +119,7 @@ cygwin:DEFINES += _WIN32
- using_valgrind:DEFINES += USING_VALGRIND
-
- # old libvbitext (Caption decoder)
--using_v4l {
-+using_v4l || using_v4l2 {
- HEADERS += vbitext/cc.h vbitext/dllist.h vbitext/hamm.h vbitext/lang.h
- HEADERS += vbitext/vbi.h vbitext/vt.h
- SOURCES += vbitext/cc.cpp vbitext/vbi.c vbitext/hamm.c vbitext/lang.c
-@@ -471,11 +471,17 @@ using_backend {
- SOURCES += channelchangemonitor.cpp
-
- # Support for Video4Linux devices
-- using_v4l {
-+ using_v4l || using_v4l2 {
- HEADERS += v4lchannel.h analogsignalmonitor.h
- SOURCES += v4lchannel.cpp analogsignalmonitor.cpp
-
-- DEFINES += USING_V4L
-+ using_v4l {
-+ DEFINES += USING_V4L
-+ }
-+
-+ using_v4l2 {
-+ DEFINES += USING_V4L2
-+ }
- }
-
- # Support for cable boxes that provide Firewire out
-diff --git a/mythtv/libs/libmythtv/signalmonitor.cpp b/mythtv/libs/libmythtv/signalmonitor.cpp
-index 221efef..c199b3b 100644
---- a/mythtv/libs/libmythtv/signalmonitor.cpp
-+++ b/mythtv/libs/libmythtv/signalmonitor.cpp
-@@ -23,7 +23,7 @@ extern "C" {
- # include "dvbchannel.h"
- #endif
-
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- # include "analogsignalmonitor.h"
- # include "v4lchannel.h"
- #endif
-@@ -95,7 +95,7 @@ SignalMonitor *SignalMonitor::Init(QString cardtype, int db_cardnum,
- }
- #endif
-
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- if ((cardtype.toUpper() == "HDPVR"))
- {
- V4LChannel *chan = dynamic_cast<V4LChannel*>(channel);
-diff --git a/mythtv/libs/libmythtv/tv_rec.cpp b/mythtv/libs/libmythtv/tv_rec.cpp
-index b885eaa..3d9c7ad 100644
---- a/mythtv/libs/libmythtv/tv_rec.cpp
-+++ b/mythtv/libs/libmythtv/tv_rec.cpp
-@@ -57,7 +57,7 @@ using namespace std;
-
- #include "channelgroup.h"
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- #include "v4lchannel.h"
- #endif
-
-@@ -206,7 +206,7 @@ bool TVRec::CreateChannel(const QString &startchannel)
- }
- else // "V4L" or "MPEG", ie, analog TV
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- channel = new V4LChannel(this, genOpt.videodev);
- if (!channel->Open())
- return false;
-@@ -1082,11 +1082,11 @@ bool TVRec::SetupRecorder(RecordingProfile &profile)
- }
- else
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- // V4L/MJPEG/GO7007 from here on
- recorder = new NuppelVideoRecorder(this, channel);
- recorder->SetOption("skipbtaudio", genOpt.skip_btaudio);
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
-
- if (recorder)
-@@ -1292,11 +1292,11 @@ FirewireChannel *TVRec::GetFirewireChannel(void)
-
- V4LChannel *TVRec::GetV4LChannel(void)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- return dynamic_cast<V4LChannel*>(channel);
- #else
- return NULL;
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
- }
-
- /** \fn TVRec::EventThread(void*)
-@@ -4137,7 +4137,7 @@ void TVRec::TuningNewRecorder(MPEGStreamData *streamData)
- channel->GetCurrentName());
- }
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- if (GetV4LChannel())
- {
- channel->InitPictureAttributes();
-diff --git a/mythtv/libs/libmythtv/v4lchannel.cpp b/mythtv/libs/libmythtv/v4lchannel.cpp
-index bc82b49..7aa47ef 100644
---- a/mythtv/libs/libmythtv/v4lchannel.cpp
-+++ b/mythtv/libs/libmythtv/v4lchannel.cpp
-@@ -16,8 +16,12 @@
- #include <iostream>
- using namespace std;
-
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
-
- // MythTV headers
- #include "v4lchannel.h"
-@@ -150,8 +154,10 @@ static int format_to_mode(const QString &fmt, int v4l_version)
- {
- if (fmt == "NTSC-JP")
- return 6;
-+#ifdef USING_V4L
- else if (fmt.left(5) == "SECAM")
- return VIDEO_MODE_SECAM;
-+#endif
- else if (fmt == "PAL-NC")
- return 3;
- else if (fmt == "PAL-M")
-@@ -159,6 +165,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
- else if (fmt == "PAL-N")
- return 5;
- // generics...
-+#ifdef USING_V4L
- else if (fmt.left(3) == "PAL")
- return VIDEO_MODE_PAL;
- else if (fmt.left(4) == "NTSC")
-@@ -166,6 +173,7 @@ static int format_to_mode(const QString &fmt, int v4l_version)
- else if (fmt.left(4) == "ATSC")
- return VIDEO_MODE_NTSC; // We've dropped V4L ATSC support...
- return VIDEO_MODE_NTSC;
-+#endif
- }
-
- VERBOSE(VB_IMPORTANT,
-@@ -237,6 +245,7 @@ static QString mode_to_format(int mode, int v4l_version)
- }
- else if (1 == v4l_version)
- {
-+#ifdef USING_V4L
- if (mode == VIDEO_MODE_NTSC)
- return "NTSC";
- else if (mode == VIDEO_MODE_PAL)
-@@ -249,6 +258,7 @@ static QString mode_to_format(int mode, int v4l_version)
- return "PAL-N";
- else if (mode == 6)
- return "NTSC-JP";
-+#endif
- }
- else
- {
-@@ -676,6 +686,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
- return true;
- }
-
-+#ifdef USING_V4L
- // Video4Linux version 1 tuning
- uint freq = frequency / 62500;
- ioctlval = ioctl(videofd, VIDIOCSFREQ, &freq);
-@@ -687,6 +698,7 @@ bool V4LChannel::Tune(uint frequency, QString inputname,
- .arg(device).arg(ioctlval).arg(strerror(errno)));
- return false;
- }
-+#endif
-
- SetSIStandard(si_std);
-
-@@ -858,6 +870,7 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
-
- if (usingv4l1)
- {
-+#ifdef USING_V4L
- VERBOSE(VB_CHANNEL, LOC + msg + "(v4l v1)");
-
- // read in old settings
-@@ -875,8 +888,9 @@ bool V4LChannel::SetInputAndFormat(int inputNum, QString newFmt)
- {
- VERBOSE(VB_IMPORTANT, LOC_ERR + msg +
- "\n\t\t\twhile setting format (v4l v1)" + ENO);
-- }
-- else if (usingv4l2)
-+ } else
-+#endif
-+ if (usingv4l2)
- {
- VERBOSE(VB_IMPORTANT, LOC + msg +
- "\n\t\t\tSetting video mode with v4l version 1 worked");
-@@ -951,6 +965,7 @@ bool V4LChannel::SwitchToInput(int inputnum, bool setstarting)
- return ok;
- }
-
-+#ifdef USING_V4L
- static unsigned short *get_v4l1_field(
- int v4l2_attrib, struct video_picture &vid_pic)
- {
-@@ -970,6 +985,7 @@ static unsigned short *get_v4l1_field(
- }
- return NULL;
- }
-+#endif
-
- static int get_v4l2_attribute(const QString &db_col_name)
- {
-@@ -1067,6 +1083,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
- }
-
- // V4L1
-+#ifdef USING_V4L
- unsigned short *setfield;
- struct video_picture vid_pic;
- bzero(&vid_pic, sizeof(vid_pic));
-@@ -1087,7 +1104,7 @@ bool V4LChannel::InitPictureAttribute(const QString db_col_name)
- VERBOSE(VB_IMPORTANT, loc_err + "failed to set controls." + ENO);
- return false;
- }
--
-+#endif
- return true;
- }
-
-@@ -1154,6 +1171,7 @@ static int get_v4l2_attribute_value(int videofd, int v4l2_attrib)
-
- static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
- {
-+#ifdef USING_V4L
- struct video_picture vid_pic;
- bzero(&vid_pic, sizeof(vid_pic));
-
-@@ -1167,6 +1185,7 @@ static int get_v4l1_attribute_value(int videofd, int v4l2_attrib)
- unsigned short *setfield = get_v4l1_field(v4l2_attrib, vid_pic);
- if (setfield)
- return *setfield;
-+#endif
-
- return -1;
- }
-@@ -1210,6 +1229,7 @@ static int set_v4l2_attribute_value(int videofd, int v4l2_attrib, int newvalue)
-
- static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- {
-+#ifdef USING_V4L
- unsigned short *setfield;
- struct video_picture vid_pic;
- bzero(&vid_pic, sizeof(vid_pic));
-@@ -1236,7 +1256,7 @@ static int set_v4l1_attribute_value(int videofd, int v4l2_attrib, int newvalue)
- // ???
- return -1;
- }
--
-+#endif
- return 0;
- }
-
-diff --git a/mythtv/libs/libmythtv/v4lchannel.h b/mythtv/libs/libmythtv/v4lchannel.h
-index b059c64..aa6d934 100644
---- a/mythtv/libs/libmythtv/v4lchannel.h
-+++ b/mythtv/libs/libmythtv/v4lchannel.h
-@@ -4,11 +4,11 @@
- #define CHANNEL_H
-
- #include "dtvchannel.h"
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h> // needed for v4l2_std_id type
- #else
- typedef uint64_t v4l2_std_id;
--#endif //USING_V4L
-+#endif //USING_V4L2
-
- using namespace std;
-
-diff --git a/mythtv/libs/libmythtv/vbitext/vbi.c b/mythtv/libs/libmythtv/vbitext/vbi.c
-index 15f8d85..4c50e8d 100644
---- a/mythtv/libs/libmythtv/vbitext/vbi.c
-+++ b/mythtv/libs/libmythtv/vbitext/vbi.c
-@@ -14,8 +14,12 @@
- // compiling with -std=c99. We could remove this in the .pro file,
- // but that would disable it for all .c files.
- #undef __STRICT_ANSI__
-+#ifdef USING_V4L
- #include <linux/videodev.h>
-+#endif
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
-+#endif
-
- // vbitext headers
- #include "vt.h"
-@@ -29,8 +33,13 @@ static int rawbuf_size; // its current size
-
-
- /***** bttv api *****/
-+#ifdef USING_V4L
- #define BTTV_VBISIZE _IOR('v' , BASE_VIDIOCPRIVATE+8, int)
--
-+#else // !USING_V4L
-+#ifdef USING_V4L2
-+#define BTTV_VBISIZE _IOR('v' , BASE_VIDIOC_PRIVATE+8, int)
-+#endif // USING_V4L2
-+#endif // !USING_V4L
-
- static void
- error(const char *str, ...)
-diff --git a/mythtv/libs/libmythtv/videosource.cpp b/mythtv/libs/libmythtv/videosource.cpp
-index 5d7a508..635faeb 100644
---- a/mythtv/libs/libmythtv/videosource.cpp
-+++ b/mythtv/libs/libmythtv/videosource.cpp
-@@ -45,7 +45,7 @@ using namespace std;
- #include "dvbtypes.h"
- #endif
-
--#ifdef USING_V4L
-+#ifdef USING_V4L2
- #include <linux/videodev2.h>
- #endif
-
-@@ -2012,7 +2012,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
- setTrigger(cardtype);
- setSaveAll(false);
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- addTarget("V4L", new V4LConfigurationGroup(parent));
- # ifdef USING_IVTV
- addTarget("MPEG", new MPEGConfigurationGroup(parent));
-@@ -2020,7 +2020,7 @@ CaptureCardGroup::CaptureCardGroup(CaptureCard &parent) :
- # ifdef USING_HDPVR
- addTarget("HDPVR", new HDPVRConfigurationGroup(parent));
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_DVB
- addTarget("DVB", new DVBConfigurationGroup(parent));
-@@ -2201,7 +2201,7 @@ CardType::CardType(const CaptureCard &parent) :
-
- void CardType::fillSelections(SelectSetting* setting)
- {
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- setting->addSelection(
- QObject::tr("Analog V4L capture card"), "V4L");
- setting->addSelection(
-@@ -2214,7 +2214,7 @@ void CardType::fillSelections(SelectSetting* setting)
- setting->addSelection(
- QObject::tr("H.264 encoder card (HD-PVR)"), "HDPVR");
- # endif // USING_HDPVR
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_DVB
- setting->addSelection(
-@@ -2226,11 +2226,11 @@ void CardType::fillSelections(SelectSetting* setting)
- QObject::tr("FireWire cable box"), "FIREWIRE");
- #endif // USING_FIREWIRE
-
--#ifdef USING_V4L
-+#if defined(USING_V4L) || defined(USING_V4L2)
- setting->addSelection(
- QObject::tr("USB MPEG-4 encoder box (Plextor ConvertX, etc)"),
- "GO7007");
--#endif // USING_V4L
-+#endif // USING_V4L || USING_V4L2
-
- #ifdef USING_HDHOMERUN
- setting->addSelection(
diff --git a/community-testing/mythtv/mythtv.install b/community-testing/mythtv/mythtv.install
deleted file mode 100644
index c29a53454..000000000
--- a/community-testing/mythtv/mythtv.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- echo "See \"MythTV\" on the Archlinux Wiki for installation information - Extensive!!"
-}
-
-post_upgrade() {
- return
-}
-
-post_remove() {
- echo -e "NOTE: mysql database was not removed. To remove run:\nmysql -u root -e 'drop database mythconverg;'"
-}
diff --git a/community-testing/opensips/PKGBUILD b/community-testing/opensips/PKGBUILD
deleted file mode 100644
index b11589417..000000000
--- a/community-testing/opensips/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 60926 2011-12-19 18:10:36Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=opensips
-pkgver=1.6.4
-pkgrel=2
-pkgdesc="An Open Source SIP Server able to act as a SIP proxy, registrar, location server, redirect server ..."
-url="http://www.opensips.org"
-depends=('gcc-libs' 'openssl' 'db' 'attr' 'kernel-headers' 'libxml2')
-makedepends=('postgresql-libs>=8.4.1' 'unixodbc' 'libldap>=2.4.18' 'libmysqlclient' 'lynx')
-optdepends=('postgresql-libs'
- 'unixodbc'
- 'libldap'
- 'libmysqlclient'
- 'libsasl'
- 'python2'
- 'pcre')
-backup=("etc/opensips/opensips.cfg"
- "etc/opensips/dictionary.radius"
- "etc/opensips/opensipsctlrc")
-arch=('i686' 'x86_64')
-license=('GPL')
-install=opensips.install
-options=('!emptydirs' 'zipman' '!makeflags' 'docs')
-source=(#http://switch.dl.sourceforge.net/sourceforge/opensips/opensips-$pkgver-tls_src.tar.gz
- http://opensips.org/pub/opensips/$pkgver/src/opensips-$pkgver-2-tls_src.tar.gz
- opensips.init)
-md5sums=('e9869d9a726d70f83de4a1e77cd24d40'
- '685fbe00826df1285b410d4610dcbb0c')
-
-build()
-{
- cd $srcdir/$pkgname-$pkgver-2-tls/
-
- # python2 fix
- for file in $(find . -name '*.py' -print); do
- sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
- sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
- done
-
- make \
- include_modules="ldap db_mysql db_postgres db_unixodbc presence presence_xml h350" \
- TLS=1 DESTDIR=$pkgdir/usr LIBDIR=lib install
-
- # Conforms to the arch packaging standards (http://wiki.archlinux.org/index.php/Arch_Packaging_Standards)
- mkdir -p $pkgdir/etc/
- mv $pkgdir/usr/etc/opensips/ $pkgdir/etc/
- sed -i 's#mpath=".*lib/opensips/modules/"#mpath="/usr/lib/opensips/modules/"#' $pkgdir/etc/opensips/opensips.cfg
-
- # Install starting script
- mkdir -p $pkgdir/etc/rc.d/
- cp ../opensips.init $pkgdir/etc/rc.d/opensips
- chmod 755 $pkgdir/etc/rc.d/opensips
-
- # fix bad paths
- cd $pkgdir/usr/share
- find -type f -exec sed -i "s#$pkgdir##" {} \;
-
- cd $pkgdir/usr/lib/opensips/opensipsctl
- find -type f -exec sed -i "s#$pkgdir##" {} \;
-
- cd $pkgdir/usr/sbin
- sed -i "s#$pkgdir##" opensipsctl opensipsdbctl osipsconsole
-
- cd $pkgdir/etc
- find -type f -exec sed -i "s#$pkgdir##" {} \;
-}
diff --git a/community-testing/opensips/opensips.init b/community-testing/opensips/opensips.init
deleted file mode 100644
index 1c883c4c2..000000000
--- a/community-testing/opensips/opensips.init
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-BINNAME=opensips
-OSRDIR=/usr/sbin
-OPENSIPS=$OSRDIR/$BINNAME
-
-TMPDIR=/var/tmp
-CORE=$TMPDIR/core
-
-ETC=/etc/opensips/opensips.cfg
-PIDFILE=/var/run/opensips.pid
-
-case "$1" in
- start)
- stat_busy "Starting OpenSIPS server"
- cd $TMPDIR
- $OPENSIPS -f $ETC -w $TMPDIR -P $PIDFILE 2>&1 > /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon opensips
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping OpenSIPS server"
- if [ -r $PIDFILE ]
- then
- cat $PIDFILE | xargs kill
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon opensips
- stat_done
- fi
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/community-testing/opensips/opensips.install b/community-testing/opensips/opensips.install
deleted file mode 100644
index 9e8f2a47b..000000000
--- a/community-testing/opensips/opensips.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install()
-{
- echo "To use MySQL, you should install mysql package and run '/usr/sbin/openser_mysql.sh create'"
- /bin/true
-}
diff --git a/community-testing/paraview/PKGBUILD b/community-testing/paraview/PKGBUILD
deleted file mode 100644
index cbb82b181..000000000
--- a/community-testing/paraview/PKGBUILD
+++ /dev/null
@@ -1,88 +0,0 @@
-# $Id: PKGBUILD 60900 2011-12-19 18:08:39Z andrea $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Michele Mocciola <mickele>
-# Contributor: Simon Zilliken <simon____AT____zilliken____DOT____name>
-
-pkgname=paraview
-pkgver=3.10.1
-pkgrel=5
-pkgdesc='Parallel Visualization Application using VTK'
-arch=('i686' 'x86_64')
-url='http://www.paraview.org'
-license=('custom')
-depends=('qt' 'python2' 'libgl' 'libxml2' 'unixodbc' 'postgresql-libs' 'libxt'
- 'qtwebkit' 'libmysqlclient' 'mesa' 'openmpi') #'hdf5'
-makedepends=('cmake' 'desktop-file-utils')
-source=("http://paraview.org/files/v${pkgver:0:4}/ParaView-${pkgver}.tar.gz"
- 'paraview.png'
- 'paraview.desktop'
- 'fixkernelversioncheck.diff')
-md5sums=('d8a9d4a997a720589ffd57568bcdd449'
- 'db623002bc71a257ddfdd0c9c7b14c3f'
- '4e4b7172ed18171c37446fd7c4f1e8f5'
- '9e137af23701f76fc727222ebac23389')
-
-build() {
- cd ParaView-${pkgver}
-
- # patch vtk to fix http://www.vtk.org/Bug/view.php?id=12568
- # remove next pkgver bump
- cd VTK
- patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
- cd ..
-
- sed -i '20 i#include <stddef.h>' VTK/Utilities/vtkmetaio/metaUtils.cxx
- sed -i 's/stddef.h/cstddef/' VTK/Wrapping/Python/vtkPythonUtil.cxx
- sed -i '36 i#include <vtksys/cstddef>' VTK/Wrapping/Python/PyVTKObject.cxx
-
- # Paraview wants to be built out of source
- mkdir -p build
- cd build
-
- # use -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \ to fix make install error: http://www.cmake.org/pipermail/paraview/2011-February/020268.html
- cmake \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_USE_PTHREADS:BOOL=ON \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_SKIP_RPATH:BOOL=YES \
- -DCMAKE_VERBOSE_MAKEFILE:BOOL=OFF \
- -DCMAKE_COLOR_MAKEFILE:BOOL=TRUE \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DBUILD_DOCUMENTATION:BOOL=OFF \
- -DBUILD_EXAMPLES:BOOL=OFF \
- -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
- -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
- -DVTK_USE_SYSTEM_PNG:BOOL=ON \
- -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
- -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
- -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
- -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
- -DVTK_USE_BOOST:BOOL=OFF \
- -DVTK_USE_OFFSCREEN=TRUE \
- -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
- -DPARAVIEW_USE_MPI:BOOL=ON \
- -DPARAVIEW_ENABLE_PYTHON:BOOL=ON \
- -DPARAVIEW_BUILD_QT_GUI:BOOL=ON \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
- -DPARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES:BOOL=OFF \
- ..
-
- make
-}
-
-package() {
- cd ParaView-${pkgver}/build
-
- make DESTDIR=${pkgdir} install
-
- # Install license
- install -Dm644 ${srcdir}/ParaView-${pkgver}/License_v1.2.txt ${pkgdir}/usr/share/licenses/paraview/LICENSE
-
- # Install desktop shortcuts
- install -Dm644 ${srcdir}/paraview.png ${pkgdir}/usr/share/pixmaps/paraview.png
- desktop-file-install --dir=${pkgdir}/usr/share/applications ${srcdir}/paraview.desktop
-
- # Removes VTK plugin for designer - if you need, you can install vtk
- #rm -rf ${pkgdir}/opt/paraview/plugins
-}
diff --git a/community-testing/paraview/fixkernelversioncheck.diff b/community-testing/paraview/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-testing/paraview/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
-
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
- # Linux Specific flags
- ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
- OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
- IF (HDF5_ENABLE_LARGE_FILE)
- SET (LARGEFILE 1)
- ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
- SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-testing/paraview/paraview.desktop b/community-testing/paraview/paraview.desktop
deleted file mode 100644
index 2f5b8ec69..000000000
--- a/community-testing/paraview/paraview.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=ParaView
-GenericName=Data Viewer
-Comment=ParaView allows visualization of large data sets
-Type=Application
-Terminal=false
-Icon=paraview
-Categories=Graphics;
-Exec=/usr/bin/paraview
diff --git a/community-testing/paraview/paraview.png b/community-testing/paraview/paraview.png
deleted file mode 100644
index 6e39f3d4f..000000000
--- a/community-testing/paraview/paraview.png
+++ /dev/null
Binary files differ
diff --git a/community-testing/perl-dbd-odbc/PKGBUILD b/community-testing/perl-dbd-odbc/PKGBUILD
deleted file mode 100644
index 3b35f2824..000000000
--- a/community-testing/perl-dbd-odbc/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 60928 2011-12-19 18:10:40Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: François Charette <firmicus ατ gmx δοτ net>
-
-pkgname=perl-dbd-odbc
-pkgver=1.33
-pkgrel=2
-pkgdesc="ODBC Driver for DBI"
-arch=('i686' 'x86_64')
-url="http://search.cpan.org/dist/DBD-ODBC/"
-license=('GPL' 'PerlArtistic')
-depends=('perl-dbi' 'perl' 'unixodbc')
-options=('!emptydirs')
-source=("http://search.cpan.org/CPAN/authors/id/M/MJ/MJEVANS/DBD-ODBC-${pkgver}.tar.gz")
-md5sums=('3e44ea4eb4b0bb711eea93632b76de17')
-
-build() {
- cd DBD-ODBC-${pkgver}
- PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
- make
-}
-
-package() {
- cd DBD-ODBC-${pkgver}
- make install DESTDIR=${pkgdir}
- find ${pkgdir} -name '.packlist' -delete
- find ${pkgdir} -name '*.pod' -delete
-}
diff --git a/community-testing/psqlodbc/PKGBUILD b/community-testing/psqlodbc/PKGBUILD
deleted file mode 100644
index aa6184935..000000000
--- a/community-testing/psqlodbc/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 60930 2011-12-19 18:10:47Z andrea $
-# Maintainer:
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux-br.org>
-# Contributor: Rick Rein <jeebusroxors@gmail.com>
-
-pkgname=psqlodbc
-pkgver=09.00.0310
-pkgrel=2
-pkgdesc="PostgreSQL ODBC driver"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.postgresql.org"
-depends=('unixodbc' 'postgresql-libs')
-makedepends=('postgresql')
-options=('!libtool')
-source=(ftp://ftp2.it.postgresql.org/mirrors/postgres//odbc/versions/src/$pkgname-$pkgver.tar.gz
- fix-function-declarations.patch)
-md5sums=('78144d9ea6c40f0a0a0b92128e6b0e05'
- 'f1189f9c6ae0b5bfb5ee8423eaa4076f')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-# patch -p1 -i "$srcdir/fix-function-declarations.patch"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community-testing/psqlodbc/fix-function-declarations.patch b/community-testing/psqlodbc/fix-function-declarations.patch
deleted file mode 100644
index 4504661b0..000000000
--- a/community-testing/psqlodbc/fix-function-declarations.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -upr psqlodbc-08.04.0100.orig/odbcapi30.c psqlodbc-08.04.0100/odbcapi30.c
---- psqlodbc-08.04.0100.orig/odbcapi30.c 2008-10-07 00:46:09.000000000 +0300
-+++ psqlodbc-08.04.0100/odbcapi30.c 2009-09-19 20:13:57.000000000 +0300
-@@ -118,13 +118,7 @@ SQLColAttribute(SQLHSTMT StatementHandle
- SQLPOINTER CharacterAttribute,
- SQLSMALLINT BufferLength,
- SQLSMALLINT *StringLength,
--#if defined(_WIN64)
- SQLLEN *NumericAttribute
--#elif defined(WITH_UNIXODBC) || defined(WIN32)
-- SQLPOINTER NumericAttribute
--#else
-- SQLLEN *NumericAttribute
--#endif
- )
- {
- CSTR func = "SQLColAttribute";
-diff -upr psqlodbc-08.04.0100.orig/odbcapi30w.c psqlodbc-08.04.0100/odbcapi30w.c
---- psqlodbc-08.04.0100.orig/odbcapi30w.c 2009-03-22 16:17:10.000000000 +0200
-+++ psqlodbc-08.04.0100/odbcapi30w.c 2009-09-19 20:22:17.000000000 +0300
-@@ -262,11 +262,7 @@ SQLRETURN SQL_API SQLColAttributeW(
- SQLPOINTER pCharAttr,
- SQLSMALLINT cbCharAttrMax,
- SQLSMALLINT *pcbCharAttr,
--#if defined(WITH_UNIXODBC) || (defined(WIN32) && ! defined(_WIN64))
-- SQLPOINTER pNumAttr
--#else
- SQLLEN *pNumAttr
--#endif
- )
- {
- CSTR func = "SQLColAttributeW";
-diff -upr psqlodbc-08.04.0100.orig/odbcapi.c psqlodbc-08.04.0100/odbcapi.c
---- psqlodbc-08.04.0100.orig/odbcapi.c 2008-11-23 03:00:53.000000000 +0200
-+++ psqlodbc-08.04.0100/odbcapi.c 2009-09-19 20:13:56.000000000 +0300
-@@ -1111,11 +1111,7 @@ SQLExtendedFetch(
- HSTMT hstmt,
- SQLUSMALLINT fFetchType,
- SQLLEN irow,
--#ifdef WITH_UNIXODBC
-- SQLROWSETSIZE *pcrow,
--#else
- SQLULEN *pcrow,
--#endif /* WITH_UNIXODBC */
- SQLUSMALLINT *rgfRowStatus)
- {
- RETCODE ret;
diff --git a/community-testing/qbittorrent/PKGBUILD b/community-testing/qbittorrent/PKGBUILD
deleted file mode 100644
index e26f76684..000000000
--- a/community-testing/qbittorrent/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-
-pkgname=qbittorrent
-pkgver=2.9.2
-pkgrel=7
-pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
-arch=('i686' 'x86_64')
-url="http://www.qbittorrent.org/"
-license=('GPL')
-depends=('qt' 'libtorrent-rasterbar' 'xdg-utils')
-makedepends=('boost' 'geoip')
-optdepends=('python: needed for search'
- 'geoip: improves peer country resolution')
-install='qbittorrent.install'
-source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz")
-md5sums=('0c2188e0065be57e50c06f5934d5f7a2')
-
-build() {
- cd qbittorrent-${pkgver}
-
- ./configure \
- --prefix=/usr
-
- make
-}
-
-package() {
- cd qbittorrent-${pkgver}
-
- make INSTALL_ROOT=${pkgdir} install
-}
diff --git a/community-testing/qbittorrent/qbittorrent.install b/community-testing/qbittorrent/qbittorrent.install
deleted file mode 100644
index e70c054ec..000000000
--- a/community-testing/qbittorrent/qbittorrent.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-testing/qlandkartegt/PKGBUILD b/community-testing/qlandkartegt/PKGBUILD
deleted file mode 100644
index 38708ca2c..000000000
--- a/community-testing/qlandkartegt/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 60904 2011-12-19 18:08:56Z andrea $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Matthias Maennich <arch@maennich.net>
-# Contributor: <boenki@gmx.de>
-
-pkgname=qlandkartegt
-pkgver=1.3.1
-pkgrel=2
-pkgdesc="Use your GPS with Linux"
-arch=('i686' 'x86_64')
-url="http://www.qlandkarte.org/"
-license=('GPL')
-depends=('gdal' 'gpsd' 'libdmtx' 'libexif' 'libmysqlclient' 'mesa' 'postgresql-libs'
- 'qt' 'shared-mime-info' 'qtwebkit')
-makedepends=('cmake' 'garmindev')
-optdepends=('garmindev: to connect garmin devices')
-install=$pkgname.install
-changelog=$pkgname.changelog
-source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
- $pkgname-mimetypes.xml)
-sha256sums=('77a387856e2d41f9ea69f750cbac9bb49fa249d65bdef5e319bfa6f7c9f84121'
- 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0')
-
-build() {
- cd ${srcdir}/$pkgname-$pkgver
-
- cd ${srcdir}
- mkdir build
- cd build
-
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
- make
-}
-
-package(){
- cd ${srcdir}/build
-
- make DESTDIR=${pkgdir} install
-
- install -D -m644 ${srcdir}/$pkgname-mimetypes.xml \
- ${pkgdir}/usr/share/mime/packages/$pkgname-mimetypes.xml
-}
diff --git a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml b/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml
deleted file mode 100644
index 46d3d402c..000000000
--- a/community-testing/qlandkartegt/qlandkartegt-mimetypes.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0"?>
-<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
- <mime-type type="application/vnd.qlandkartegt.qlb">
- <comment>QLandkarteGT File</comment>
- <glob pattern="*.qlb"/>
- </mime-type>
-</mime-info>
diff --git a/community-testing/qlandkartegt/qlandkartegt.changelog b/community-testing/qlandkartegt/qlandkartegt.changelog
deleted file mode 100644
index 59d0e9a59..000000000
--- a/community-testing/qlandkartegt/qlandkartegt.changelog
+++ /dev/null
@@ -1,30 +0,0 @@
-2011-12-08 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.3.1-1
-
-2011-10-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.2.4-1
-
-2011-09-09 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.2.3-1
-
-2011-07-19 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.2.2-1
-
-2011-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.2.1-1
-
-2011-06-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.2.0-1
-
-2011-05-22 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.1.2-1
-
-2011-03-21 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.1.1-1
-
-2011-02-23 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.1.0-1
-
-2011-02-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * qlandkartegt 1.0.1-2
- * moved to [community] with 59 AUR votes
diff --git a/community-testing/qlandkartegt/qlandkartegt.install b/community-testing/qlandkartegt/qlandkartegt.install
deleted file mode 100644
index e55805570..000000000
--- a/community-testing/qlandkartegt/qlandkartegt.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime > /dev/null
-}
-
-post_remove() {
- post_install $1
-}
diff --git a/community-testing/qmc2/PKGBUILD b/community-testing/qmc2/PKGBUILD
deleted file mode 100644
index 3a175eb67..000000000
--- a/community-testing/qmc2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 60906 2011-12-19 18:09:01Z andrea $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: JJDaNiMoTh <jjdanimoth@gmail.com>
-
-pkgname=qmc2
-pkgver=0.34
-pkgrel=2
-pkgdesc="Qt 4 based UNIX MAME frontend supporting SDLMAME"
-url="http://qmc2.arcadehits.net"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('qtwebkit' 'phonon' 'sdl')
-makedepends=('rsync' 'mesa')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-$pkgver.tar.bz2")
-md5sums=('3439fb62c95ff702e3c4194c05353169')
-
-build() {
- cd "$srcdir/$pkgname"
- export CTIME=0
- make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr
-}
-
-package() {
- cd "$srcdir/$pkgname"
- make PREFIX=/usr DATADIR=/usr/share SYSCONFDIR=/etc QTDIR=/usr DESTDIR=$pkgdir install
- install -d $pkgdir/usr/share/{applications,pixmaps}
- install -D -m644 "$srcdir/qmc2/data/img/mame.png" "$pkgdir/usr/share/pixmaps"
-}
diff --git a/community-testing/qtcreator/PKGBUILD b/community-testing/qtcreator/PKGBUILD
deleted file mode 100644
index f95b53e03..000000000
--- a/community-testing/qtcreator/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 60908 2011-12-19 18:09:11Z andrea $
-# Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-# Contributor: Dan Vratil <progdan@progdansoft.com>
-# Contributor: thotypous <matiasΘarchlinux-br·org>
-# Contributor: delor <bartekpiech gmail com>
-
-pkgname="qtcreator"
-pkgver=2.4.0
-_pkgver=2.4.0
-pkgrel=2
-pkgdesc='Lightweight, cross-platform integrated development environment'
-arch=('i686' 'x86_64')
-url='http://qt.nokia.com/products/developer-tools'
-license=('LGPL')
-depends=('qt>=4.8.0')
-makedepends=('qt-private-headers>=4.8.0' 'git')
-options=('docs')
-optdepends=('qt-doc: for the integrated Qt documentation'
- 'gdb: for the debugger'
- 'cmake: for cmake project suppport'
- 'openssh-askpass: for ssh support'
- 'git: for git support'
- 'mercurial: for mercurial support'
- 'bzr: for bazaar support')
-install=qtcreator.install
-source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz"
- 'qtcreator.desktop')
-md5sums=('80c1a2be4c685ce147c42424ad977e1a'
- 'f1f4680b9838ff0b8f4cf11eb850d662')
-
-build() {
- cd ${srcdir}
-
- [[ -d build ]] && rm -r build
- mkdir build && cd build
-
- qmake ${srcdir}/qt-creator-${_pkgver}-src/qtcreator.pro
- make
-}
-
-package() {
- cd ${srcdir}/build
-
- make INSTALL_ROOT="${pkgdir}/usr/" install
-
- install -Dm644 ${srcdir}/qtcreator.desktop \
- ${pkgdir}/usr/share/applications/qtcreator.desktop
- install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \
- ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
-}
diff --git a/community-testing/qtcreator/qtcreator.desktop b/community-testing/qtcreator/qtcreator.desktop
deleted file mode 100644
index 0fd562bd9..000000000
--- a/community-testing/qtcreator/qtcreator.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=/usr/bin/qtcreator
-Name=Qt-Creator
-GenericName=C++ IDE
-X-KDE-StartupNotify=true
-Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png
-Terminal=false
-Type=Application
-Categories=Qt;Development
diff --git a/community-testing/qtcreator/qtcreator.install b/community-testing/qtcreator/qtcreator.install
deleted file mode 100644
index 4d4a283db..000000000
--- a/community-testing/qtcreator/qtcreator.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-testing/root/PKGBUILD b/community-testing/root/PKGBUILD
deleted file mode 100644
index 729d3377f..000000000
--- a/community-testing/root/PKGBUILD
+++ /dev/null
@@ -1,97 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Sebastian Voecking <voeck@web.de>
-
-pkgname=root
-pkgver=5.32.00
-pkgrel=2
-pkgdesc='C++ data analysis framework and interpreter from CERN.'
-arch=('i686' 'x86_64')
-url='http://root.cern.ch'
-license=('LGPL2.1')
-depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
- 'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme')
-makedepends=('fftw')
-install='root.install'
-options=('!emptydirs')
-source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
- 'root.sh'
- 'rootd'
- 'root.xml')
-md5sums=('1c30e4e6eeae62ff1ad5118cd1309679'
- '0e883ad44f99da9bc7c23bc102800b62'
- 'efd06bfa230cc2194b38e0c8939e72af'
- 'e2cf69b204192b5889ceb5b4dedc66f7')
-
-build() {
- cd root
-
- if [ ${CARCH} == 'i686' ]; then
- TARGET=linux;
- else
- TARGET=linuxx8664gcc;
- fi
-
- # python2 switch
- find . -type f -exec sed -i -e 's_#!/usr/bin/env python_&2_' \
- -e 's/python -O/python2 -O/g' \
- -e 's/python -c/python2 -c/g' {} \;
- sed \
- -e 's/python 2/python2 2/g' \
- -i configure
- sed \
- -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \
- -i cint/reflex/python/genreflex/Makefile.am
- sed \
- -e 's/python /python2 /' \
- -i config/genreflex.in config/genreflex-rootcint.in
-
- ./configure \
- ${TARGET} \
- --prefix=/usr \
- --disable-builtin-ftgl \
- --disable-builtin-freetype \
- --disable-builtin-glew \
- --disable-builtin-pcre \
- --disable-builtin-zlib \
- --disable-builtin-lzma \
- --enable-gdml \
- --enable-gsl-shared \
- --enable-minuit2 \
- --enable-soversion \
- --enable-roofit \
- --enable-python \
- --with-python-incdir=/usr/include/python2.7 \
- --with-python-libdir=/usr/lib
-
- # move from aur
- #--disable-builtin-afterimage \
-
- make
-}
-
-package() {
- cd root
-
- make DESTDIR=${pkgdir} install
-
- install -D ${srcdir}/root.sh \
- ${pkgdir}/etc/profile.d/root.sh
- install -D ${srcdir}/rootd \
- ${pkgdir}/etc/rc.d/rootd
- install -D -m644 ${srcdir}/root.xml \
- ${pkgdir}/usr/share/mime/packages/root.xml
-
- install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \
- ${pkgdir}/usr/share/applications/root-system-bin.desktop
- # replace @prefix@ with /usr for the desktop
- sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop
-
- install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \
- ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png
-
- # use a file that pacman can track instead of adding directly to ld.so.conf
- install -d ${pkgdir}/etc/ld.so.conf.d
- echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf
-
- rm -rf ${pkgdir}/etc/root/daemons
-}
diff --git a/community-testing/root/root.install b/community-testing/root/root.install
deleted file mode 100644
index afabb7aea..000000000
--- a/community-testing/root/root.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
- update-desktop-database >/dev/null
-
- update-mime-database /usr/share/mime >/dev/null
-
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_remove() {
- # leave for pre 5.30.03-3
- if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then
- cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
- mv /tmp/.pacroot etc/ld.so.conf
- chmod 644 etc/ld.so.conf
- sbin/ldconfig -r .
- fi
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community-testing/root/root.sh b/community-testing/root/root.sh
deleted file mode 100644
index 685e6036b..000000000
--- a/community-testing/root/root.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ $PYTHONPATH ]; then
- export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
-else
- export PYTHONPATH=/usr/lib/root;
-fi
diff --git a/community-testing/root/root.xml b/community-testing/root/root.xml
deleted file mode 100644
index af8dd69c5..000000000
--- a/community-testing/root/root.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
- <mime-type type="application/x-root">
- <comment>ROOT file</comment>
- <comment xml:lang="de">ROOT-Datei</comment>
- <glob pattern="*.root"/>
- <magic priority="80">
- <match value="root" type="string" offset="0:64"/>
- </magic>
- </mime-type>
-</mime-info>
diff --git a/community-testing/root/rootd b/community-testing/root/rootd
deleted file mode 100644
index fb2c3388c..000000000
--- a/community-testing/root/rootd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/rootd`
-case "$1" in
- start)
- stat_busy "Starting ROOT file server daemon"
- [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1
- if [ $? -gt 0 ]; then
- stat_fail
- else
- PID=`pidof -o %PPID /usr/sbin/rootd`
- echo $PID >/var/run/rootd.pid
- add_daemon rootd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping ROOT file server daemon"
- [ ! -z "$PID" ] && kill $PID &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon rootd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community-testing/sigil/PKGBUILD b/community-testing/sigil/PKGBUILD
deleted file mode 100644
index 80ed676bc..000000000
--- a/community-testing/sigil/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 60910 2011-12-19 18:09:21Z andrea $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Larry Hajali <larryhaja [at] gmail [dot] com>
-
-pkgname=sigil
-pkgver=0.4.2
-pkgrel=3
-pkgdesc="A WYSIWYG ebook editor"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/sigil/"
-license=('GPL3')
-depends=('qtwebkit')
-makedepends=('cmake')
-install=sigil.install
-source=("http://sigil.googlecode.com/files/Sigil-${pkgver}-Code.zip"
- "${pkgname}.desktop")
-md5sums=('ce27976254236f8b11b787fd05be9acb'
- 'fef6aa492af487ccccd6b133635cee5a')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake -G "Unix Makefiles" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \
- -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON ..
-
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make install DESTDIR="${pkgdir}"
-
- install -d -m 0755 "${pkgdir}"/usr/share/applications
- install -m 0644 "${srcdir}"/${pkgname}.desktop "${pkgdir}"/usr/share/applications
-
- for _pic in 16 32 48 128 256; do
- install -D -m 0644 ../src/Sigil/Resource_Files/icon/app_icon_${_pic}.png \
- "${pkgdir}"/usr/share/icons/hicolor/${_pic}x${_pic}/apps/${pkgname}.png
- done
-}
diff --git a/community-testing/sigil/sigil.desktop b/community-testing/sigil/sigil.desktop
deleted file mode 100644
index 4f3a14d20..000000000
--- a/community-testing/sigil/sigil.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Sigil
-Comment=E-book reader and WYSIWYG editor
-TryExec=sigil
-Exec=sigil
-Icon=sigil
-Categories=Office;
-Terminal=false
-StartupNotify=false
diff --git a/community-testing/sigil/sigil.install b/community-testing/sigil/sigil.install
deleted file mode 100644
index ec506fa93..000000000
--- a/community-testing/sigil/sigil.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community-testing/swi-prolog/PKGBUILD b/community-testing/swi-prolog/PKGBUILD
deleted file mode 100644
index 5a43c9910..000000000
--- a/community-testing/swi-prolog/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: John Proctor <jproctor@prium.net>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=swi-prolog
-pkgver=5.10.5
-pkgrel=3
-pkgdesc='Prolog environment'
-arch=('i686' 'x86_64')
-url='http://www.swi-prolog.org/'
-license=('GPL' 'LGPL')
-depends=('gmp' 'readline' 'openssl')
-makedepends=('libxft' 'libjpeg' 'unixodbc' 'libxpm' 'libxinerama')
-optdepends=('unixodbc: for using the odbc4pl library'
- 'libjpeg: for using the pl2xpce library'
- 'libxpm: for using the pl2xpce library'
- 'libxinerama: for using the pl2xpce library'
- 'libxft: for using the pl2xpce library')
-options=('!makeflags')
-source=("http://www.swi-prolog.org/download/stable/src/pl-${pkgver}.tar.gz")
-md5sums=('1ca45eddd3590fb525085761e75a4ebd')
-
-build() {
- cd pl-${pkgver}
-
- # enable shared because x86 doesn't build with shared libs, upstream made it intentional...
- ./configure \
- --prefix=/usr \
- --with-world \
- --enable-shared
-
- make
-}
-
-check() {
- cd pl-${pkgver}
-
- make check || true
-}
-
-package() {
- cd pl-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- # fix https://bugs.archlinux.org/task/20873
- chmod +x ${pkgdir}/usr/lib/swipl-${pkgver}/library/dialect/sicstus/swipl-lfr.pl
-}
diff --git a/community-testing/texmaker/PKGBUILD b/community-testing/texmaker/PKGBUILD
deleted file mode 100644
index 13e9fe2f0..000000000
--- a/community-testing/texmaker/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 60912 2011-12-19 18:09:26Z andrea $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: furester <xfurester@hotmail.com>
-# Contributor: Firmicus <firmicus gmx net>
-# Contributor: Paulo Matias <matiasΘarchlinux-br·org>
-
-pkgname=texmaker
-pkgver=3.1
-pkgrel=2
-pkgdesc='Free cross-platform latex editor'
-arch=('i686' 'x86_64')
-url="http://www.xm1math.net/texmaker/index.html"
-license=('GPL')
-depends=('poppler-qt' 'ghostscript' 'qtwebkit')
-source=("http://www.xm1math.net/texmaker/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('10a14c75abbb7234d4e5e58a7c85b110')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- export INSTALL_ROOT=${pkgdir}
-
- qmake -unix PREFIX=//usr texmaker.pro
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- export INSTALL_PATH=${pkgdir}
-
- make install
-}
diff --git a/community-testing/vtk/PKGBUILD b/community-testing/vtk/PKGBUILD
deleted file mode 100644
index 198dea2fc..000000000
--- a/community-testing/vtk/PKGBUILD
+++ /dev/null
@@ -1,115 +0,0 @@
-# $Id: PKGBUILD 60914 2011-12-19 18:09:36Z andrea $
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Christofer Bertonha <christoferbertonha at gmail dot com>
-# Contributor: leepesjee <lpeschier at xs4all dot nl>
-# Contributor: Olivier Medoc
-# Contributor: ignotus
-# Contributor: Fabian Moser
-# Contributor: djscholl
-
-pkgname=vtk
-pkgver=5.8.0
-pkgrel=7
-pkgdesc='A software system for 3D computer graphics, image processing, and visualization which supports a wide variety of visualization algorithms and advanced modeling techniques.'
-arch=('i686' 'x86_64')
-url='http://www.vtk.org'
-license=('BSD')
-depends=('libpng' 'libtiff' 'freetype2' 'boost' 'ffmpeg' 'qt' 'lesstif' 'mysql')
-makedepends=('cmake' 'java-environment' 'doxygen' 'gnuplot' 'mesa' 'python2' 'tk')
-optdepends=('python2: python bindings'
- 'java-runtime: java bindings'
- 'tk: tcl bindings'
- 'gnuplot: plotting tools'
- 'graphviz: drawing tools')
-source=("http://www.vtk.org/files/release/${pkgver:0:3}/vtk-${pkgver}.tar.gz"
- "http://www.vtk.org/files/release/${pkgver:0:3}/vtkdata-${pkgver}.tar.gz"
- 'fixkernelversioncheck.diff'
- 'ffmpeg-0.8.diff'
- 'fix-boost-graph-api-changes.diff')
-md5sums=('37b7297d02d647cc6ca95b38174cb41f'
- 'a05295b81930e894fc0e31866f399151'
- '9e137af23701f76fc727222ebac23389'
- 'e992321c9d1def6034d0fa6607b40c5a'
- 'e715aef2aea26fc05f904efb5d0d5627')
-
-build() {
- cd VTK
-
- # fix compilation error: http://vtk.org/Bug/view.php?id=12568
- # remove next pkgver bump
- patch -Np1 -i ${srcdir}/fixkernelversioncheck.diff
-
- # fix compilation error:
- # remove next pkgver bump
- patch -Np1 -i ${srcdir}/ffmpeg-0.8.diff
-
- # fix compilation error: http://vtk.org/Bug/view.php?id=12772
- # remove next pkgver bump
- patch -Np1 -i ${srcdir}/fix-boost-graph-api-changes.diff
-
- cd ${srcdir}
-
- rm -rf build
- mkdir build
- cd build
-
- cmake \
- -Wno-dev \
- -DBUILD_SHARED_LIBS:BOOL=ON \
- -DCMAKE_INSTALL_PREFIX:FILEPATH=/usr \
- -DVTK_DATA_ROOT:FILEPATH=${srcdir}/VTKData \
- -DBUILD_DOCUMENTATION:BOOL=ON \
- -DDOCUMENTATION_HTML_HELP:BOOL=ON \
- -DDOCUMENTATION_HTML_TARZ:BOOL=ON \
- -DBUILD_EXAMPLES:BOOL=ON \
- -DVTK_USE_HYBRID:BOOL=ON \
- -DVTK_USE_PARALLEL:BOOL=ON \
- -DVTK_USE_PATENTED:BOOL=ON \
- -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
- -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
- -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
- -DVTK_USE_SYSTEM_PNG:BOOL=ON \
- -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
- -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
- -DVTK_USE_SYSTEM_LIBXML2:BOOL=ON \
- -DVTK_USE_BOOST:BOOL=ON \
- -DVTK_USE_INFOVIS:BOOL=ON \
- -DVTK_USE_GL2PS:BOOL=ON \
- -DVTK_USE_MYSQL:BOOL=ON \
- -DVTK_USE_FFMPEG_ENCODER:BOOL=ON \
- -DVTK_USE_TEXT_ANALYSIS:BOOL=ON \
- -DVTK_WRAP_JAVA:BOOL=ON \
- -DVTK_WRAP_PYTHON:BOOL=ON \
- -DVTK_WRAP_TCL:BOOL=ON \
- -DVTK_PYTHON_SETUP_ARGS:STRING="--root=${pkgdir}" \
- -DVTK_USE_QT:BOOL=ON \
- -DVTK_INSTALL_QT_PLUGIN_DIR:STRING="/usr/lib/qt/plugins" \
- -DVTK_USE_GUISUPPORT:BOOL=ON \
- -DCMAKE_CXX_FLAGS="-D__STDC_CONSTANT_MACROS" \
- -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
- -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
- -DPYTHON_EXECUTABLE=/usr/bin/python2 \
- ${srcdir}/VTK
-
- make
-}
-
-package() {
- cd build
-
- make DESTDIR=${pkgdir} install
-
- # Move the vtk.jar to the arch-specific location
- install -dv ${pkgdir}/usr/share/java/vtk
- mv -v ${pkgdir}/usr/lib/vtk-${pkgver:0:3}/java/vtk.jar \
- ${pkgdir}/usr/share/java/vtk
-
- # Install license
- install -dv ${pkgdir}/usr/share/licenses/vtk
- install -m644 ${srcdir}/VTK/Copyright.txt \
- ${pkgdir}/usr/share/licenses/vtk
-
- # Put an entry in /etc/ld.so.conf.d
- install -dv ${pkgdir}/etc/ld.so.conf.d
- echo "/usr/lib/vtk-${pkgver:0:3}" > ${pkgdir}/etc/ld.so.conf.d/vtk.conf
-}
diff --git a/community-testing/vtk/ffmpeg-0.8.diff b/community-testing/vtk/ffmpeg-0.8.diff
deleted file mode 100644
index 523919d6f..000000000
--- a/community-testing/vtk/ffmpeg-0.8.diff
+++ /dev/null
@@ -1,66 +0,0 @@
-Description: Upstream changes introduced in version 5.6.1-6.1
- This patch has been created by dpkg-source during the package build.
- Here's the last changelog entry, hopefully it gives details on why
- those changes were made:
- .
- vtk (5.6.1-6.1) unstable; urgency=low
- .
- [ Michael Schutte ]
- * Non-maintainer upload.
- * Remove absolute paths to required libraries from
- /usr/lib/vtk-5.6/VTKLibraryDepends.cmake after building, closes:
- #506992. Due to the multiarch transition, the original behavior
- frequently causes reverse build-deps to FTBFS. This change should
- probably be reverted once all required libraries are multiarched.
- .
- [ Steve M. Robbins ]
- * Override lintian diagnostic about embedded libraries ftgl and sqlite.
- * IO/vtkFFMPEGWriter.cxx: Applied fix from #638246 to build with libav
- 0.7.
- .
- The person named in the Author field signed this changelog entry.
-Author: Steve M. Robbins <smr@debian.org>
-Bug-Debian: http://bugs.debian.org/506992
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: http://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: <YYYY-MM-DD>
-
---- vtk-5.6.1.orig/IO/vtkFFMPEGWriter.cxx
-+++ vtk-5.6.1/IO/vtkFFMPEGWriter.cxx
-@@ -123,7 +123,7 @@ int vtkFFMPEGWriterInternal::Start()
- }
-
- //choose avi media file format
-- this->avOutputFormat = guess_format("avi", NULL, NULL);
-+ this->avOutputFormat = av_guess_format("avi", NULL, NULL);
- if (!this->avOutputFormat)
- {
- vtkGenericWarningMacro (<< "Could not open the avi media file format.");
-@@ -150,7 +150,7 @@ int vtkFFMPEGWriterInternal::Start()
- //Set up the codec.
- AVCodecContext *c = this->avStream->codec;
- c->codec_id = (CodecID)this->avOutputFormat->video_codec;
-- c->codec_type = CODEC_TYPE_VIDEO;
-+ c->codec_type = AVMEDIA_TYPE_VIDEO;
- c->width = this->Dim[0];
- c->height = this->Dim[1];
- c->pix_fmt = PIX_FMT_YUVJ420P;
-@@ -329,7 +329,7 @@ int vtkFFMPEGWriterInternal::Write(vtkIm
- pkt.stream_index = this->avStream->index;
- if (cc->coded_frame->key_frame) //treat keyframes well
- {
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- }
- pkt.duration = 0; //presentation duration in time_base units or 0 if NA
- pkt.pos = -1; //byte position in stream or -1 if NA
diff --git a/community-testing/vtk/fix-boost-graph-api-changes.diff b/community-testing/vtk/fix-boost-graph-api-changes.diff
deleted file mode 100644
index 2162e7a28..000000000
--- a/community-testing/vtk/fix-boost-graph-api-changes.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-commit d3ecc2c459dd1df937fc97887581ace1036da533
-Author: Marcus D. Hanwell <marcus.hanwell@kitware.com>
-Date: Tue Dec 13 15:36:06 2011 -0500
-
- BUG: 12772 fixes for change in Boost graph API
-
- This fixes bug 12772, where an API change in Boost was causing
- compilation failures using Boost 1.38. Thanks to Orion Poplawski for
- reporting the issue and posting the patch.
-
- Change-Id: I491b0f1650c0be19319533306eb10597dc96fa06
-
-diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-index c789f6b..cf7cd47 100644
---- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
-@@ -47,6 +47,15 @@ using namespace boost;
- vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
-
-
-+namespace {
-+ vtkIdType unwrap_edge_id(vtkEdgeType const &e) {
-+ return e.Id;
-+ }
-+ vtkIdType unwrap_edge_id(boost::detail::reverse_graph_edge_descriptor<vtkEdgeType> const &e) {
-+ return e.underlying_desc.Id;
-+ }
-+}
-+
- // Redefine the bfs visitor, the only visitor we
- // are using is the tree_edge visitor.
- template <typename IdMap>
-@@ -95,7 +104,8 @@ public:
-
- // Copy the vertex and edge data from the graph to the tree.
- tree->GetVertexData()->CopyData(graph->GetVertexData(), v, tree_v);
-- tree->GetEdgeData()->CopyData(graph->GetEdgeData(), e.Id, tree_e.Id);
-+ tree->GetEdgeData()->CopyData(graph->GetEdgeData(),
-+ unwrap_edge_id(e), tree_e.Id);
- }
-
- private:
diff --git a/community-testing/vtk/fixkernelversioncheck.diff b/community-testing/vtk/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community-testing/vtk/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
-
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
- # Linux Specific flags
- ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
- OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
- IF (HDF5_ENABLE_LARGE_FILE)
- SET (LARGEFILE 1)
- ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
- SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community-testing/wkhtmltopdf/PKGBUILD b/community-testing/wkhtmltopdf/PKGBUILD
deleted file mode 100644
index 5e1a0f032..000000000
--- a/community-testing/wkhtmltopdf/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 60916 2011-12-19 18:09:41Z andrea $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-
-pkgname=wkhtmltopdf
-pkgver=0.9.9
-pkgrel=2
-pkgdesc="Simple shell utility to convert html to pdf using the webkit rendering engine, and qt"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/wkhtmltopdf/"
-license=('GPL3')
-depends=('qtwebkit')
-optdepends=('xorg-server: wkhtmltopdf needs X or Xvfb to operate')
-source=(http://wkhtmltopdf.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-sha1sums=('41f598c0103326e7c13101391447b0284b4ba3cb')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- qmake wkhtmltopdf.pro
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make INSTALL_ROOT="$pkgdir/usr" install
-
- # Generate and install man page
- install -d "$pkgdir/usr/share/man/man1"
- ./wkhtmltopdf --manpage >"$pkgdir/usr/share/man/man1/wkhtmltopdf.1"
-}
diff --git a/community/acpitool/PKGBUILD b/community/acpitool/PKGBUILD
deleted file mode 100644
index 6302b6098..000000000
--- a/community/acpitool/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 58302 2011-11-10 17:58:29Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Gerhard Brauer <gerhard.brauer@web.de>
-# Contributor: Milosz Piglas <archeofuture@gmail.com>
-
-pkgname=acpitool
-pkgver=0.5.1
-pkgrel=5
-pkgdesc="ACPI client - replacement for apm tool"
-url="http://sourceforge.net/projects/acpitool/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gcc-libs')
-source=(http://downloads.sourceforge.net/sourceforge/acpitool/acpitool-$pkgver.tar.bz2
- linux-3.0.patch
- sysfs-battery.patch)
-md5sums=('9e4ec55201be0be71ffbc56d38b42b57'
- 'eb149edb32be6cdf20a7d16beb3e9f70'
- '969fc4929cc215756db27168646c2b7a')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- patch -p1 <$srcdir/linux-3.0.patch
- patch -p1 <$srcdir/sysfs-battery.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make prefix="$pkgdir/usr" install
-}
diff --git a/community/acpitool/linux-3.0.patch b/community/acpitool/linux-3.0.patch
deleted file mode 100644
index ba454a0c2..000000000
--- a/community/acpitool/linux-3.0.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -wbBur acpitool-0.5.1/src/acpitool.cpp acpitool-0.5.1.my/src/acpitool.cpp
---- acpitool-0.5.1/src/acpitool.cpp 2009-08-13 23:37:48.000000000 +0400
-+++ acpitool-0.5.1.my/src/acpitool.cpp 2011-08-11 21:53:17.000000000 +0400
-@@ -205,8 +205,12 @@
- Kernel_24 = 1;
- Kernel_26 = 0;
- }
--
-- if(strncmp(str,"2.6",3)==0)
-+ else if(strncmp(str,"2.6",3)==0)
-+ {
-+ Kernel_24 = 0;
-+ Kernel_26 = 1;
-+ }
-+ else
- {
- Kernel_24 = 0;
- Kernel_26 = 1;
diff --git a/community/acpitool/sysfs-battery.patch b/community/acpitool/sysfs-battery.patch
deleted file mode 100644
index 4f6898a78..000000000
--- a/community/acpitool/sysfs-battery.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -wbBur acpitool-0.5.1/src/acpitool.h acpitool-0.5.1.my/src/acpitool.h
---- acpitool-0.5.1/src/acpitool.h 2008-10-16 19:38:12.000000000 +0400
-+++ acpitool-0.5.1.my/src/acpitool.h 2011-11-10 21:55:23.000000000 +0400
-@@ -29,11 +29,11 @@
-
- struct Battery_Info {
- int Battery_Present;
-- char Charging_State[12];
-- char Remaining_Cap[10];
-- char Design_Cap[10];
-- char LastFull_Cap[10];
-- char Present_Rate[10];
-+ char Charging_State[13];
-+ char Remaining_Cap[13];
-+ char Design_Cap[13];
-+ char LastFull_Cap[13];
-+ char Present_Rate[13];
- char Technology[13];
- char Model[13];
- char Serial[13];
-diff -wbBur acpitool-0.5.1/src/battery.cpp acpitool-0.5.1.my/src/battery.cpp
---- acpitool-0.5.1/src/battery.cpp 2009-08-13 23:42:43.000000000 +0400
-+++ acpitool-0.5.1.my/src/battery.cpp 2011-11-10 21:48:22.000000000 +0400
-@@ -614,7 +614,7 @@
- }
-
- memset(str, '\0', 100);
-- for(int t=0; t<5; t++)
-+ for(int t=0; t<1; t++)
- fgets(str, 100, power_fp); /* skip first 5 lines */
-
- /* get battery status (full, charging, ...) */
-@@ -664,8 +664,8 @@
-
-
-
-- fgets(str, 100, power_fp); /* skip 1 line */
--
-+ fgets(str, 100, power_fp); /* cycle count - skip 1 line */
-+ fgets(str, 100, power_fp); /* voltage_min - skip 1 line */
-
- /* get voltage_now */
- memset(str, '\0', 100);
-@@ -756,7 +756,7 @@
- else
- strncpy(batt_info->Model, "unknown", 7);
-
-- fgets(str, 100, power_fp);
-+ fgets(str, 100, power_fp); /* manufacturer - skip 1 line */
-
- /* get serial */
- memset(str, '\0', 100);
diff --git a/community/amaya/PKGBUILD b/community/amaya/PKGBUILD
deleted file mode 100644
index b054eb7ad..000000000
--- a/community/amaya/PKGBUILD
+++ /dev/null
@@ -1,69 +0,0 @@
-# $Id: PKGBUILD 54286 2011-08-16 07:11:40Z bfanella $
-# Mantainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Zerial <fernando@zerial.org>
-# Contributor: Dalius <dagis@takas.lt>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=amaya
-pkgver=11.3.1
-pkgrel=8
-pkgdesc="W3C's Editor/Browser"
-arch=('i686' 'x86_64')
-url="http://www.w3.org/Amaya/"
-license=('Custom/BSD')
-depends=('wxgtk' 'libgl' 'raptor1' 'libxt')
-makedepends=('imake' 'chrpath')
-options=('!makeflags')
-install=$pkgname.install
-source=(amaya-fix-amaya-wxfile.patch amaya-fix-thotlib-png14.patch amaya-fix-thotlib-wxfile.patch amaya-splitmode.patch amaya-wakeupidle.patch amaya-wxyield.patch \
-http://www.w3.org/Amaya/Distribution/$pkgname-sources-$pkgver.tgz)
-md5sums=('4e79692553e88de93a3f56c40dd442dc'
- '0418f3a614e6d0a8e27ae038c78d8c4d'
- '6501c87f7ab45e6c1a3ef214a6ed583e'
- 'bc42d4b3ff7b43c8d0f7955dd1498b01'
- '32347b32aded742b705a2038416f74de'
- 'c42175f9cc9e90277547828b9cf6a92a'
- '4a92b4e043fbd1add5b1e17fb7ed8755')
-
-build() {
- cd $srcdir/Amaya$pkgver
-
- patch -p1 < $srcdir/amaya-fix-amaya-wxfile.patch
- patch -p1 < $srcdir/amaya-fix-thotlib-png14.patch
- patch -p1 < $srcdir/amaya-fix-thotlib-wxfile.patch
- patch -p1 < $srcdir/amaya-splitmode.patch
- patch -p1 < $srcdir/amaya-wakeupidle.patch
- patch -p1 < $srcdir/amaya-wxyield.patch
-
- cd Amaya
- if [ ! -d ./WX ]; then
- mkdir WX
- fi
- cd WX
-
- if [ "$CARCH" = "x86_64" ] ; then
- [ $NOEXTRACT -eq 1 ] || cp ../../Mesa/configs/linux-x86-64 ../../Mesa/configs/current
- else
- [ $NOEXTRACT -eq 1 ] || cp ../../Mesa/configs/linux-x86 ../../Mesa/configs/current
- fi
- ../configure --prefix=/usr/share --exec=/usr/share --datadir=/usr/share --enable-system-raptor --enable-system-wx
-
- make
-}
-
-package() {
- cd $srcdir/Amaya$pkgver/Amaya/WX
-
- install -d $pkgdir/usr/bin
- make prefix=$pkgdir/usr/share install
-
- ln -f -s ../share/Amaya/wx/bin/amaya $pkgdir/usr/bin/amaya
- install -Dm644 $srcdir/Amaya$pkgver/Amaya/amaya/COPYRIGHT \
- $pkgdir/usr/share/licenses/$pkgname/COPYRIGHT
-
- mkdir -p $pkgdir/usr/share/Amaya/lib
- cp -a $srcdir/Amaya$pkgver/Amaya/WX/Mesa/lib/libGL.so.1* $pkgdir/usr/share/Amaya/lib/
- cp -a $srcdir/Amaya$pkgver/Amaya/WX/Mesa/lib/libGLU.so.1* $pkgdir/usr/share/Amaya/lib/
- chrpath -r /usr/share/Amaya/lib $pkgdir/usr/share/Amaya/wx/bin/amaya_bin
- chrpath -r /usr/share/Amaya/lib $pkgdir/usr/share/Amaya/wx/bin/print
-}
diff --git a/community/amaya/amaya-fix-amaya-wxfile.patch b/community/amaya/amaya-fix-amaya-wxfile.patch
deleted file mode 100644
index 6f5b0cf5f..000000000
--- a/community/amaya/amaya-fix-amaya-wxfile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -aur Amaya11.3.1/Amaya/amaya/HTMLedit.c Amaya11.3.1.new/Amaya/amaya/HTMLedit.c
---- Amaya11.3.1/Amaya/amaya/HTMLedit.c 2009-12-09 11:11:22.000000000 +0100
-+++ Amaya11.3.1.new/Amaya/amaya/HTMLedit.c 2010-08-17 21:39:23.696495709 +0200
-@@ -1689,7 +1689,7 @@
- {
- #ifdef _WX
- wxString tmpFile = TtaConvMessageToWX(tempURL);
-- wxFile::wxFile (tmpFile, wxFile::write);
-+ wxFile (tmpFile, wxFile::write);
- #endif /* _WX */
- }
- }
-
diff --git a/community/amaya/amaya-fix-thotlib-png14.patch b/community/amaya/amaya-fix-thotlib-png14.patch
deleted file mode 100644
index 2231db2de..000000000
--- a/community/amaya/amaya-fix-thotlib-png14.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -aur Amaya11.3.1/Amaya/thotlib/image/pnghandler.c Amaya11.3.1.new/Amaya/thotlib/image/pnghandler.c
---- Amaya11.3.1/Amaya/thotlib/image/pnghandler.c 2009-09-09 11:54:50.000000000 +0200
-+++ Amaya11.3.1.new/Amaya/thotlib/image/pnghandler.c 2010-08-17 20:42:10.823505508 +0200
-@@ -10,9 +10,9 @@
- * R. Guetari (W3C/INRIA) - Initial Windows version
- */
-
-+#include "png.h"
- #include "thot_gui.h"
- #include "thot_sys.h"
--#include "png.h"
- #include "constmedia.h"
- #include "typemedia.h"
- #include "picture.h"
-@@ -128,13 +128,13 @@
- png_byte **ppbRowPointers;
- unsigned char *pixels;
- unsigned int i, j, passes;
-- unsigned long lw, lh;
-+ png_uint_32 lw, lh;
- int iBitDepth, iColorType;
- double dGamma;
-
- /* Checks the eight byte PNG signature*/
- fread (pbSig, 1, 8, pfFile);
-- if (!png_check_sig (pbSig, 8))
-+ if (png_sig_cmp (pbSig, 0, 8))
- return NULL;
- /* create the two png(-info) structures*/
- png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING,
-@@ -169,13 +169,13 @@
- png_set_strip_16 (png_ptr);
- /* Grayscale =>RGB or RGBA */
- if (iColorType == PNG_COLOR_TYPE_GRAY || iColorType == PNG_COLOR_TYPE_GRAY_ALPHA)
-- png_set_gray_to_rgb (png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- /* Palette indexed colors to RGB */
- if (iColorType == PNG_COLOR_TYPE_PALETTE)
- png_set_palette_to_rgb (png_ptr);
- /* 8 bits / channel is needed */
- if (iColorType == PNG_COLOR_TYPE_GRAY && iBitDepth < 8)
-- png_set_gray_1_2_4_to_8(png_ptr);
-+ png_set_expand_gray_1_2_4_to_8(png_ptr);
- /* all transparency type : 1 color, indexed => alpha channel*/
- if (png_get_valid (png_ptr, info_ptr,PNG_INFO_tRNS))
- png_set_tRNS_to_alpha (png_ptr);
-@@ -822,7 +822,7 @@
- TtaReadClose (fp);
- if (ret != 8)
- return FALSE;
-- ret = png_check_sig ((png_byte*)buf, 8);
-+ ret = !png_sig_cmp ((png_byte*)buf, 0, 8);
- if (ret) return (TRUE);
- return(FALSE);
- }
-
diff --git a/community/amaya/amaya-fix-thotlib-wxfile.patch b/community/amaya/amaya-fix-thotlib-wxfile.patch
deleted file mode 100644
index 537419040..000000000
--- a/community/amaya/amaya-fix-thotlib-wxfile.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -aur Amaya11.3.1/Amaya/thotlib/base/platform.c Amaya11.3.1.new/Amaya/thotlib/base/platform.c
---- Amaya11.3.1/Amaya/thotlib/base/platform.c 2009-12-02 12:23:07.000000000 +0100
-+++ Amaya11.3.1.new/Amaya/thotlib/base/platform.c 2010-08-17 21:37:25.699840595 +0200
-@@ -329,9 +329,9 @@
- {
- tmp = (char *)TtaGetMemory (strlen(targetFileName)+10);
- sprintf (tmp, "%s.tmp", targetFileName);
-- wxFile::wxFile (targetFile, wxFile::write);
-+ wxFile (targetFile, wxFile::write);
- tmpFile = TtaConvMessageToWX(tmp);
-- wxFile::wxFile (tmpFile, wxFile::write);
-+ wxFile (tmpFile, wxFile::write);
- result = wxFile::Exists(targetFile);
- if (result)
- result = wxConcatFiles (tmpFile, sourceFile, targetFile);
-
diff --git a/community/amaya/amaya-splitmode.patch b/community/amaya/amaya-splitmode.patch
deleted file mode 100644
index e733955e4..000000000
--- a/community/amaya/amaya-splitmode.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -aur Amaya11.3.1/Amaya/thotlib/dialogue/AmayaPage.cpp Amaya11.3.1.new/Amaya/thotlib/dialogue/AmayaPage.cpp
---- Amaya11.3.1/Amaya/thotlib/dialogue/AmayaPage.cpp 2009-09-09 12:07:49.000000000 +0200
-+++ Amaya11.3.1.new/Amaya/thotlib/dialogue/AmayaPage.cpp 2010-08-17 20:54:13.606772367 +0200
-@@ -383,7 +383,7 @@
- /*| wxSP_PERMIT_UNSPLIT*/
- #endif /* 0 */
- );
-- SetSplitMode(0); // undefined
-+ SetSplitMode(wxSPLIT_VERTICAL); // undefined not allowed
- p_sizerTop2->Add( m_pSplitterWindow, 1, wxEXPAND, 0 );
diff --git a/community/amaya/amaya-wakeupidle.patch b/community/amaya/amaya-wakeupidle.patch
deleted file mode 100644
index 45949f322..000000000
--- a/community/amaya/amaya-wakeupidle.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -aur Amaya11.3.1/Amaya/thotlib/base/AmayaApp.cpp Amaya11.3.1.new/Amaya/thotlib/base/AmayaApp.cpp
---- Amaya11.3.1/Amaya/thotlib/base/AmayaApp.cpp 2009-10-29 09:59:22.000000000 +0100
-+++ Amaya11.3.1.new/Amaya/thotlib/base/AmayaApp.cpp 2010-08-17 21:01:23.823806630 +0200
-@@ -326,7 +326,7 @@
-
- // Log window.
- // new wxLogWindow(NULL, wxT("Amaya traces"));
--
-+ wxWakeUpIdle();
- return true;
- }
diff --git a/community/amaya/amaya-wxyield.patch b/community/amaya/amaya-wxyield.patch
deleted file mode 100644
index 69235f5d4..000000000
--- a/community/amaya/amaya-wxyield.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aur Amaya11.3.1/Amaya/thotlib/dialogue/appdialogue_wx.c Amaya11.3.1.new/Amaya/thotlib/dialogue/appdialogue_wx.c
---- Amaya11.3.1/Amaya/thotlib/dialogue/appdialogue_wx.c 2009-09-15 17:17:02.000000000 +0200
-+++ Amaya11.3.1.new/Amaya/thotlib/dialogue/appdialogue_wx.c 2010-08-17 21:07:40.973352206 +0200
-@@ -993,7 +993,7 @@
- * this function waits for complete widgets initialisation */
- /* notice: no not use safe yield here because it use a
- wxWindowDisabler and it makes menus blinking */
-- wxYield();
-+ wxTheApp->Yield(TRUE);
- return TRUE;
- }
-
-@@ -1824,7 +1824,7 @@
- TtaHandlePendingEvents();
- /* wait for frame initialisation (needed by opengl)
- * this function waits for complete widgets initialisation */
-- wxYield();
-+ wxTheApp->Yield(TRUE);
- /* fix accessibility problem : force the created frame to get the focus */
- TtaRedirectFocus();
-
diff --git a/community/amaya/amaya.install b/community/amaya/amaya.install
deleted file mode 100644
index a3b887285..000000000
--- a/community/amaya/amaya.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- xdg-desktop-menu forceupdate &> /dev/null || :
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null || :
-}
-
-post_upgrade() {
- xdg-desktop-menu forceupdate &> /dev/null || :
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null || :
-}
-
-post_remove() {
- xdg-desktop-menu forceupdate &> /dev/null || :
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null || :
-}
diff --git a/community/apparix/PKGBUILD b/community/apparix/PKGBUILD
deleted file mode 100644
index c5a128a1a..000000000
--- a/community/apparix/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Contributor: Dave Pernu <u.owned@gmail.com>
-# Maintainer: Firmicus <francois.archlinux.org>
-
-pkgname=apparix
-pkgver=08.331
-_ver="08-331"
-pkgrel=2
-pkgdesc="Command line file browser with bookmark support"
-arch=('i686' 'x86_64')
-url="http://micans.org/apparix/"
-license=('GPL2')
-depends=('bash')
-options=('!docs' 'zipman')
-source=(http://micans.org/$pkgname/src/$pkgname-$_ver.tar.gz apparix.sh)
-md5sums=('0d7c9a2efecf5c7b44d2ce7c5844e5de'
- '70b984f427572f72e3475fd176c91d16')
-
-build()
-{
- cd ${srcdir}/$pkgname-$_ver
- ./configure --prefix=/usr --mandir=/usr/share/man
- make || return 1
- make DESTDIR=${pkgdir} install
-
- mkdir -p ${pkgdir}/etc/profile.d/
- install -m755 ${srcdir}/apparix.sh ${pkgdir}/etc/profile.d/
-}
diff --git a/community/apparix/apparix.sh b/community/apparix/apparix.sh
deleted file mode 100644
index 9bad62b82..000000000
--- a/community/apparix/apparix.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-function to()
-{
- if test "$2"; then
- cd "$(apparix "$1" "$2" || echo .)";
- else
- cd "$(apparix "$1" || echo .)";
- fi
- pwd
-}
-
-function bm()
-{
- if test "$2"; then
- apparix --add-mark "$1" "$2";
- elif test "$1"; then
- apparix --add-mark "$1";
- else
- apparix --add-mark;
- fi
-}
-
-function portal()
-{
- if test "$1"; then
- apparix --add-portal "$1";
- else
- apparix --add-portal;
- fi
-}
-
-function _apparix_aliases ()
-{ cur=$2
- dir=$3
- COMPREPLY=()
- if [ "$1" == "$3" ]
- then
- COMPREPLY=($(cat $HOME/.apparix{rc,expand}|grep "j,.*$cur.*,"|cut -f2 -d,))
- else
- dir=`apparix -favour lro $dir 2>/dev/null` || return 0
- eval_compreply="
- COMPREPLY=( $(cd "$dir" ; ls -d *$cur* |
- while read r
- do
- [[ -d "$r" ]] && [[ $r == *$cur* ]] && echo \"${r// /\\ }\"
- done))"
- eval $eval_compreply
- fi
- return 0
-}
-complete -F _apparix_aliases to
diff --git a/community/asix-module/PKGBUILD b/community/asix-module/PKGBUILD
deleted file mode 100644
index c3479d094..000000000
--- a/community/asix-module/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id$
-# Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-
-pkgname=asix-module
-pkgver=4.2.0
-pkgrel=1
-pkgdesc="A kernel module for the ASIX USB 2.0 low power AX88772B/AX88772A/AX88760/AX88772/AX88178 ethernet controllers"
-url="http://www.asix.com.tw"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('glibc' 'linux>=3.1' 'linux<3.2')
-makedepends=('linux-headers')
-source=(http://www.asix.com.tw/FrootAttach/driver/AX88772B_772A_760_772_178_LINUX_Driver_v${pkgver}_Source.zip)
-install=$pkgname.install
-
-_extramodules=extramodules-3.1-ARCH
-_kernver="$(cat /lib/modules/$_extramodules/version || true)"
-
-build() {
- cd "$srcdir/AX88772B_772A_760_772_178_LINUX_Driver_v4.2.0_Source"
- make SYSSRC=/usr/src/linux-$_kernver
- gzip -f9 asix.ko
-}
-
-package() {
- cd "$srcdir/AX88772B_772A_760_772_178_LINUX_Driver_v4.2.0_Source"
- install -D -m644 asix.ko.gz "$pkgdir/lib/modules/$_extramodules/asix.ko.gz"
-}
-
-md5sums=('b3261d17e21b026d2c50dbc54227eb9c')
-sha256sums=('cac6b217672399439b571c77232f4beb22a5dffb54afeaf714c2b7559d41493d')
diff --git a/community/asix-module/asix-module.install b/community/asix-module/asix-module.install
deleted file mode 100644
index 54bfb9ff4..000000000
--- a/community/asix-module/asix-module.install
+++ /dev/null
@@ -1,15 +0,0 @@
-rebuild_module_dependencies() {
- EXTRAMODULES='extramodules-3.1-ARCH'
- depmod $(cat /lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
- rebuild_module_dependencies
-}
-post_upgrade() {
- rebuild_module_dependencies
-}
-
-post_remove() {
- rebuild_module_dependencies
-}
diff --git a/community/avant-window-navigator/PKGBUILD b/community/avant-window-navigator/PKGBUILD
deleted file mode 100644
index 0208571dd..000000000
--- a/community/avant-window-navigator/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 30927 2010-10-23 16:23:21Z schuay $
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Timm Preetz <timm@preetz.us>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=avant-window-navigator
-pkgver=0.4.0
-pkgrel=10
-pkgdesc="Fully customisable dock-like window navigator for GNOME"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/awn"
-license=('GPL')
-# bzr needs to be in depends: see FS#21434
-depends=('libwnck' 'gconf' 'python2' 'hicolor-icon-theme' 'pyxdg' 'libgtop' \
- 'python-feedparser' 'xdg-utils' 'libdesktop-agnostic' 'dbus-python' 'bzr')
-makedepends=('intltool' 'gnome-doc-utils' 'vala')
-install=${pkgname}.install
-options=('!libtool')
-source=(https://edge.launchpad.net/awn/0.4/${pkgver}/+download/${pkgname}-${pkgver}.tar.gz
- 'awn-applet-simple.patch')
-md5sums=('03654b45dd95cbb83fa7e112bd00523c'
- 'abd1200504e6a4a8961a3fe0a4a99363')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- # FS#19084
- patch -p0 < ${srcdir}/awn-applet-simple.patch
-
- PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/usr/share
-
- sed -i 's|${prefix}/etc|${prefix}/share|' Makefile
-
- str='\(.*"theme_tooltip_outline_color".*\)'
- sed -i "s|$str|#\1|" awn-settings/awnSettings.py
-
- # python2 fix
- sed -i 's_with ("python"_with ("python2"_' applet-activation/main.c
- for file in $(find . -name '*.py' -print); do
- sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
- sed -i 's_#!/usr/bin/python_#!/usr/bin/python2_' $file
- done
-
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
-
- gconf-merge-schema "$pkgdir/usr/share/gconf/awn.schemas" \
- "$pkgdir"/usr/share/gconf/schemas/*.schemas
-
- rm "$pkgdir"/usr/share/gconf/schemas/*.schemas
- mv "$pkgdir"/usr/share/gconf/{,schemas/}awn.schemas
-}
-# vim:set ts=2 sw=2 et:
diff --git a/community/avant-window-navigator/avant-window-navigator.install b/community/avant-window-navigator/avant-window-navigator.install
deleted file mode 100644
index d7e5d4937..000000000
--- a/community/avant-window-navigator/avant-window-navigator.install
+++ /dev/null
@@ -1,29 +0,0 @@
-pkgname=awn
-
-post_install() {
- echo "Installing schema..."
- gconfpkg --install ${pkgname}
-
- echo "Updating desktop..."
- update-desktop-database -q
- which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- echo "Removing schema..."
- gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- echo "Updating desktop..."
- update-desktop-database -q
- which xdg-icon-resource 1>/dev/null 2>/dev/null && xdg-icon-resource forceupdate || true
-}
diff --git a/community/avant-window-navigator/awn-applet-simple.patch b/community/avant-window-navigator/awn-applet-simple.patch
deleted file mode 100644
index 699e21f39..000000000
--- a/community/avant-window-navigator/awn-applet-simple.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- libawn/awn-applet-simple.c 2010-02-12 18:37:38.000000000 -0600
-+++ libawn/awn-applet-simple.c 2010-04-13 21:42:28.000000000 -0500
-@@ -393,16 +393,16 @@
- GStrv states,
- GStrv icon_names)
- {
-- gchar *applet_name;
-+ gchar *applet_name=NULL;
-
- g_return_if_fail (AWN_IS_APPLET_SIMPLE (applet));
-- g_return_if_fail (applet_name);
- g_return_if_fail (states);
- g_return_if_fail (icon_names);
-
- g_object_get (applet,
- "canonical-name",&applet_name,
- NULL);
-+ g_return_if_fail (applet_name);
- applet->priv->last_set_icon = ICON_THEMED_MANY;
- awn_themed_icon_set_size (AWN_THEMED_ICON (applet->priv->icon),
- awn_applet_get_size (AWN_APPLET (applet)));
diff --git a/community/awn-extras-applets/PKGBUILD b/community/awn-extras-applets/PKGBUILD
deleted file mode 100644
index 2379fd74e..000000000
--- a/community/awn-extras-applets/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 41460 2011-03-06 17:46:31Z jelle $
-# Contributor: Biru Ionut <ionut@archlinux.ro>
-# Contributor: Jonathan Liu <net147@hotmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=awn-extras-applets
-pkgver=0.4.0
-pkgrel=8
-pkgdesc="A collection of applets for avant-window-navigator"
-arch=('i686' 'x86_64')
-url="https://launchpad.net/awn-extras"
-license=('GPL2')
-depends=('avant-window-navigator' 'gnome-menus' 'libgtop' 'libnotify'
- 'libsexy' 'vte' 'gstreamer0.10-python')
-makedepends=('intltool' 'libdesktop-agnostic' 'vala')
-optdepends=('python-notify: needed for some applets'
- 'python-vobject: needed for some applets')
-provides=('avant-window-navigator-extras')
-install=awn-extras-applets.install
-options=('!libtool')
-source=(http://launchpad.net/awn-extras/0.4/0.4.0/+download/awn-extras-0.4.0.tar.gz \
- awn-extras-libnotify0.7.patch)
-md5sums=('b559d68cd6ad295c961c20fcc5d9f9c0'
- '7999955956d1d2457b4c3b50ffd3199d')
-
-build() {
- cd ${srcdir}/${pkgname/-applets/}-${pkgver}
- patch -Np1 -i $srcdir/awn-extras-libnotify0.7.patch
- ./configure --prefix=/usr --sysconfdir=/etc --disable-pymod-checks
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname/-applets/}-${pkgver}
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
-
- # yes... theses guys can not even get a "#!" right
- sed -i -e "s|#[ ]*[!]*[ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- -e "s|#[ ]*![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- $(find $pkgdir/usr/share/avant-window-navigator/applets/ -name '*.py') \
- $pkgdir/usr/lib/python2.7/site-packages/awn/extras/awnmediaplayers.py
-
- mkdir -p ${pkgdir}/usr/share/gconf/schemas
- gconf-merge-schema ${pkgdir}/usr/share/gconf/schemas/awn-extras.schemas \
- ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
- rmdir --ignore-fail-on-non-empty -p ${pkgdir}/usr/share/locale
- rmdir --ignore-fail-on-non-empty -p ${pkgdir}/etc/gconf/schemas
-}
-# vim:set ts=2 sw=2 et:
diff --git a/community/awn-extras-applets/aff-results.patch b/community/awn-extras-applets/aff-results.patch
deleted file mode 100644
index b36a9d9f9..000000000
--- a/community/awn-extras-applets/aff-results.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- awn-extras-applets-0.2.6.orig/src/affinity/aff-results.c 2008-02-15 03:49:53.000000000 +1100
-+++ awn-extras-applets-0.2.6/src/affinity/aff-results.c 2008-03-03 17:42:07.000000000 +1100
-@@ -422,7 +422,7 @@
- const char *name = gnome_vfs_mime_application_get_name (app);
- const char *icon_name = gnome_vfs_mime_application_get_icon (app);
- #elif defined(LIBAWN_USE_XFCE)
-- ThunarVfsMimeApplication *app = (ThunarVfsApplication *)a->data;
-+ ThunarVfsMimeApplication *app = (ThunarVfsMimeApplication *)a->data;
- const char *name = thunar_vfs_mime_application_get_name (app);
- const char *icon_name = thunar_vfs_mime_handler_lookup_icon_name (THUNAR_VFS_MIME_HANDLER (app), gtk_icon_theme_get_default ());
- #else
diff --git a/community/awn-extras-applets/awn-extras-applets.install b/community/awn-extras-applets/awn-extras-applets.install
deleted file mode 100644
index 93e2e13e6..000000000
--- a/community/awn-extras-applets/awn-extras-applets.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
- usr/sbin/gconfpkg --install awn-extras
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall awn-extras
- gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_remove() {
- update-desktop-database -q
-}
diff --git a/community/awn-extras-applets/awn-extras-libnotify0.7.patch b/community/awn-extras-applets/awn-extras-libnotify0.7.patch
deleted file mode 100644
index 63b282b70..000000000
--- a/community/awn-extras-applets/awn-extras-libnotify0.7.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -aur awn-extras-0.4.0/applets/maintained/notification-daemon/daemon.c awn-extras-0.4.0-new//applets/maintained/notification-daemon/daemon.c
---- awn-extras-0.4.0/applets/maintained/notification-daemon/daemon.c 2010-04-09 16:26:20.000000000 -0700
-+++ awn-extras-0.4.0-new//applets/maintained/notification-daemon/daemon.c 2011-03-06 09:33:33.603336393 -0800
-@@ -1487,7 +1487,15 @@
- if (fork() == 0)
- {
- notify_init("notify-send");
-- notify = notify_notification_new(summary, body, icon_str, NULL);
-+ #ifdef NOTIFY_CHECK_VERSION
-+ #if NOTIFY_CHECK_VERSION (0, 7, 0)
-+ notify = notify_notification_new(summary, body, icon_str);
-+ #else
-+ notify = notify_notification_new(summary, body, icon_str, NULL);
-+ #endif
-+ #else
-+ notify = notify_notification_new(summary, body, icon_str, NULL);
-+ #endif
- notify_notification_set_category(notify, type);
- notify_notification_set_urgency(notify, urgency);
- notify_notification_set_timeout(notify, expire_timeout);
diff --git a/community/awn-extras-applets/weather.patch b/community/awn-extras-applets/weather.patch
deleted file mode 100644
index 62bfb4dbd..000000000
--- a/community/awn-extras-applets/weather.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/awn-extras-applets-0.2.6/src/weather/weather.py~ 2008-05-09 02:20:39.000000000 +0200
-+++ src/awn-extras-applets-0.2.6/src/weather/weather.py 2008-05-09 02:21:06.000000000 +0200
-@@ -315,7 +315,7 @@
-
-
- def get_conditions(self):
-- url = 'http://xoap.weather.com/weather/local/' + self.location_code + '?cc=*&prod=xoap&par=1048871467&key=12daac2f3a67cb39'
-+ url = 'http://xoap.weather.com/weather/local/' + self.location_code + '?cc=*&link=xoap&par=1048871467&key=12daac2f3a67cb39'
- if self.units == "Metric":
- url = url + '&unit=m'
- try:
diff --git a/community/bmpanel/PKGBUILD b/community/bmpanel/PKGBUILD
deleted file mode 100644
index 58dcb1874..000000000
--- a/community/bmpanel/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: nsf <no.smile.face@gmail.com>
-
-pkgname=bmpanel
-pkgver=0.9.27
-pkgrel=3
-pkgdesc="A modern, NETWM compliant, bitmap theme-based x11 panel."
-arch=('i686' 'x86_64')
-url="http://nsf.110mb.com/bmpanel/"
-license=('custom')
-depends=('imlib2' 'fontconfig' 'libxrender' 'libxcomposite' 'ttf-dejavu')
-source=(http://nsf.110mb.com/bmpanel/$pkgname-$pkgver.tar.gz)
-md5sums=('23c2ecc89ec386a94b962a3d55403b24')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- ./configure --prefix=/usr || return 1
- make || return 1
-}
-package() {
- cd $srcdir/$pkgname-$pkgver
- DESTDIR=$pkgdir make install || return 1
-
- install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/community/clementine/clementine-0.7.1-fix-devicekit.patch b/community/clementine/clementine-0.7.1-fix-devicekit.patch
deleted file mode 100644
index 797a2c864..000000000
--- a/community/clementine/clementine-0.7.1-fix-devicekit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur clementine-0.7.1.ori/src/config.h.in clementine-0.7.1/src/config.h.in
---- clementine-0.7.1.ori/src/config.h.in 2011-03-29 12:16:15.000000000 -0700
-+++ clementine-0.7.1/src/config.h.in 2011-05-09 16:00:26.505080057 -0700
-@@ -29,6 +29,7 @@
- #cmakedefine HAVE_STATIC_SQLITE
-
- #cmakedefine HAVE_DBUS
-+#cmakedefine HAVE_DEVICEKIT
- #cmakedefine HAVE_GIO
- #cmakedefine HAVE_IMOBILEDEVICE
- #cmakedefine HAVE_LIBARCHIVE
diff --git a/community/clipgrab/PKGBUILD b/community/clipgrab/PKGBUILD
deleted file mode 100644
index d173f4ef5..000000000
--- a/community/clipgrab/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 59252 2011-11-22 02:19:48Z ebelanger $
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: thacrazze <thacrazze|googlemail|com>
-
-pkgname=clipgrab
-pkgver=3.1.3.0
-pkgrel=1
-pkgdesc='A video downloader and converter for YouTube, Veoh, DailyMotion, MyVideo, ...'
-arch=('i686' 'x86_64')
-url='http://clipgrab.de/'
-license=('GPL3')
-depends=('qt')
-optdepends=('ffmpeg: for some encodings')
-source=(http://clipgrab.de/download/${pkgname}-${pkgver}.tar.bz2
- ${pkgname}.desktop)
-md5sums=('3e8f5ab9ef0144fa234cf3b725797123'
- '9a141791f6952917c441050c3dac81ce')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- qmake
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- install -Dm755 ${pkgname} "$pkgdir/usr/bin/${pkgname}"
- install -Dm644 icon.png "$pkgdir/usr/share/pixmaps/${pkgname}.png"
- install -Dm644 "$srcdir/${pkgname}.desktop" \
- "${pkgdir}/usr/share/applications/${pkgname}.desktop"
-}
diff --git a/community/clipgrab/clipgrab.desktop b/community/clipgrab/clipgrab.desktop
deleted file mode 100644
index dad31cfdd..000000000
--- a/community/clipgrab/clipgrab.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Type=Application
-Encoding=UTF-8
-Name=ClipGrab
-GenericName=Video Downloader
-GenericName[de]=Video-Downloader
-Comment=Download videos and convert it
-Comment[de]=Videos herunterladen und konvertieren
-Icon=/usr/share/pixmaps/clipgrab.png
-Exec=clipgrab
-TryExec=clipgrab
-Terminal=false
-Categories=Qt;AudioVideo;Audio;Video;
diff --git a/community/compizconfig-backend-kconfig4/PKGBUILD b/community/compizconfig-backend-kconfig4/PKGBUILD
deleted file mode 100644
index 8c404704c..000000000
--- a/community/compizconfig-backend-kconfig4/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 52303 2011-07-23 10:45:04Z rvanharen $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=compizconfig-backend-kconfig4
-pkgver=0.8.8
-pkgrel=1
-pkgdesc="Compizconfig backend for kconfig4"
-arch=('i686' 'x86_64')
-url="http://www.compiz.org/"
-license=('GPL2')
-depends=('libcompizconfig' 'kdelibs' 'libxcomposite' 'libxinerama')
-makedepends=('cmake' 'automoc4')
-groups=('compiz-fusion-kde' 'compiz-fusion')
-source=("http://releases.compiz.org/${pkgver}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d7a29339b47233ad53fe04ca0136fdb511b945ac')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/community/conkeror-git/PKGBUILD b/community/conkeror-git/PKGBUILD
deleted file mode 100644
index 01336992b..000000000
--- a/community/conkeror-git/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Contributor: Heeru Kiyura <M8R-p9i5nh@mailinator.com>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-
-_commit=b0882d615876ec7c1554e50b652bed79209da4d6
-pkgname=conkeror-git
-pkgver=1.0pre
-pkgrel=3
-pkgdesc="A highly programmable web browser based on Mozilla XULRunner."
-arch=('i686' 'x86_64')
-url="http://conkeror.mozdev.org/"
-license=('MPL' 'GPL' 'LGPL')
-depends=('xulrunner' 'desktop-file-utils')
-makedepends=('git')
-provides=('conkeror')
-source=(conkeror_gimpfile.xpm conkeror.sh)
-md5sums=('b592582a5b923db1707615564a95737f'
- '11c6c76a2639254754b34a542f1965a1')
-install=conkeror-git.install
-
-__gitroot="git://repo.or.cz/conkeror.git"
-__gitname="conkeror"
-
-build() {
- cd "$srcdir"
-
- ## Git checkout
- if [ -d "$srcdir/${__gitname}" ] ; then
- msg "Git checkout: Updating existing tree"
- cd ${__gitname} && git checkout ${_commit}
- msg "Git checkout: Tree has been updated"
- else
- msg "Git checkout: Retrieving sources"
- git clone ${__gitroot} && cd ${__gitname} && git checkout ${_commit}
- fi
- msg "Checkout completed"
-
- ## Build
- [ -d ${__gitname}-build ] || rm -rf "$srcdir/${__gitname}-build"
- git clone "$srcdir/${__gitname}" "$srcdir/${__gitname}-build"
- cd "$srcdir/${__gitname}-build"
- make
-}
-
-package() {
- cd "$srcdir/${__gitname}-build"
- install -d "$pkgdir"/usr/share/{conkeror,man/man1}
- cp -a "$srcdir"/${__gitname}-build/* "$pkgdir/usr/share/conkeror"
- install -Dm644 "$pkgdir/usr/share/conkeror/contrib/man/conkeror.1" \
- "$pkgdir/usr/share/man/man1/conkeror.1"
- rm -r "$pkgdir/usr/share/conkeror/contrib/man"
- install -Dm644 "$srcdir/${__gitname}-build/debian/conkeror.desktop" \
- "$pkgdir/usr/share/applications/conkeror.desktop"
- rm -r "$pkgdir/usr/share/conkeror/debian"
- install -Dm644 "$srcdir/conkeror_gimpfile.xpm" "$pkgdir/usr/share/pixmaps/conkeror_gimpfile.xpm"
- install -Dm755 "$srcdir/conkeror.sh" "$pkgdir/usr/bin/conkeror"
-}
diff --git a/community/conkeror-git/conkeror-git.install b/community/conkeror-git/conkeror-git.install
deleted file mode 100644
index 308f27d33..000000000
--- a/community/conkeror-git/conkeror-git.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
-}
diff --git a/community/conkeror-git/conkeror.sh b/community/conkeror-git/conkeror.sh
deleted file mode 100644
index 963720513..000000000
--- a/community/conkeror-git/conkeror.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-exec xulrunner /usr/share/conkeror/application.ini "$@"
diff --git a/community/conkeror-git/conkeror_gimpfile.xpm b/community/conkeror-git/conkeror_gimpfile.xpm
deleted file mode 100644
index ee2dc0773..000000000
--- a/community/conkeror-git/conkeror_gimpfile.xpm
+++ /dev/null
@@ -1,2251 +0,0 @@
-/* XPM */
-static char * conkeror_gimpfile_xpm[] = {
-"337 274 1974 2",
-" c None",
-". c #BD8A7A",
-"+ c #F1D9A4",
-"@ c #587533",
-"# c #2F6B20",
-"$ c #347028",
-"% c #38732C",
-"& c #3D7630",
-"* c #437935",
-"= c #487D3C",
-"- c #4F8141",
-"; c #558447",
-"> c #558546",
-", c #4C7F3D",
-"' c #417935",
-") c #5C7736",
-"! c #9D9C64",
-"~ c #29671B",
-"{ c #2D6A1E",
-"] c #2C6A1E",
-"^ c #2D6A1F",
-"/ c #2C6A1F",
-"( c #2B6A1E",
-"_ c #2D6B1F",
-": c #326D25",
-"< c #39732C",
-"[ c #4B7E3E",
-"} c #578546",
-"| c #4C8040",
-"1 c #427934",
-"2 c #367129",
-"3 c #2C691E",
-"4 c #246314",
-"5 c #EBD49F",
-"6 c #266619",
-"7 c #36712A",
-"8 c #4E8040",
-"9 c #538346",
-"0 c #467B39",
-"a c #38722B",
-"b c #2B6A1D",
-"c c #246414",
-"d c #DAC691",
-"e c #2A681C",
-"f c #2C6A1D",
-"g c #2D6B21",
-"h c #39722A",
-"i c #558346",
-"j c #487D3B",
-"k c #39722B",
-"l c #2D6B20",
-"m c #246417",
-"n c #236415",
-"o c #497C3C",
-"p c #568246",
-"q c #326F25",
-"r c #256516",
-"s c #2B681C",
-"t c #336F25",
-"u c #417733",
-"v c #558147",
-"w c #457B37",
-"x c #336E25",
-"y c #2C691D",
-"z c #276618",
-"A c #246415",
-"B c #26631A",
-"C c #276219",
-"D c #266119",
-"E c #2D6620",
-"F c #437A36",
-"G c #4D7F3F",
-"H c #2B6A1F",
-"I c #276619",
-"J c #2D6B1E",
-"K c #2B681D",
-"L c #2A661C",
-"M c #27641B",
-"N c #256219",
-"O c #316A25",
-"P c #316D24",
-"Q c #28681A",
-"R c #246516",
-"S c #2B691D",
-"T c #2A671C",
-"U c #28651C",
-"V c #266219",
-"W c #2A651E",
-"X c #457A37",
-"Y c #417834",
-"Z c #2F6C20",
-"` c #2C6B1E",
-" . c #2B691B",
-".. c #27641A",
-"+. c #28641B",
-"@. c #3D7430",
-"#. c #2E6B20",
-"$. c #2E6B1F",
-"%. c #2D6C1F",
-"&. c #2A691C",
-"*. c #2A691B",
-"=. c #2C6B1F",
-"-. c #2B681E",
-";. c #29651B",
-">. c #27621A",
-",. c #27631C",
-"'. c #3F7631",
-"). c #306C22",
-"!. c #2D6C20",
-"~. c #2E6C1F",
-"{. c #2E6C20",
-"]. c #29691B",
-"^. c #27631A",
-"/. c #2A641D",
-"(. c #508042",
-"_. c #357028",
-":. c #2A691A",
-"<. c #29671D",
-"[. c #28631A",
-"}. c #2F6821",
-"|. c #4E8242",
-"1. c #407733",
-"2. c #2E6D20",
-"3. c #2D6D21",
-"4. c #26621A",
-"5. c #3A722F",
-"6. c #336F27",
-"7. c #2D6D20",
-"8. c #28691A",
-"9. c #29661B",
-"0. c #2D6720",
-"a. c #508142",
-"b. c #447B38",
-"c. c #2E6D21",
-"d. c #27681A",
-"e. c #467B38",
-"f. c #3C7630",
-"g. c #2D6C21",
-"h. c #2E6E21",
-"i. c #2F6E21",
-"j. c #2F6D21",
-"k. c #276818",
-"l. c #2E6C21",
-"m. c #2B671C",
-"n. c #266118",
-"o. c #366E29",
-"p. c #38712A",
-"q. c #266718",
-"r. c #2E6E20",
-"s. c #316924",
-"t. c #558347",
-"u. c #347027",
-"v. c #2E6E22",
-"w. c #2F6E22",
-"x. c #2F6F21",
-"y. c #266818",
-"z. c #2D6821",
-"A. c #558547",
-"B. c #548246",
-"C. c #2F6D20",
-"D. c #2F6F22",
-"E. c #246617",
-"F. c #2B691E",
-"G. c #29651C",
-"H. c #2C6720",
-"I. c #538246",
-"J. c #548347",
-"K. c #2E6F21",
-"L. c #256716",
-"M. c #29671C",
-"N. c #367027",
-"O. c #2F6F23",
-"P. c #306F22",
-"Q. c #236615",
-"R. c #2A681E",
-"S. c #28631B",
-"T. c #2F6921",
-"U. c #3A742C",
-"V. c #2E6F22",
-"W. c #2F7022",
-"X. c #2F7023",
-"Y. c #216515",
-"Z. c #336C26",
-"`. c #417833",
-" + c #307022",
-".+ c #307023",
-"++ c #216513",
-"@+ c #3D742F",
-"#+ c #497D3C",
-"$+ c #2F7123",
-"%+ c #226614",
-"&+ c #4A7F3C",
-"*+ c #578348",
-"=+ c #306D24",
-"-+ c #307123",
-";+ c #2B6C1E",
-">+ c #568248",
-",+ c #3B752F",
-"'+ c #307124",
-")+ c #317123",
-"!+ c #356D29",
-"~+ c #4A7F3E",
-"{+ c #306F23",
-"]+ c #307224",
-"^+ c #286B1B",
-"/+ c #276B1A",
-"(+ c #4C803E",
-"_+ c #357027",
-":+ c #317124",
-"<+ c #317224",
-"[+ c #477C3A",
-"}+ c #307122",
-"|+ c #2F7124",
-"1+ c #307024",
-"2+ c #317225",
-"3+ c #256218",
-"4+ c #2D7020",
-"5+ c #2D6E20",
-"6+ c #307225",
-"7+ c #317325",
-"8+ c #276C1A",
-"9+ c #384E16",
-"0+ c #2C681D",
-"a+ c #27631B",
-"b+ c #256118",
-"c+ c #367128",
-"d+ c #2D6D1F",
-"e+ c #307325",
-"f+ c #307324",
-"g+ c #317324",
-"h+ c #567834",
-"i+ c #296C1D",
-"j+ c #2F6923",
-"k+ c #508243",
-"l+ c #2F7024",
-"m+ c #307223",
-"n+ c #317326",
-"o+ c #327326",
-"p+ c #518244",
-"q+ c #317426",
-"r+ c #327425",
-"s+ c #327426",
-"t+ c #246917",
-"u+ c #2A671D",
-"v+ c #3B722F",
-"w+ c #326E24",
-"x+ c #327325",
-"y+ c #317425",
-"z+ c #2C7120",
-"A+ c #2A661D",
-"B+ c #2C661F",
-"C+ c #327526",
-"D+ c #327527",
-"E+ c #266C19",
-"F+ c #2D1616",
-"G+ c #2E1717",
-"H+ c #305716",
-"I+ c #518245",
-"J+ c #317526",
-"K+ c #327427",
-"L+ c #7B8B4D",
-"M+ c #C0A880",
-"N+ c #2B6E1E",
-"O+ c #28641A",
-"P+ c #427936",
-"Q+ c #317527",
-"R+ c #316C21",
-"S+ c #327627",
-"T+ c #266B19",
-"U+ c #2A681D",
-"V+ c #29641D",
-"W+ c #327628",
-"X+ c #337627",
-"Y+ c #2B7120",
-"Z+ c #317223",
-"`+ c #266218",
-" @ c #548547",
-".@ c #4B7F3F",
-"+@ c #337527",
-"@@ c #337628",
-"#@ c #246C18",
-"$@ c #2A5315",
-"%@ c #4B803F",
-"&@ c #447B36",
-"*@ c #327528",
-"=@ c #337728",
-"-@ c #327728",
-";@ c #BAAD7B",
-">@ c #2D6F1F",
-",@ c #2F6E20",
-"'@ c #437A35",
-")@ c #3D7531",
-"!@ c #312117",
-"~@ c #2E6D22",
-"{@ c #37702A",
-"]@ c #38722C",
-"^@ c #347729",
-"/@ c #337729",
-"(@ c #307525",
-"_@ c #BCA47D",
-":@ c #E4CC9B",
-"<@ c #28681B",
-"[@ c #2A661B",
-"}@ c #326A26",
-"|@ c #337829",
-"1@ c #3E2723",
-"2@ c #8A7359",
-"3@ c #CDB68A",
-"4@ c #2F7223",
-"5@ c #307125",
-"6@ c #337828",
-"7@ c #347828",
-"8@ c #246517",
-"9@ c #432C26",
-"0@ c #A68E6D",
-"a@ c #226215",
-"b@ c #317125",
-"c@ c #2C6620",
-"d@ c #316D23",
-"e@ c #337526",
-"f@ c #347829",
-"g@ c #34782A",
-"h@ c #EDD5A1",
-"i@ c #78604C",
-"j@ c #D8C092",
-"k@ c #2E7121",
-"l@ c #306D22",
-"m@ c #584135",
-"n@ c #C6AF85",
-"o@ c #BEAA7E",
-"p@ c #29651E",
-"q@ c #2F6D23",
-"r@ c #347728",
-"s@ c #347929",
-"t@ c #34792A",
-"u@ c #4D362D",
-"v@ c #2A6C1C",
-"w@ c #2A651D",
-"x@ c #337727",
-"y@ c #35792A",
-"z@ c #296D1E",
-"A@ c #2F1818",
-"B@ c #574034",
-"C@ c #D4BC8F",
-"D@ c #357929",
-"E@ c #347A2A",
-"F@ c #357A2A",
-"G@ c #34792B",
-"H@ c #236617",
-"I@ c #61493C",
-"J@ c #D0B98C",
-"K@ c #2B651F",
-"L@ c #35782A",
-"M@ c #347A2B",
-"N@ c #553E33",
-"O@ c #2E7223",
-"P@ c #38732A",
-"Q@ c #357A2B",
-"R@ c #316B24",
-"S@ c #3D752F",
-"T@ c #337528",
-"U@ c #35792B",
-"V@ c #357B2A",
-"W@ c #357B2B",
-"X@ c #307425",
-"Y@ c #2C6F1F",
-"Z@ c #427A36",
-"`@ c #367B2C",
-" # c #286D1E",
-".# c #2D1717",
-"+# c #77604C",
-"@# c #E7CF9D",
-"## c #4A7E3D",
-"$# c #357B2C",
-"%# c #226416",
-"&# c #A38B6B",
-"*# c #2E7022",
-"=# c #528448",
-"-# c #357C2C",
-";# c #442D27",
-"># c #718448",
-",# c #28651B",
-"'# c #548448",
-")# c #367C2C",
-"!# c #2E7425",
-"~# c #2E1716",
-"{# c #A99170",
-"]# c #38732B",
-"^# c #357C2D",
-"/# c #367C2D",
-"(# c #377C2C",
-"_# c #276B1D",
-":# c #DDC595",
-"<# c #316B25",
-"[# c #457A38",
-"}# c #377C2D",
-"|# c #9B9A65",
-"1# c #2A6B1C",
-"2# c #528546",
-"3# c #377D2D",
-"4# c #367D2D",
-"5# c #367D2E",
-"6# c #357C2B",
-"7# c #377D2E",
-"8# c #CCB489",
-"9# c #2D7122",
-"0# c #377E2D",
-"a# c #367E2E",
-"b# c #2E7424",
-"c# c #6B5343",
-"d# c #A78F6E",
-"e# c #2E6821",
-"f# c #377E2E",
-"g# c #266B1B",
-"h# c #988063",
-"i# c #307526",
-"j# c #29661C",
-"k# c #56874A",
-"l# c #367B2B",
-"m# c #BAAE7B",
-"n# c #2E1617",
-"o# c #B8A07B",
-"p# c #588749",
-"q# c #337929",
-"r# c #357A2C",
-"s# c #367E2D",
-"t# c #387F2E",
-"u# c #387F2F",
-"v# c #5B4438",
-"w# c #29631B",
-"x# c #3D7632",
-"y# c #377E2F",
-"z# c #347C2B",
-"A# c #286D1D",
-"B# c #37702D",
-"C# c #538647",
-"D# c #367D2C",
-"E# c #377F2F",
-"F# c #2E7423",
-"G# c #528547",
-"H# c #367A2B",
-"I# c #387E2F",
-"J# c #37802F",
-"K# c #256B1A",
-"L# c #2E7222",
-"M# c #3F7732",
-"N# c #387F30",
-"O# c #38802F",
-"P# c #D2BF8D",
-"Q# c #38712D",
-"R# c #33782A",
-"S# c #357829",
-"T# c #387E2E",
-"U# c #388030",
-"V# c #347628",
-"W# c #266319",
-"X# c #337B2C",
-"Y# c #236717",
-"Z# c #317427",
-"`# c #497E3C",
-" $ c #398030",
-".$ c #388130",
-"+$ c #388031",
-"@$ c #398130",
-"#$ c #2C7223",
-"$$ c #276319",
-"%$ c #2D691E",
-"&$ c #388131",
-"*$ c #246919",
-"=$ c #2F1717",
-"-$ c #2F1817",
-";$ c #286C1C",
-">$ c #337629",
-",$ c #276118",
-"'$ c #3D7530",
-")$ c #377F2E",
-"!$ c #398031",
-"~$ c #398131",
-"{$ c #301718",
-"]$ c #2F1718",
-"^$ c #2E1718",
-"/$ c #366E2B",
-"($ c #327727",
-"_$ c #3A8232",
-":$ c #301717",
-"<$ c #311817",
-"[$ c #301817",
-"}$ c #301818",
-"|$ c #2D7223",
-"1$ c #28661B",
-"2$ c #367028",
-"3$ c #398232",
-"4$ c #337B2A",
-"5$ c #311818",
-"6$ c #2E6822",
-"7$ c #398231",
-"8$ c #3A8231",
-"9$ c #2B7222",
-"0$ c #321918",
-"a$ c #321818",
-"b$ c #321718",
-"c$ c #311718",
-"d$ c #311717",
-"e$ c #307527",
-"f$ c #316E24",
-"g$ c #2E6D1F",
-"h$ c #398132",
-"i$ c #236918",
-"j$ c #331918",
-"k$ c #331818",
-"l$ c #321819",
-"m$ c #2B661E",
-"n$ c #508244",
-"o$ c #398332",
-"p$ c #341819",
-"q$ c #331919",
-"r$ c #341918",
-"s$ c #331819",
-"t$ c #2A691D",
-"u$ c #3A8233",
-"v$ c #351919",
-"w$ c #341919",
-"x$ c #351819",
-"y$ c #286C1D",
-"z$ c #4E8143",
-"A$ c #3A8332",
-"B$ c #31792A",
-"C$ c #361919",
-"D$ c #351818",
-"E$ c #341818",
-"F$ c #3A8333",
-"G$ c #2A7121",
-"H$ c #361A19",
-"I$ c #36191A",
-"J$ c #317727",
-"K$ c #3B8433",
-"L$ c #236818",
-"M$ c #371A19",
-"N$ c #37191A",
-"O$ c #371919",
-"P$ c #371A1A",
-"Q$ c #351918",
-"R$ c #2E1817",
-"S$ c #2C7020",
-"T$ c #2C691F",
-"U$ c #336F26",
-"V$ c #377F30",
-"W$ c #3A8433",
-"X$ c #3B8434",
-"Y$ c #381A19",
-"Z$ c #381919",
-"`$ c #256919",
-" % c #3A8434",
-".% c #39191A",
-"+% c #381A1A",
-"@% c #391A1A",
-"#% c #38191A",
-"$% c #3A732D",
-"%% c #378030",
-"&% c #398333",
-"*% c #3A8534",
-"=% c #3A1B1A",
-"-% c #3A1A1A",
-";% c #3A191A",
-">% c #391919",
-",% c #351A19",
-"'% c #27651B",
-")% c #336B27",
-"!% c #3B8333",
-"~% c #378130",
-"{% c #3A1A1B",
-"]% c #3B1A1B",
-"^% c #28651A",
-"/% c #26641A",
-"(% c #3A8432",
-"_% c #3B8534",
-":% c #327A2A",
-"<% c #3B1B1A",
-"[% c #3B1A1A",
-"}% c #3B1B1B",
-"|% c #391A19",
-"1% c #2F7526",
-"2% c #27651A",
-"3% c #2E6A1F",
-"4% c #3B8535",
-"5% c #2D7524",
-"6% c #3C1A1A",
-"7% c #3C1B1B",
-"8% c #3C1B1A",
-"9% c #2A701F",
-"0% c #28621A",
-"a% c #347B2B",
-"b% c #397F30",
-"c% c #3B8533",
-"d% c #286E1F",
-"e% c #3D1B1B",
-"f% c #3C1A1B",
-"g% c #3D1A1B",
-"h% c #391B1A",
-"i% c #2B6B1E",
-"j% c #518447",
-"k% c #3C8534",
-"l% c #236919",
-"m% c #3E1B1B",
-"n% c #3E1C1B",
-"o% c #3A1B1B",
-"p% c #276419",
-"q% c #306A24",
-"r% c #3C8635",
-"s% c #E5CF9B",
-"t% c #3E1C1C",
-"u% c #321817",
-"v% c #266419",
-"w% c #497E3D",
-"x% c #2F6D22",
-"y% c #3A8131",
-"z% c #3A8331",
-"A% c #3C8535",
-"B% c #3C8636",
-"C% c #401C1C",
-"D% c #3F1B1C",
-"E% c #3F1B1B",
-"F% c #3F1C1C",
-"G% c #3F1C1B",
-"H% c #3E1B1C",
-"I% c #487E3E",
-"J% c #336E24",
-"K% c #3B8635",
-"L% c #3B8636",
-"M% c #401C1B",
-"N% c #401B1B",
-"O% c #401B1C",
-"P% c #2F7424",
-"Q% c #2C661E",
-"R% c #3D8636",
-"S% c #388331",
-"T% c #411C1C",
-"U% c #2A6E1E",
-"V% c #367A2C",
-"W% c #377D2C",
-"X% c #3D8736",
-"Y% c #327C2C",
-"Z% c #411D1C",
-"`% c #421C1C",
-" & c #421D1C",
-".& c #367B2D",
-"+& c #28661C",
-"@& c #3C8736",
-"#& c #3D8637",
-"$& c #2D7725",
-"%& c #431C1C",
-"&& c #431D1D",
-"*& c #421C1D",
-"=& c #411C1D",
-"-& c #411C1B",
-";& c #3B8634",
-">& c #3C8637",
-",& c #3D8737",
-"'& c #286F1F",
-")& c #431C1D",
-"!& c #431D1C",
-"~& c #421D1D",
-"{& c #2A6A1E",
-"]& c #27661B",
-"^& c #49803F",
-"/& c #3B8334",
-"(& c #3C8837",
-"_& c #441D1D",
-":& c #3D1B1C",
-"<& c #28661A",
-"[& c #377229",
-"}& c #3D8837",
-"|& c #451D1D",
-"1& c #451D1C",
-"2& c #441D1C",
-"3& c #441C1D",
-"4& c #306A23",
-"5& c #3D8836",
-"6& c #461D1E",
-"7& c #461E1D",
-"8& c #441C1C",
-"9& c #327626",
-"0& c #3A8334",
-"a& c #3A8533",
-"b& c #3D8838",
-"c& c #461D1D",
-"d& c #461E1E",
-"e& c #471D1E",
-"f& c #471E1D",
-"g& c #451E1D",
-"h& c #3E6E29",
-"i& c #388232",
-"j& c #471E1E",
-"k& c #337C2C",
-"l& c #481E1E",
-"m& c #481E1D",
-"n& c #471D1D",
-"o& c #27661A",
-"p& c #3E8938",
-"q& c #2D7726",
-"r& c #491E1E",
-"s& c #491E1F",
-"t& c #481D1E",
-"u& c #327929",
-"v& c #367C2B",
-"w& c #3D8938",
-"x& c #28701F",
-"y& c #4A1F1E",
-"z& c #4A1E1E",
-"A& c #477C39",
-"B& c #3C8737",
-"C& c #3E8838",
-"D& c #236B19",
-"E& c #4A1F1F",
-"F& c #4B1E1E",
-"G& c #4B1F1E",
-"H& c #4A1E1F",
-"I& c #491F1F",
-"J& c #451C1D",
-"K& c #266A1B",
-"L& c #29681C",
-"M& c #457B39",
-"N& c #3C8836",
-"O& c #D3BF8D",
-"P& c #4B1F1F",
-"Q& c #4C1F1E",
-"R& c #4B1E1F",
-"S& c #491F1E",
-"T& c #718549",
-"U& c #26651A",
-"V& c #2F6A24",
-"W& c #3D8937",
-"X& c #3E8837",
-"Y& c #3E8A39",
-"Z& c #4C1F1F",
-"`& c #3C8735",
-" * c #4D1F1F",
-".* c #4C1E1F",
-"+* c #28671B",
-"@* c #578748",
-"#* c #4E201F",
-"$* c #4D1F20",
-"%* c #4E2020",
-"&* c #4E1F1F",
-"** c #451D1E",
-"=* c #307728",
-"-* c #27671B",
-";* c #548649",
-">* c #477C3B",
-",* c #2F7122",
-"'* c #377C2E",
-")* c #337C2D",
-"!* c #4F1F1F",
-"~* c #4E1F20",
-"{* c #411B1C",
-"]* c #E5CC9B",
-"^* c #2B7121",
-"/* c #2B6B1F",
-"(* c #477D3B",
-"_* c #3C742D",
-":* c #3E8939",
-"<* c #3E8A38",
-"[* c #2D7626",
-"}* c #4F2020",
-"|* c #4F1F20",
-"1* c #4F201F",
-"2* c #4D201F",
-"3* c #4C1F20",
-"4* c #CEB48A",
-"5* c #246A19",
-"6* c #336C27",
-"7* c #502020",
-"8* c #A4896A",
-"9* c #33792A",
-"0* c #3D8738",
-"a* c #276E1E",
-"b* c #512020",
-"c* c #502021",
-"d* c #502121",
-"e* c #502120",
-"f* c #512021",
-"g* c #512120",
-"h* c #451E1E",
-"i* c #846752",
-"j* c #28701D",
-"k* c #512121",
-"l* c #522020",
-"m* c #522021",
-"n* c #522120",
-"o* c #4D2020",
-"p* c #3D1C1B",
-"q* c #6B4E3F",
-"r* c #3E8937",
-"s* c #3E8A3A",
-"t* c #256C1C",
-"u* c #532021",
-"v* c #532120",
-"w* c #532121",
-"x* c #522121",
-"y* c #441D1E",
-"z* c #5D3F35",
-"A* c #2F7626",
-"B* c #29691D",
-"C* c #548446",
-"D* c #3C8634",
-"E* c #3F8A39",
-"F* c #3E8B39",
-"G* c #542121",
-"H* c #4B2C27",
-"I* c #296E1F",
-"J* c #28671C",
-"K* c #518547",
-"L* c #497F3D",
-"M* c #3D8939",
-"N* c #3F8A3A",
-"O* c #246B1A",
-"P* c #427835",
-"Q* c #3F8B3A",
-"R* c #226918",
-"S* c #552121",
-"T* c #552221",
-"U* c #542122",
-"V* c #ECD4A0",
-"W* c #F0D8A3",
-"X* c #3F7632",
-"Y* c #3F8939",
-"Z* c #226919",
-"`* c #562122",
-" = c #562121",
-".= c #562221",
-"+= c #552122",
-"@= c #D5BC8F",
-"#= c #356C27",
-"$= c #3E7129",
-"%= c #562222",
-"&= c #572222",
-"*= c #BBA07A",
-"== c #572122",
-"-= c #582222",
-";= c #8B6E57",
-">= c #2F7525",
-",= c #582223",
-"'= c #582322",
-")= c #572221",
-"!= c #80624D",
-"~= c #29641B",
-"{= c #3C8536",
-"]= c #592222",
-"^= c #582323",
-"/= c #592223",
-"(= c #69493C",
-"_= c #4A7831",
-":= c #388231",
-"<= c #592323",
-"[= c #5A2323",
-"}= c #592322",
-"|= c #5A2322",
-"1= c #552222",
-"2= c #715343",
-"3= c #256119",
-"4= c #5A2223",
-"5= c #5B2322",
-"6= c #5B2323",
-"7= c #66463A",
-"8= c #276218",
-"9= c #3F8B3B",
-"0= c #E4CD9A",
-"a= c #5A2222",
-"b= c #5B2222",
-"c= c #745544",
-"d= c #357D2C",
-"e= c #408B3A",
-"f= c #5C2323",
-"g= c #5C2424",
-"h= c #5B2223",
-"i= c #481D1D",
-"j= c #6A493C",
-"k= c #347A29",
-"l= c #408B3B",
-"m= c #5C2324",
-"n= c #5C2423",
-"o= c #5D2323",
-"p= c #5D2423",
-"q= c #5D2324",
-"r= c #5B2423",
-"s= c #572121",
-"t= c #3E8B3A",
-"u= c #408C3B",
-"v= c #5D2424",
-"w= c #5E2423",
-"x= c #532020",
-"y= c #27671C",
-"z= c #266519",
-"A= c #5F2525",
-"B= c #5F2424",
-"C= c #5F2524",
-"D= c #5F2425",
-"E= c #602525",
-"F= c #5E2424",
-"G= c #5E2324",
-"H= c #602524",
-"I= c #E5CD9B",
-"J= c #2E7224",
-"K= c #612626",
-"L= c #612526",
-"M= c #622626",
-"N= c #612525",
-"O= c #602526",
-"P= c #542222",
-"Q= c #CFB58A",
-"R= c #2C7122",
-"S= c #632626",
-"T= c #642727",
-"U= c #632627",
-"V= c #642627",
-"W= c #642626",
-"X= c #632726",
-"Y= c #642726",
-"Z= c #A08365",
-"`= c #2B7020",
-" - c #652827",
-".- c #652828",
-"+- c #662827",
-"@- c #652727",
-"#- c #652627",
-"$- c #632727",
-"%- c #572322",
-"&- c #765746",
-"*- c #397F2F",
-"=- c #3D8635",
-"-- c #408A3A",
-";- c #642828",
-">- c #652728",
-",- c #662929",
-"'- c #672929",
-")- c #672928",
-"!- c #682929",
-"~- c #542120",
-"{- c #56332D",
-"]- c #266C1D",
-"^- c #682A2A",
-"/- c #6A2B2B",
-"(- c #692A2A",
-"_- c #682829",
-":- c #672828",
-"<- c #662828",
-"[- c #542221",
-"}- c #276B1B",
-"|- c #27661C",
-"1- c #3F8B39",
-"2- c #682A29",
-"3- c #692B2B",
-"4- c #6B2B2B",
-"5- c #6A2C2B",
-"6- c #6B2C2C",
-"7- c #6B2C2B",
-"8- c #6A2A2A",
-"9- c #5E2425",
-"0- c #246A1A",
-"a- c #2F6822",
-"b- c #3A8132",
-"c- c #6C2D2D",
-"d- c #6C2D2E",
-"e- c #6D2D2D",
-"f- c #6D2E2D",
-"g- c #6C2D2C",
-"h- c #6C2C2C",
-"i- c #662728",
-"j- c #236618",
-"k- c #3B8435",
-"l- c #6D2E2F",
-"m- c #6D2E2E",
-"n- c #6F2F2F",
-"o- c #6E2F2F",
-"p- c #702F30",
-"q- c #703030",
-"r- c #6F302F",
-"s- c #6F2F30",
-"t- c #70302F",
-"u- c #6E2F2E",
-"v- c #6E2E2E",
-"w- c #6B2D2C",
-"x- c #6D2F2F",
-"y- c #6E302F",
-"z- c #6F3031",
-"A- c #713131",
-"B- c #713132",
-"C- c #723231",
-"D- c #723132",
-"E- c #723232",
-"F- c #733232",
-"G- c #733132",
-"H- c #713130",
-"I- c #723131",
-"J- c #5E2524",
-"K- c #5E2525",
-"L- c #4C1E1E",
-"M- c #728549",
-"N- c #497F3E",
-"O- c #538446",
-"P- c #378131",
-"Q- c #6E3030",
-"R- c #703131",
-"S- c #703232",
-"T- c #723233",
-"U- c #743333",
-"V- c #753333",
-"W- c #753434",
-"X- c #753435",
-"Y- c #763434",
-"Z- c #743232",
-"`- c #4D1E1F",
-" ; c #548546",
-".; c #723333",
-"+; c #733333",
-"@; c #763534",
-"#; c #773535",
-"$; c #773635",
-"%; c #783535",
-"&; c #773435",
-"*; c #692A29",
-"=; c #662829",
-"-; c #50201F",
-";; c #E3CC9A",
-">; c #763535",
-",; c #783636",
-"'; c #793636",
-"); c #783737",
-"!; c #793838",
-"~; c #7A3838",
-"{; c #793737",
-"]; c #7A3737",
-"^; c #7A3738",
-"/; c #793637",
-"(; c #783635",
-"_; c #753334",
-":; c #662928",
-"<; c #642728",
-"[; c #5D2524",
-"}; c #357D2E",
-"|; c #773636",
-"1; c #793939",
-"2; c #7A3839",
-"3; c #7C3A3A",
-"4; c #7D3A3B",
-"5; c #7E3B3B",
-"6; c #7D3A3A",
-"7; c #7B3939",
-"8; c #7B3839",
-"9; c #793736",
-"0; c #783736",
-"a; c #733131",
-"b; c #6E2E2F",
-"c; c #642827",
-"d; c #367C2E",
-"e; c #7A3939",
-"f; c #7B3B3A",
-"g; c #7C3B3A",
-"h; c #7D3B3B",
-"i; c #7D3B3C",
-"j; c #7F3C3D",
-"k; c #803D3D",
-"l; c #7F3C3C",
-"m; c #7F3C3B",
-"n; c #7E3A3B",
-"o; c #7B3938",
-"p; c #6D2F2E",
-"q; c #6B2D2D",
-"r; c #672A2A",
-"s; c #4C2020",
-"t; c #491D1E",
-"u; c #2A691E",
-"v; c #337B2B",
-"w; c #7B3A3A",
-"x; c #7F3D3D",
-"y; c #803D3E",
-"z; c #813E3E",
-"A; c #823F3F",
-"B; c #833F40",
-"C; c #823E3F",
-"D; c #823E3E",
-"E; c #7A3837",
-"F; c #602625",
-"G; c #5C2524",
-"H; c #501F20",
-"I; c #7E3C3C",
-"J; c #803E3E",
-"K; c #834040",
-"L; c #844141",
-"M; c #854242",
-"N; c #864242",
-"O; c #864241",
-"P; c #854241",
-"Q; c #854142",
-"R; c #843F3F",
-"S; c #803C3C",
-"T; c #7C3A39",
-"U; c #783837",
-"V; c #6C2E2E",
-"W; c #67292A",
-"X; c #632728",
-"Y; c #327A29",
-"Z; c #7F3E3E",
-"`; c #813F3F",
-" > c #874343",
-".> c #874344",
-"+> c #884444",
-"@> c #894544",
-"#> c #894444",
-"$> c #894545",
-"%> c #894445",
-"&> c #884443",
-"*> c #874242",
-"=> c #833F3F",
-"-> c #7B3A39",
-";> c #6C2E2F",
-">> c #6A2C2C",
-",> c #682A2B",
-"'> c #5D2425",
-")> c #337626",
-"!> c #568649",
-"~> c #2F7827",
-"{> c #824040",
-"]> c #874443",
-"^> c #894646",
-"/> c #8A4646",
-"(> c #8B4747",
-"_> c #8B4646",
-":> c #8C4646",
-"<> c #874342",
-"[> c #844041",
-"}> c #763635",
-"|> c #743334",
-"1> c #5F2626",
-"2> c #2E6B1E",
-"3> c #317827",
-"4> c #844242",
-"5> c #864444",
-"6> c #884545",
-"7> c #8A4747",
-"8> c #8D4847",
-"9> c #8D4848",
-"0> c #8D4948",
-"a> c #8D4949",
-"b> c #8C4647",
-"c> c #864343",
-"d> c #864342",
-"e> c #763636",
-"f> c #713232",
-"g> c #692C2B",
-"h> c #66292A",
-"i> c #642928",
-"j> c #602626",
-"k> c #286319",
-"l> c #398331",
-"m> c #2F7625",
-"n> c #874444",
-"o> c #884645",
-"p> c #8A4746",
-"q> c #8B4848",
-"r> c #8C4949",
-"s> c #8E4A49",
-"t> c #8F4B4B",
-"u> c #904B4B",
-"v> c #904B4C",
-"w> c #904B4A",
-"x> c #8F4A4A",
-"y> c #8C4746",
-"z> c #854342",
-"A> c #743434",
-"B> c #692C2C",
-"C> c #672A2B",
-"D> c #2F6A23",
-"E> c #884546",
-"F> c #8E4A4B",
-"G> c #8F4C4C",
-"H> c #914C4C",
-"I> c #924C4C",
-"J> c #914C4B",
-"K> c #8E4A4A",
-"L> c #763536",
-"M> c #733433",
-"N> c #6F3030",
-"O> c #6C2F2E",
-"P> c #682B2B",
-"Q> c #622726",
-"R> c #5B2424",
-"S> c #327828",
-"T> c #2E7523",
-"U> c #8A4847",
-"V> c #8B4849",
-"W> c #8D494A",
-"X> c #904C4C",
-"Y> c #914D4D",
-"Z> c #924E4E",
-"`> c #934E4E",
-" , c #944E4E",
-"., c #944E4F",
-"+, c #934D4E",
-"@, c #904A4A",
-"#, c #8D4747",
-"$, c #7C3B3B",
-"%, c #773637",
-"&, c #743535",
-"*, c #6F3131",
-"=, c #6A2C2D",
-"-, c #652929",
-";, c #622727",
-">, c #5B2324",
-",, c #317627",
-"', c #8B4949",
-"), c #8E4B4B",
-"!, c #904D4D",
-"~, c #924E4F",
-"{, c #934F4E",
-"], c #944F4F",
-"^, c #954F4F",
-"/, c #955050",
-"(, c #95504F",
-"_, c #924D4E",
-":, c #8B4748",
-"<, c #7A3A3A",
-"[, c #773737",
-"}, c #6C2F2F",
-"|, c #6B2E2E",
-"1, c #672B2A",
-"2, c #582221",
-"3, c #307524",
-"4, c #2B7220",
-"5, c #8D4A4A",
-"6, c #8F4C4B",
-"7, c #914F4E",
-"8, c #93504F",
-"9, c #945150",
-"0, c #945151",
-"a, c #965151",
-"b, c #965152",
-"c, c #965251",
-"d, c #965252",
-"e, c #924D4D",
-"f, c #8B4847",
-"g, c #894645",
-"h, c #7B3B3B",
-"i, c #783939",
-"j, c #733334",
-"k, c #632828",
-"l, c #5A2324",
-"m, c #2D7123",
-"n, c #2A651F",
-"o, c #914E4E",
-"p, c #975454",
-"q, c #975352",
-"r, c #975353",
-"s, c #985353",
-"t, c #975253",
-"u, c #975252",
-"v, c #975251",
-"w, c #955150",
-"x, c #945050",
-"y, c #934F4F",
-"z, c #8C4848",
-"A, c #884445",
-"B, c #823F40",
-"C, c #793839",
-"D, c #763736",
-"E, c #753535",
-"F, c #692D2D",
-"G, c #904E4E",
-"H, c #914F4F",
-"I, c #945251",
-"J, c #975554",
-"K, c #985554",
-"L, c #995555",
-"M, c #995655",
-"N, c #985454",
-"O, c #935050",
-"P, c #924F4E",
-"Q, c #884646",
-"R, c #854343",
-"S, c #824142",
-"T, c #803F3F",
-"U, c #7D3C3C",
-"V, c #773736",
-"W, c #713333",
-"X, c #6E3131",
-"Y, c #6A2E2D",
-"Z, c #662A2A",
-"`, c #642929",
-" ' c #2B6F1F",
-".' c #28651D",
-"+' c #91504E",
-"@' c #995856",
-"#' c #9B5A57",
-"$' c #9B5C58",
-"%' c #9C5C59",
-"&' c #9C5A58",
-"*' c #9A5756",
-"=' c #9A5655",
-"-' c #94504F",
-";' c #914E4D",
-">' c #834141",
-",' c #7A3B3B",
-"'' c #773838",
-")' c #6D3030",
-"!' c #612727",
-"~' c #5A2424",
-"{' c #296E1D",
-"]' c #37722A",
-"^' c #935251",
-"/' c #995956",
-"(' c #9F5F5B",
-"_' c #9F605C",
-":' c #A0605C",
-"<' c #9E5F5A",
-"[' c #9E5C5A",
-"}' c #9B5856",
-"|' c #9A5555",
-"1' c #894647",
-"2' c #834242",
-"3' c #753637",
-"4' c #733434",
-"5' c #6B2F2F",
-"6' c #682C2C",
-"7' c #672B2B",
-"8' c #5A2423",
-"9' c #276A1B",
-"0' c #2C6B20",
-"a' c #4A803F",
-"b' c #935452",
-"c' c #985A56",
-"d' c #9D5E5A",
-"e' c #A0625D",
-"f' c #A36560",
-"g' c #A36660",
-"h' c #A2635E",
-"i' c #A05F5C",
-"j' c #9A5857",
-"k' c #995654",
-"l' c #965353",
-"m' c #955151",
-"n' c #924F4F",
-"o' c #8C4A49",
-"p' c #894747",
-"q' c #874545",
-"r' c #7D3E3D",
-"s' c #703231",
-"t' c #642829",
-"u' c #612627",
-"v' c #27691A",
-"w' c #2B691F",
-"x' c #9B5D59",
-"y' c #A0635D",
-"z' c #A36761",
-"A' c #A66A63",
-"B' c #A76B64",
-"C' c #A56762",
-"D' c #A2635F",
-"E' c #A05E5B",
-"F' c #9B5A58",
-"G' c #955152",
-"H' c #814040",
-"I' c #7E3E3E",
-"J' c #723434",
-"K' c #703132",
-"L' c #6B2F2E",
-"M' c #662B2B",
-"N' c #622828",
-"O' c #5E2626",
-"P' c #256A18",
-"Q' c #9D605B",
-"R' c #A96E66",
-"S' c #A96F66",
-"T' c #A86C64",
-"U' c #A1615E",
-"V' c #9D5C59",
-"W' c #9A5757",
-"X' c #8D4B4B",
-"Y' c #894748",
-"Z' c #864545",
-"`' c #7D3E3E",
-" ) c #753636",
-".) c #713434",
-"+) c #6F3231",
-"@) c #6D2F30",
-"#) c #6A2E2E",
-"$) c #226616",
-"%) c #467C3A",
-"&) c #9F615C",
-"*) c #A46862",
-"=) c #A86D65",
-"-) c #AA7067",
-";) c #AB7168",
-">) c #AA7068",
-",) c #A66963",
-"') c #9D5D5A",
-")) c #9A5957",
-"!) c #8A4949",
-"~) c #854545",
-"{) c #824242",
-"]) c #7C3D3D",
-"^) c #753536",
-"/) c #682B2C",
-"() c #632928",
-"_) c #226517",
-":) c #398233",
-"<) c #4D7932",
-"[) c #9E625D",
-"}) c #A46962",
-"|) c #A86E66",
-"1) c #AB7068",
-"2) c #AB7269",
-"3) c #A2645F",
-"4) c #9E5E5B",
-"5) c #975453",
-"6) c #955353",
-"7) c #955252",
-"8) c #8F4D4D",
-"9) c #8C4A4A",
-"0) c #8A4848",
-"a) c #854444",
-"b) c #804040",
-"c) c #743636",
-"d) c #713433",
-"e) c #672C2C",
-"f) c #5E2625",
-"g) c #9D615C",
-"h) c #A76C64",
-"i) c #A96F67",
-"j) c #AA6F67",
-"k) c #A76D65",
-"l) c #A0625E",
-"m) c #9B5C59",
-"n) c #985756",
-"o) c #965553",
-"p) c #925050",
-"q) c #904F4F",
-"r) c #8E4C4C",
-"s) c #864646",
-"t) c #854445",
-"u) c #793B3B",
-"v) c #763838",
-"w) c #743534",
-"x) c #713334",
-"y) c #6E3231",
-"z) c #692D2C",
-"A) c #652A2B",
-"B) c #622929",
-"C) c #592423",
-"D) c #526F32",
-"E) c #357B2D",
-"F) c #A0645E",
-"G) c #A76C65",
-"H) c #A86C65",
-"I) c #9F5F5C",
-"J) c #975655",
-"K) c #925151",
-"L) c #8E4D4D",
-"M) c #8C4B4B",
-"N) c #8B4A4A",
-"O) c #884747",
-"P) c #844444",
-"Q) c #814141",
-"R) c #7E3F3F",
-"S) c #7B3C3C",
-"T) c #783A3A",
-"U) c #753737",
-"V) c #6F3232",
-"W) c #6B2E2F",
-"X) c #682D2C",
-"Y) c #5D2526",
-"Z) c #707B46",
-"`) c #9D5F5A",
-" ! c #A46861",
-".! c #A46761",
-"+! c #A16660",
-"@! c #9F625D",
-"#! c #985755",
-"$! c #945252",
-"%! c #935151",
-"&! c #915050",
-"*! c #8E4E4E",
-"=! c #8D4C4C",
-"-! c #8A4849",
-";! c #874747",
-">! c #834343",
-",! c #7C3E3E",
-"'! c #763939",
-")! c #723435",
-"!! c #682D2D",
-"~! c #652A2A",
-"{! c #602727",
-"]! c #5D2626",
-"^! c #5D2525",
-"/! c #985A57",
-"(! c #9D615B",
-"_! c #9F615D",
-":! c #9E615D",
-"<! c #9D5F5B",
-"[! c #9A5C58",
-"}! c #975855",
-"|! c #945453",
-"1! c #925251",
-"2! c #8F4E4E",
-"3! c #8E4D4C",
-"4! c #8C4B4A",
-"5! c #864645",
-"6! c #7B3C3B",
-"7! c #733635",
-"8! c #703333",
-"9! c #6A2D2D",
-"0! c #672D2D",
-"a! c #622928",
-"b! c #5D2625",
-"c! c #5C2625",
-"d! c #A6986C",
-"e! c #316A24",
-"f! c #935351",
-"g! c #955754",
-"h! c #975956",
-"i! c #985957",
-"j! c #955554",
-"k! c #8C4B4C",
-"l! c #894848",
-"m! c #7A3B3C",
-"n! c #783B3B",
-"o! c #753736",
-"p! c #6F3333",
-"q! c #6A2E2F",
-"r! c #672C2D",
-"s! c #662B2C",
-"t! c #642B2B",
-"u! c #612828",
-"v! c #5B2524",
-"w! c #8D4E4D",
-"x! c #90504F",
-"y! c #925250",
-"z! c #925351",
-"A! c #8D4D4D",
-"B! c #8C4C4B",
-"C! c #8A4A4A",
-"D! c #804242",
-"E! c #7B3D3D",
-"F! c #783B3A",
-"G! c #6A2F2F",
-"H! c #63292A",
-"I! c #A5986C",
-"J! c #447A38",
-"K! c #8E985C",
-"L! c #8C4D4C",
-"M! c #8E4F4E",
-"N! c #8E4F4D",
-"O! c #8E4E4D",
-"P! c #8A4A49",
-"Q! c #884848",
-"R! c #864747",
-"S! c #7F4040",
-"T! c #7C3E3D",
-"U! c #793A3B",
-"V! c #773A39",
-"W! c #733535",
-"X! c #6F3332",
-"Y! c #6D3130",
-"Z! c #692D2E",
-"`! c #672C2B",
-" ~ c #642A2A",
-".~ c #5F2727",
-"+~ c #5C2525",
-"@~ c #884949",
-"#~ c #8B4B4B",
-"$~ c #894949",
-"%~ c #864647",
-"&~ c #834444",
-"*~ c #814242",
-"=~ c #804141",
-"-~ c #7C3D3E",
-";~ c #793C3B",
-">~ c #793A3A",
-",~ c #763839",
-"'~ c #6E3232",
-")~ c #6C3030",
-"!~ c #692F2F",
-"~~ c #652B2B",
-"{~ c #5C2526",
-"]~ c #5A2524",
-"^~ c #D7C091",
-"/~ c #864847",
-"(~ c #874748",
-"_~ c #884948",
-":~ c #884849",
-"<~ c #894948",
-"[~ c #89494A",
-"}~ c #874646",
-"|~ c #864746",
-"1~ c #844544",
-"2~ c #824342",
-"3~ c #814142",
-"4~ c #7F4141",
-"5~ c #783A3B",
-"6~ c #773939",
-"7~ c #743737",
-"8~ c #713435",
-"9~ c #6A3030",
-"0~ c #5B2525",
-"a~ c #592424",
-"b~ c #844646",
-"c~ c #874848",
-"d~ c #874949",
-"e~ c #854647",
-"f~ c #854646",
-"g~ c #834544",
-"h~ c #824343",
-"i~ c #814342",
-"j~ c #7E403F",
-"k~ c #7A3C3C",
-"l~ c #713535",
-"m~ c #6B302F",
-"n~ c #692E2E",
-"o~ c #652B2C",
-"p~ c #572323",
-"q~ c #39802F",
-"r~ c #824443",
-"s~ c #834545",
-"t~ c #844645",
-"u~ c #824344",
-"v~ c #773A3A",
-"w~ c #6E3132",
-"x~ c #692F30",
-"y~ c #622829",
-"z~ c #5E2727",
-"A~ c #5B2526",
-"B~ c #2C7322",
-"C~ c #7F4241",
-"D~ c #7D3F3F",
-"E~ c #7C3E3F",
-"F~ c #793C3C",
-"G~ c #753838",
-"H~ c #753837",
-"I~ c #723635",
-"J~ c #6D3132",
-"K~ c #6C3130",
-"L~ c #69302F",
-"M~ c #612829",
-"N~ c #602828",
-"O~ c #326D23",
-"P~ c #286E1C",
-"Q~ c #7D3F40",
-"R~ c #7E4040",
-"S~ c #7C3F3F",
-"T~ c #763A3A",
-"U~ c #743837",
-"V~ c #733636",
-"W~ c #703534",
-"X~ c #6F3434",
-"Y~ c #6D3333",
-"Z~ c #6B3030",
-"`~ c #662C2C",
-" { c #612928",
-".{ c #5E2627",
-"+{ c #B9B07B",
-"@{ c #7A3D3D",
-"#{ c #7B3E3E",
-"${ c #7B3D3E",
-"%{ c #793D3C",
-"&{ c #773B3B",
-"*{ c #76393A",
-"={ c #753938",
-"-{ c #713536",
-";{ c #703535",
-">{ c #6E3333",
-",{ c #6D3232",
-"'{ c #6B3130",
-"){ c #662D2D",
-"!{ c #5D2727",
-"~{ c #5A2525",
-"{{ c #582424",
-"]{ c #773A3B",
-"^{ c #783C3C",
-"/{ c #773C3B",
-"({ c #773B3A",
-"_{ c #753939",
-":{ c #733838",
-"<{ c #723737",
-"[{ c #703435",
-"}{ c #6C3132",
-"|{ c #682E2E",
-"1{ c #672E2E",
-"2{ c #632A2B",
-"3{ c #632A2A",
-"4{ c #5F2828",
-"5{ c #5C2626",
-"6{ c #562223",
-"7{ c #29651D",
-"8{ c #743939",
-"9{ c #743839",
-"0{ c #733737",
-"a{ c #723837",
-"b{ c #723736",
-"c{ c #6C3232",
-"d{ c #662E2E",
-"e{ c #632B2A",
-"f{ c #5C2627",
-"g{ c #6F3535",
-"h{ c #713636",
-"i{ c #713637",
-"j{ c #703635",
-"k{ c #6B3131",
-"l{ c #682F2F",
-"m{ c #652C2B",
-"n{ c #622A2A",
-"o{ c #5A2425",
-"p{ c #2A661E",
-"q{ c #6E3434",
-"r{ c #6E3433",
-"s{ c #6B3031",
-"t{ c #652C2C",
-"u{ c #632C2C",
-"v{ c #612929",
-"w{ c #5E2828",
-"x{ c #5C2727",
-"y{ c #5B2626",
-"z{ c #582324",
-"A{ c #6B3132",
-"B{ c #6C3231",
-"C{ c #6B3232",
-"D{ c #6A3130",
-"E{ c #682E2F",
-"F{ c #672E2F",
-"G{ c #652D2C",
-"H{ c #632B2B",
-"I{ c #602929",
-"J{ c #5D2828",
-"K{ c #592324",
-"L{ c #562323",
-"M{ c #3D1B1A",
-"N{ c #2E6823",
-"O{ c #683030",
-"P{ c #682F30",
-"Q{ c #68302F",
-"R{ c #672F2F",
-"S{ c #672D2E",
-"T{ c #652C2D",
-"U{ c #642C2C",
-"V{ c #61292A",
-"W{ c #5A2526",
-"X{ c #572423",
-"Y{ c #3E7530",
-"Z{ c #9D9B65",
-"`{ c #642D2D",
-" ] c #652E2D",
-".] c #652E2E",
-"+] c #642E2D",
-"@] c #642C2D",
-"#] c #612A2A",
-"$] c #5F2929",
-"%] c #572324",
-"&] c #572424",
-"*] c #481E1F",
-"=] c #366D29",
-"-] c #622B2B",
-";] c #622B2C",
-">] c #632C2B",
-",] c #622B2A",
-"'] c #5D2728",
-")] c #5A2625",
-"!] c #592525",
-"~] c #562423",
-"{] c #5F2A2A",
-"]] c #602A2A",
-"^] c #602A29",
-"/] c #60292A",
-"(] c #5E2928",
-"_] c #5E2929",
-":] c #5B2627",
-"<] c #5D2829",
-"[] c #5D2929",
-"}] c #5E2827",
-"|] c #5A2726",
-"1] c #5A2727",
-"2] c #552323",
-"3] c #327525",
-"4] c #2F7725",
-"5] c #5A2626",
-"6] c #5A2627",
-"7] c #592625",
-"8] c #592626",
-"9] c #592524",
-"0] c #592425",
-"a] c #562322",
-"b] c #A5976B",
-"c] c #3E7732",
-"d] c #2B701F",
-"e] c #582425",
-"f] c #562324",
-"g] c #226314",
-"h] c #26691A",
-"i] c #562424",
-"j] c #552322",
-"k] c #266719",
-"l] c #552223",
-"m] c #532221",
-"n] c #3E7632",
-"o] c #532222",
-"p] c #391A1B",
-"q] c #2E6B21",
-"r] c #C5A981",
-"s] c #522122",
-"t] c #522222",
-"u] c #532122",
-"v] c #29631C",
-"w] c #307726",
-"x] c #6D493D",
-"y] c #614439",
-"z] c #DBC193",
-"A] c #46211F",
-"B] c #391C1B",
-"C] c #9A7F63",
-"D] c #2A671E",
-"E] c #256818",
-"F] c #AE9170",
-"G] c #4E312A",
-"H] c #516E31",
-"I] c #2D6822",
-"J] c #C0AB7E",
-"K] c #8D6F57",
-"L] c #4D1F1E",
-"M] c #765645",
-"N] c #58372E",
-"O] c #4C201F",
-"P] c #E8D09D",
-"Q] c #3D1C1C",
-"R] c #361918",
-"S] c #BBA07B",
-"T] c #472824",
-"U] c #326820",
-"V] c #8C6E57",
-"W] c #CCB1A1",
-"X] c #DFC696",
-"Y] c #412220",
-"Z] c #371D1B",
-"`] c #D8C091",
-" ^ c #6F5041",
-".^ c #C1A6A1",
-"+^ c #B0958D",
-"@^ c #4A2C28",
-"#^ c #361C1B",
-"$^ c #4F2F29",
-"%^ c #5B4337",
-"&^ c #4A7E3E",
-"*^ c #947878",
-"=^ c #3C221F",
-"-^ c #407834",
-";^ c #DAC192",
-">^ c #BEA2A1",
-",^ c #9D827F",
-"'^ c #4A2F29",
-")^ c #6A5141",
-"!^ c #A38A6B",
-"~^ c #37722B",
-"{^ c #A08567",
-"]^ c #967979",
-"^^ c #BDA1A1",
-"/^ c #31671F",
-"(^ c #B69D78",
-"_^ c #5B3D33",
-":^ c #977979",
-"<^ c #316D25",
-"[^ c #432522",
-"}^ c #40221F",
-"|^ c #CDB489",
-"1^ c #977C60",
-"2^ c #402220",
-"3^ c #411D1D",
-"4^ c #C2A7A1",
-"5^ c #C5A9A1",
-"6^ c #C9AEA1",
-"7^ c #CBB0A1",
-"8^ c #CEB3A2",
-"9^ c #D2B7A2",
-"0^ c #D1B7A2",
-"a^ c #D1B6A2",
-"b^ c #CDB3A1",
-"c^ c #D4B9A2",
-"d^ c #CFB5A2",
-"e^ c #CEB3A1",
-"f^ c #316D22",
-"g^ c #94795F",
-"h^ c #442522",
-"i^ c #C4A9A1",
-"j^ c #DAC0A2",
-"k^ c #E5CCA3",
-"l^ c #EDD5A3",
-"m^ c #EFD7A3",
-"n^ c #E9D0A3",
-"o^ c #DFC6A3",
-"p^ c #D3B8A2",
-"q^ c #CDB2A1",
-"r^ c #2C6F20",
-"s^ c #987D61",
-"t^ c #553830",
-"u^ c #3C1E1D",
-"v^ c #C3A8A1",
-"w^ c #CFB4A2",
-"x^ c #E2C9A3",
-"y^ c #EED6A3",
-"z^ c #E6CDA3",
-"A^ c #D8BEA2",
-"B^ c #D0B5A2",
-"C^ c #CCB288",
-"D^ c #9D8265",
-"E^ c #95795F",
-"F^ c #BAA07A",
-"G^ c #C8ADA1",
-"H^ c #EAD1A3",
-"I^ c #D9C0A2",
-"J^ c #527031",
-"K^ c #E7CFA3",
-"L^ c #E3CAA3",
-"M^ c #246718",
-"N^ c #DCC3A2",
-"O^ c #EBD2A3",
-"P^ c #E7CEA3",
-"Q^ c #E2C8A3",
-"R^ c #DBC1A2",
-"S^ c #39722C",
-"T^ c #8B8758",
-"U^ c #256718",
-"V^ c #2D6F21",
-"W^ c #967879",
-"X^ c #3F7530",
-"Y^ c #317626",
-"Z^ c #927777",
-"`^ c #376F2B",
-" / c #447937",
-"./ c #317525",
-"+/ c #316C22",
-"@/ c #2A641C",
-"#/ c #326A25",
-"$/ c #528243",
-"%/ c #326E25",
-"&/ c #2B6620",
-"*/ c #3B732F",
-"=/ c #346F25",
-"-/ c #477B3A",
-";/ c #4C7F3E",
-">/ c #3C752F",
-",/ c #2C681E",
-"'/ c #2B651E",
-")/ c #4A7D3C",
-"!/ c #4A7F3D",
-"~/ c #346C26",
-"{/ c #568447",
-"]/ c #558345",
-"^/ c #356E29",
-"// c #2D6A20",
-"(/ c #518041",
-"_/ c #346F26",
-":/ c #3F7733",
-"</ c #417835",
-"[/ c #467B37",
-"}/ c #4D7E3F",
-"|/ c #447A37",
-"1/ c #326E26",
-"2/ c #336E26",
-"3/ c #447B37",
-"4/ c #558246",
-"5/ c #568147",
-"6/ c #497D3B",
-"7/ c #2F6B1F",
-"8/ c #4E7E40",
-"9/ c #4E7E3F",
-"0/ c #558247",
-"a/ c #4F8041",
-"b/ c #3E7630",
-"c/ c #367127",
-" ",
-" ",
-" . + + + @ # $ % & * = - ; ",
-" > , ' ) . . . . . . + + ! ~ { { ] { ^ / ^ ( _ : < ' [ } ",
-" | 1 2 # 3 ] / ] / 4 + . . . . . . . . . . + + 5 6 ^ ] / ] ] { ^ / / { ] ^ { 3 # 7 1 8 ",
-" 9 0 a # b ] / ] { { { { ^ ] ^ c + + . . . . . . . . . . . . . + + + d e { / / / { ] { { { { { { { { ^ { { f g h 0 i ",
-" j k l ] { { / ] { ] ] ] ] ^ ] ] { ] ] m + + . . . . . . . . . . . . . . . + + + + n { { ^ ] { / ^ ] { ] ] / ] ^ { { ] ^ { { ^ ^ l k o ",
-" p * q ( { { { { / { { { ] { ^ { ] { { { ] ] ] { r + + + . . . . . . . . . . . . . . . . . + + + + s ^ { / { ^ ^ ] ^ / / { / ^ ^ ] / { { ^ { { { ] { f t u v ",
-" w x y ] ^ ^ { { { ] ] ] ^ { / { { { { { / { ] / ^ / ^ z + + + . . . . . . . . . . . . . . . . . . + + + + A { ] ] ] { ^ ] ^ { / { { ^ { { { ] / ] / ^ / ] { { B C D E F ",
-" G k H { { / { { ] { ^ { ^ { { ] { ] { { / ] ^ ] ^ { { { { ^ ^ I + + + . . . . . . . . . . . . . . . . . . . + + + + + + e ^ J { / ] ^ ^ ] ^ { { { { { / { ] { { ^ ] { { ^ K L M C C N O G ",
-" w P ^ ] ^ ^ ] ^ { { ] ^ ^ ] ^ / / ^ ^ / { ^ ] ^ { { ] { { / ] / J _ Q + + + . . . . . . . . . . . . . . . . . . . . . + + + + + + + R J ^ { _ ] ^ / ] { ^ { / { { { { ] ^ / { ] ] ^ ] ^ ] S T U V C C W X ",
-" Y Z ^ { ^ { / ] { ^ ^ { ] ] { { { ] { ^ / { ^ { ^ { ^ ^ { / ` _ J _ _ _ _ .+ + + . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + S _ _ _ _ J ^ _ ^ J / ^ ] { ^ { ] / ^ ] ^ / { ^ ^ ] { { S T ..C V V +.@. ",
-" 1 #.{ { ] ^ ] ] ] { / { { { { { ] / ^ / { ] ] ] / ^ { ] ] _ _ ^ _ _ _ _ l $._ %.&.+ + + . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + *._ _ _ ^ _ ^ { ^ =.{ / ^ / ] { { ^ ^ { { { ] / { { { / ] { -.;.>.V >.V ,.'. ",
-" 0 ).{ ] / ^ ^ { { { { ] { ^ { / ^ / ^ { ^ { / ] ] { { { ^ _ ^ _ _ _ _ _ _ _ !.~._ {.%.] + + + . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + ]._ %.l %.#._ _ _ ^ ^ J ` / { { ] ] { ] { { ] { { / { { / { ^ S L ^.C C C C /.0 ",
-" (._.] ] ] ^ ^ ] { { { ] ] / / { ^ { ^ ] ] { ^ ^ ] { ] _ =.{ J _ ^ _ $._ %.!._ l {.%._ %.{.!.` + + + . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + :.l l !.!.l _ _ _ _ ^ _ ^ ^ ` { ^ ` ] ] ] { { ^ { { ] ] ^ ] ^ { { <.[.V >.C >.C }.|. ",
-" 1.] ] / { { ] ] { / ] ^ ^ ] ] { { { ^ / ] { { ^ { / ] ` ^ ^ ^ _ $.l _ _ $.{.{.{.{.!.~.!.!.{.{.2.3.+ + + . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + Q ~.~.%.{.!.~.~._ %._ $._ J _ _ / _ ^ { { / ] / ] ] / { / / ^ ] ] ] L ^.V 4.C C V 4.5. ",
-" (.6./ ] { / / / { / / { ] ] ] ^ ] { { / / ] { { ] { ] ^ ^ =.J ^ _ l _ $.$.l #.!.!.!.{.!.2.7.{.{.2.2.2.2.+ + + . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + 8.!.{.{.{.{.!.%.#._ _ l _ _ _ _ _ ^ / { ] ^ / / ^ { ] / { { ^ { ^ { { 9.C >.V C C V C 0.a. ",
-" b.=./ ] { { ^ ^ { ^ ] ^ { / ^ { { / ] / ] { / ] / ^ { { =.^ _ _ _ _ _ _ {.l !.%.%.{.!.2.!.2.2.2.2.2.c.2.c.c.+ + + . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + d.2.{.!.!.2.{.!.{.~.l _ $._ _ _ _ ^ _ J ^ ^ ] { { / { { ] { { ] ^ ^ { S U V V >.V C V 4.B e. ",
-" f.y / / / ^ ] { ] { ] ] ^ / / / ] ^ { / { ] ] ] ] ^ _ ] J J _ _ #._ $.~.{.{.%.{.!.{.g.!.7.{.c.2.2.2.c.h.c.c.i.j.+ + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + k.l.2.c.{.{.2.!.{.#.$.$.!.l _ %._ J _ ^ =.J ^ / { ^ { ] { { { ^ ] ^ ^ ] m.[.C >.C C >.C V n.o. ",
-" p.] ^ ] ] / { { / { ] / ^ { ] { { { { ^ { ] ] ] { ^ { ] _ ^ _ _ _ _ #.%.l {.{.!.!.7.3.{.{.c.c.2.2.i.h.j.h.h.h.i.i.h.+ + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + q.r.2.2.!.2.2.2.{.!.{.{.%.%.l _ _ %._ _ _ _ / { ^ { ] ] ] / { { { { ^ / / ;.C C >.C 4.>.C 4.C s. ",
-" t.u.{ ] ] { { { ^ ] { ^ / ] { ] ^ ] ] ] ] { ] { ] ] ^ ^ =._ _ _ _ #.~.!.{.~.!.{.{.{.2.2.2.c.c.c.c.c.h.h.h.c.c.v.h.w.h.i.x.+ + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + y.j.2.2.c.c.c.{.{.{.{.7.{.{.~.!.#.l _ _ _ _ _ J ^ { { / { { / { ^ / { / { s [.V V C V V V >.>.C z.A. ",
-" B.t ] ^ ^ { ^ ] ] { ] ^ { ] ^ ] { { ^ ] { { ^ ] ^ ] { { _ _ _ %._ %.{.%.%.!.!.%.{.{.{.2.3.2.r.C.c.r.c.h.j.i.w.h.D.i.i.i.x.x.D.+ + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + E.c.2.c.c.c.c.2.2.2.2.{.7.{.!.~.{.#.!._ _ _ _ _ / { { { ^ { ] ] ] { { / ] F.G.C C >.C V C >.V C 4.H.I. ",
-" J.t ] { ^ ^ ^ / / / / { / ] ^ ] / ] ] ] { ^ { { ^ / { / _ ^ _ _ $.!.%._ ~.{.2.!.c.{.c.2.c.c.2.c.h.h.h.h.i.i.K.i.v.v.w.w.D.D.D.D.D.+ + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + L.i.c.i.h.c.r.2.c.{.3.!.c.2.{.{.%.{.!._ _ _ ^ _ ^ ` { ] ^ { ^ ] { ] ] ] / / M.C V >.C 4.C C 4.C C C H.J. ",
-" N.{ { / { / { ^ { ] { { { ^ { ^ { ^ ] / { { / { ^ ^ { J ^ _ _ _ _ $.#.!.{.{.{.2.!.{.c.c.2.2.c.c.c.i.c.h.x.x.D.D.D.w.w.D.D.O.D.P.D.+ + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + Q.h.h.h.i.j.h.j.c.2.2.c.2.2.{.{.{.!.%.%.!._ _ _ _ ] _ / { ] { ] { ] ] ^ { / R.S.V 4.C C 4.C C V 4.>.>.T. ",
-" U.] ] ^ { ^ { / ^ ] ] / ^ { ] ] / { { ^ / / ] ] ^ { _ ^ _ ^ $.$.$.$.{.{.!.!.{.{.c.c.c.c.c.h.c.c.c.h.i.h.w.V.D.w.D.D.D.D.D.D.D.W.O.D.X.+ + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + Y.i.i.i.i.h.i.h.c.C.2.c.l.7.!.2.!.{.#.!.~._ _ _ _ _ { / ^ ^ ^ { { { ] { { / y ;.>.>.C 4.>.4.V C V 4.C >.Z. ",
-" `.{ { ] ^ ] / ^ ^ ] { / ] { { { { ] { ] / { { { / { ^ _ =.^ ^ _ _ $.#.!.{.~.{.2.7.7.2.h.c.i.j.i.h.i.h.w.x.v.K.w.D.D.D.D.D.D.W.P.O. + +W..++ + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + ++h.i.w.x.i.w.h.h.c.c.2.c.2.7.l.7.%.!.#.!.!.l _ _ _ ^ ^ / ] ] / ] { ] / / { ^ L C C C 4.C V C C C >.>.>.>.@+ ",
-" #+] { ^ / { ^ ] { ^ / ] ] { { / { / ^ ] { { ^ { ] / ^ { J J _ _ %.!.{.!.{.!.2.2.2.l.2.c.c.j.c.i.h.h.i.V.v.D.D.D.D.D.D.D.X.W.X.X. +X..+$+X.X..++ + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + %+D.w.V.i.D.h.h.c.j.c.r.2.c.2.{.{.{.{.{.{.%.!.$._ _ _ { _ J { ^ { { ^ ^ ] / / T >.V 4.C V C C C 4.V V 4.C C &+ ",
-" *+=+{ ^ ] { { ] { / ^ / { ] { / ] ] ] ^ ^ ^ / ] ^ { { ] ^ ^ _ $.%._ %._ {.{.!.{.2.l.2.C.c.i.c.i.i.w.i.i.w.x.D.D.D.O.D. +D.X.X.W.X..+$+$+.+.+.+-+.++ + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + ;+D.x.x.D.x.i.x.h.i.h.c.j.2.c.2.2.!.!.{.{.!.{.%.$._ _ ^ ` ` { ^ { / { ] ^ ] ^ T C V C C C C V 4.C V V >.C V W >+ ",
-" ,+] / / ] ^ ^ { { / / ] ^ / { / ^ { { { { / { { ^ ] ` ^ ^ ^ $.%.l !.!.!.{.{.2.2.2.2.c.c.h.v.i.h.i.i.i.V.D.D.D.D.D.W..+D.X. +W.X..+.+-+.+.+.+-+'+)+'++ + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + D.O.D.D.D.D.i.w.i.w.i.c.h.j.c.2.2.7.{.{.!.!.!.!.#._ _ _ ] _ / { ^ { { { { / / K ^.>.V V >.C C V V V 4.4.>.>.V !+ ",
-" ~+b ^ ] ^ ^ / ] / ] { ] ^ ] { ] ] { { { ^ ^ ] ^ ] ] J ] _ =._ _ l _ {.{.{.{.7.7.c.2.c.r.c.h.i.i.w.w.i.i.w.D.W.P.W.{+O.X..+ +.+.+-+.+-+$+-+-+-+'+'+'+]+^++ + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + /+X.P.D.P.D.D.x.V.V.x.h.h.h.h.2.2.c.2.c.2.2.!.#.{.%.%._ _ { =.^ { ] ] { ] ^ ] { K ^.C C C C >.>.C >.>.V V C 4.V V (+ ",
-" _+/ { ] ] ] { / { { { ^ { / ^ { ] { ] ] ] / ^ ] { ] ] _ _ ^ _ ~.%.%.!.{.!.{.{.2.2.c.j.h.c.h.h.i.D.i.v.x.D.D.X.D.W.O.X..+.+X.-+X..+'+'+'+-+:+-+]+<+]+'+]++ + + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + V.X.X.O.W.D.D.D.w.h.v.v.i.i.i.i.c.c.c.2.3.{.{.~.!._ $.%._ _ ^ ^ { / ] ^ / ] ^ ^ y ^.V C 4.>.V C 4.C >.C C V C C >.z. ",
-" [+( / ] ^ ] { { / { { ] / / { / { ] ] ] ^ ^ { { ] ^ ^ _ ^ _ _ _ %.!.!.!.!.!.l.{.2.c.c.h.c.i.i.i.w.w.w.D.D.O.D.X.D. +W.}+.+.+.+|+|+1+-+'+-+]+'+'+]+]+]+<+<+2++ + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + %+ + +W.W.D.D.D.D.D.w.i.D.h.v.j.h.j.c.c.{.2.2.!.!.{._ _ l l _ J ] / ^ / ^ ] { { ^ 3 S.C C C C V >.C C C C C V V 4.C 3+[+ ",
-" t { ] { ^ ] ^ ] ^ ^ ] ] / { ] { ^ / ^ { / ] { ^ / { / ] ] _ _ _ %.%.{.!.{.{.2.c.c.c.j.c.h.h.w.w.i.i.D.D.D.D.W.X.W.W.W.-+X.$+-+-+-+-+:+-+]+:+]+<+'+<+2+2+]+]+4++ + + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + + 5+X..+.+O.{+O.O.D.D.D.D.K.K.i.h.v.c.h.c.2.2.2.!.{.!.~.%.$._ _ _ _ J ^ / ] ^ ^ / ] S [.C C >.V >.4.C V V C C 4.C C V C H. ",
-" j y { / ^ ^ ] { ] ] { ] ] { { ] { ] ^ { ] { { { / { { =.J _ _ _ %.%.%.{.2.2.{.c.c.2.c.h.h.i.h.h.w.D.x.D.O..+D.D..+.+X..+-+1+|+.+'+'+'+:+<+]+]+]+6+6+<+2+2+2+2+7+8++ + + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + 9+-+.+X.X..+ +O..+W.P.D.D.D.D.v.w.c.h.h.c.c.2.l.{.!.!.%.{.l _ _ _ / { =.^ { { ] ^ ] 0+a+C C C C C 4.>.V C >.>.C >.>.>.V b+o ",
-" c+/ ^ ] { ] { / / ^ ^ { { { / ^ ] ^ ^ { { ] / ] / { ] { ^ J _ _ _ #.!.d+{.2.7.c.c.c.i.h.h.i.w.D.w.w.D.D.D.D.W.X.X..+$+-+$+-+'+-+'+'+]+]+<+<+2+2+e+7+7+f+g+7+7+7+7+h++ + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + i+-+-+'+.+.+X.X.W.D.P.D.D.V.v.D.h.w.c.h.h.h.c.c.2.2.{.{.{.!.l l _ _ J ^ ^ ^ ^ ^ / { K >.V C C >.>.>.4.4.V 4.C C V V >.>.C j+ ",
-" k+{ ] ^ / ] { { ] { { / / { { ^ ] { ] ] { { ] ] ] ^ { { J _ _ _ #.#.l !.!.2.!.{.2.h.c.c.h.h.i.K.x.D.D.W.W.W. +.+X.W.-+l+-+-+-+'+)+'+m+]+6+<+]+2+2+2+7+g+7+7+7+n+n+7+o++ + + + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + + m+'+-+'+-+.+.+X..+.+ +D.D.D.V.x.w.w.h.h.h.2.c.c.2.2.7.%.%.%.$.%._ _ _ ` { / ] { ] { s C V >.C C 4.V V C >.V >.C V C 4.4.4.V p+ ",
-" `.^ { / { { { ^ / / ^ ^ { { ] ^ { ^ ] ] ^ { ^ ^ { ^ ] { _ ^ _ _ ~.%.{.{.2.2.2.{.c.j.h.h.h.h.w.w.x.D.O.W.X.W.X..+.+X..+1+-+'+'+<+]+]+]+]+f+<+]+<+7+7+7+7+n+7+7+q+r+r+s+q++ + + + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + + t+'+'+-+'+X.-+$+.+X. +.+W.W.D.D.w.K.D.i.j.c.h.2.c.2.3.!.!.!.~.!.%._ _ _ J ^ { ] { ^ ] u+V C >.V C V C C 4.C 4.V C C >.C C C V v+ ",
-" w+{ / ] / ] / ^ ^ { ] / ^ { ] ] ] / ^ ^ ^ ^ ] { { / { { _ / _ _ %.!.!.{.{.2.{.l.2.2.h.h.i.x.i.D.D.D.D..+W.W..+.+-+.+'+'+-+-+<+]+]+'+6+]+]+2+7+f+7+7+7+n+q+x+x+r+o+y+q+q+z++ + + + + + + + . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + + + D.]+m+'+'+1+.+$+$+$+X..+X.D.D.D.D.D.D.i.h.v.i.c.2.c.l.{.{.{.{.!.l _ _ ^ { ^ ^ ^ { { ] A+C V V C C >.C V C >.C C C C 4.C C V C B+ ",
-" p+F.^ { { { ^ ] ] { ^ { ] ] / { ] ^ { { ] ] / { { ] { ^ ^ ^ J _ $.$.{.!.!.{.c.2.C.c.j.h.v.i.v.i.V.D.D.D.D.X.X..+.+.+'+-+'+'+'+'+]+<+]+<+<+7+g+7+7+7+7+y+r+y+s+n+q+C+s+s+D+C+E++ + + + + + + + . . . . . F+F+F+F+F+G+G+G+G+. . . . . . . . . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + + + H+'+:+-+'+-+-+.+-+.+-+.+O.X.W.D.D.D.D.D.h.w.i.h.h.2.c.{.2.{.{.{.!.~._ _ J _ _ { ] ] ] / ;.>.C C C C >.V C C V V 4.V 4.V >.V >.V n.I+ ",
-" F ^ ] { { { / { / { { ] ] ] { ] ] ] { { / ^ ] { ^ ] ] ^ / _ _ _ _ %.!.{.2.2.2.{.C.j.i.h.i.i.w.D.D.D.P.D.W.O..+X.X.X.'+'+-+:+]+]+2+6+]+f+2+7+7+7+x+7+s+q+n+s+q+s+J+J+s+D+s+C+K+L++ + + + + + + + . . . F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+M+. . . . . . . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + + + + + N+6+<+<+:+)+-+'+'+.+.+X..+X.W.O.D.D.D.D.i.i.i.i.c.c.c.2.g.{.!.!.%.$.$._ _ ^ { { ^ ^ { { O+C C C >.C 4.V >.V C 4.V C >.4.>.4.4.C 4.P+ ",
-" a { / { ^ ^ ] { ^ ^ ] { { { ] { { ^ ] ] ^ ] ^ ^ ^ { ] ^ J / _ !._ #.!.%.{.!.l.{.c.h.h.i.w.w.w.D.D.D.{+P.{+ +.+.+X.-+-+'+<+'+]+<+2+2+2+e+7+2+7+7+r+7+o+7+s+s+s+q+q+s+Q+s+C+C+D+D++ + + + + + + + + . . F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+. . . . . . . . . . . + + + + + + + + + + + + + + + + + + + + + + + + + 2+6+<+]+]+<+'+-+'+-+.+.+.+X.O.X.W.W.D.D.w.h.i.h.j.c.c.c.2.{.{.!.{.l $._ _ _ J ^ ] { { y [.V C 4.4.>.C >.C >.C C 4.V C C C V >.C 4.O ",
-" R+^ ] { / ] { ^ ] / ] ^ / { / { ] ] ] { { { ] { { / { ] ^ _ ^ _ #._ ~.~.{.3.2.2.j.c.h.w.h.w.D.D.D.D.D.D.W.X. +.+-+-+'+-+]+<+<+]+]+6+7+g+7+7+7+7+r+o+s+s+q+q+s+K+D+D+D+D+D+C+D+S+J++ + + + + + + + + G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+. . . . . . . . + + + + + + + + + + + + + + + + + + + + + + + + + + T+7+2+]+]+]+]+m+:+'+'+-+-+.+.+.+O.W.D.D.D.K.D.x.i.h.h.2.c.2.2.2.{.!.!._ $.^ { J / / { / U+>.C C 4.C >.>.>.C C C C C C C C C C C V C V+ ",
-" ; ( ] ^ ^ { ] ^ { ^ ^ { ^ ] ^ { { ^ / { ] { ] { { / ^ { _ =._ _ _ !._ {.7.{.c.2.2.j.i.i.h.h.D.w.x.W.W.W.X. +X.$+-+$+'+'+:+<+'+6+2+<+7+7+2+7+n+n+y+s+s+q+C+s+s+K+s+D+D+D+C+S+S+S+W+X+Y++ + + + + + + + G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+. . . . . . + + + + + + + + + + + + + + + + + + + + + + + + + + ]+7+7+2+2+<+:+:+Z+'+'+-+-+.+.+.+O.X.W..+D.D.i.v.w.i.h.2.2.c.2.!.{.!.!.%._ _ ` J / / ] ^ A+V C C C C C V V 4.>.4.>.C C 4.V >.C C C 4.`+ @ ",
-" .@] / ] / ^ ^ ^ ] { ^ / ^ / / ] { ^ { { / { ] ] { { ^ { { =._ _ _ _ _ {.{.{.2.2.c.h.c.i.w.K.i.D.D.D.D.{+X.X..+-+$+-+]+-+-+6+]+<+<+<+7+7+7+7+x+o+y+s+s+q+K+K+K+D+D++@C+D+D+S+X++@@@X+S+#@+ + + + + + + G+G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+. . . . . . + + + + + + + + + + + + + + + + + + + + + + + + + + $@7+e+6+7+2+g+6+'+'+:+'+-+-+-+W..+X.X.W.D.D.x.D.v.v.h.c.r.j.7.2.2.{.!.#._ _ _ ^ ^ ^ { { / ;.4.V V V C C >.C C C 4.>.C >.V C C 4.4.V >.V %@ ",
-" &@^ ] { / ^ ^ ] ^ { { { ] ] / ^ ] ^ ] ] / ] ] ] ] { { ] { ^ _ _ _ $.%.%.{.!.2.2.2.c.j.h.w.D.D.i.D.P.D. +{+X..+-+$+-+'+]+'+<+2+2+e+7+2+7+7+y+y+7+x+s+s+s+C+C+D+D+C+C+D+S+@@*@@@@@@@@@=@-@;@+ + + + + + + G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+. . . + + + + + + + + + + + + + + + + + + + + + + + + + + + + >@7+7+6+g+2+<+<+:+:+'+'+'+-+-+X.X..+D. +D.W.D.x.D.i.i.h.,@c.2.2.l.!.{.{.#._ _ ^ { ] { { y S.C >.V C >.>.C V C C V >.>.C 4.V C C C C >.V '@ ",
-" )@{ ^ ] ^ { / { { ] ^ { { { / / ^ ^ { ] / { { { ] { ] / ^ J ^ _ $._ {.~.!.2.2.2.c.j.h.h.v.i.w.w.D.P.P.W..+X.-+-+.+'+:+]+]+:+<+]+f+7+7+7+y+n+y+y+s+C+K+q+K+C+C+D+D+D+D+X+S+@@S+@@@@-@=@=@=@+ + + + + + + + G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+. . . . + + + + + + + + + + + + + + + + + + + + + + + + + + + !@n+7+7+7+7+2+<+g+<+]+<+-+-+'+.+.+X.W.O.P.D.D.x.D.x.i.~@h.C.2.2.{.{.!.{.~.%.%._ J ^ =.] ] e V C >.C C C C 4.V C 4.4.4.V C >.V C 4.V C C >.{@ ",
-" ]@/ { ^ { ] { ] ] { ^ ] ] { ] / ] { / ] ] / { ] ^ ] ] ] { ^ ^ ^ ~.$._ ~.!.!.c.2.c.c.h.i.i.h.x.D.W.O.D..+X..+X.-+'+'+'+]+<+<+2+g+2+7+7+n+7+q+s+s+q+s+C+C+K+D+C++@S+X+S+@@W+X+@@@@=@^@=@=@/@(@+ + + + + + + + G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+. _@:@+ + + + + + + + + + + + + + + + + + + + + + + + + + + <@n+n+x+7+7+7+f+]+2+2+]+]+'+'+'+'+.+.+W.W.O.D.D.D.D.i.i.h.h.2.2.{.l.!.~.%.$.l ^ ^ _ / { ] [@C V C V V C C >.V C C V >.C >.C V V V V V C >.}@ ",
-" _+/ { { / ] { ^ { { { ^ { ^ { / { { ] ] ] ] ^ { / / ] ] ^ J { _ _ l {.#.!.2.c.2.c.j.c.h.v.w.D.D.D.W.X.X.X.$+'+'+]+'+<+<+]+]+6+e+7+2+7+x+n+r+q+s+K+D+D+C+C+D+S+D+S+X+X+-@W+@@=@=@=@/@=@|@/@|@N++ + + + + + + G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+1@2@3@+ + + + + + + + + + + + + + + + + + + + + + + + + G+4@y+s+n+7+7+7+7+<+]+6+<+Z+]+-+-+X..+X.X.O.D.D.D.V.w.v.v.h.j.h.c.2.2.2.!.~.!.%._ _ =.^ ^ ] ..>.V 4.>.V C C 4.V 4.>.C C 4.C >.C V >.C V V V z. ",
-" w+/ ^ / { ^ ] ] / ^ { ] ] { ] ] { ^ { ] { ^ { { { { { { _ ^ ^ _ %.%.%.%.7.{.c.2.h.j.i.i.i.D.D.D.D.{+X..+X.$+.+-+]+<+'+5@<+7+2+7+7+7+q+y+r+n+q+C+s+s+D+D+D+S+X+S+X+@@@@-@=@=@=@=@=@=@6@/@7@7@6@8@+ + + + + + G+G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+9@0@+ + + + + + + + + + + + + + + + + + + + + + + + + a@q+s+y+s+7+7+7+<+g+<+<+b@'+'+'+'+|+X.X.P.X.P.D.D.i.v.i.w.h.r.C.c.2.!.!.!._ %.%._ ^ J ] { K C >.V >.V V >.C C V C C 4.4.>.4.V V V V V >.4.C c@ ",
-" d@^ ^ { / ] ] ^ / ] { ^ { { ] / { / ^ { ] { { / ^ ^ ^ / { ^ ^ _ _ %.{.{.{.{.2.2.c.c.h.w.w.i.w.D.D.X.X..+.+.+.+-+'+'+'+<+e+2+2+7+7+n+y+n+y+q+s+D+D+D+D+D+e@S+D+X+W+S+@@=@@@=@=@^@/@=@=@|@7@f@f@g@h@+ + + + + + G+G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+i@j@+ + + + + + + + + + + + + + + + + + + + + + + G+k@q+y+y+o+7+7+n+7+g+2+]+<+]+]+]+'+-+$+.+W.X.P.X.D.D.K.x.h.j.j.r.c.2.c.!.%.{.%.%._ { { ] ^ L >.4.>.>.V 4.>.V V 4.C V C V C 4.>.V >.C C >.V C W ",
-" l@{ ^ { ^ ^ { ] ] { / ] ^ ] { ^ ] ] / { ^ { ^ ] { ] ^ { ^ _ _ _ _ $.{.{.2.{.c.2.r.i.i.h.x.x.D.D.O. +.+.+-+.+-+-+'+:+]+]+6+e+<+g+7+o+n+y+y+q+q+K+D+D+C+D+S+X+X+X+S+@@=@W+=@=@=@f@/@6@|@f@f@f@g@f@f@+ + + + + + G+G+G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+m@n@+ + + + + + + + + + + + + + + + + + + + + + + o@C+s+q+s+n+7+y+7+7+7+e+<+<+'+]+-+-+'+-+-+.+{+ +O.D.D.K.i.i.h.h.2.2.c.l.{.{.!.!._ _ _ { J { O+>.V C >.>.4.C 4.C C C C C C V C C 4.V V V >.C C p@ ",
-" q@] { ^ { ^ ^ { ] ] ^ { { ] { ^ { ] { { { / { ] ] ] ^ ^ ] ] ^ _ l l l ~.7.3.c.i.c.j.h.i.i.D.D.D.D.D.X..+-+-+'+:+'+]+]+2+2+2+7+2+n+7+y+q+y+s+s+s+K+D+S++@X+X+X+S+W+=@@@=@r@=@/@f@|@f@f@f@s@g@t@f@t@(@+ + + + + + G+G+G+G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+u@M++ + + + + + + + + + + + + + + + + + + + + + + v@s+C+q+s+n+7+y+7+7+e+7+7+]+<+:+'+'+$+-+.+X.X.P.D.D.D.w.v.i.i.h.j.c.c.!.2.%.!.%._ _ _ { ] -.C C 4.V C V C 4.C 4.V 4.4.C >.C C V V V >.C C C 4.w@ ",
-" d@] { / { { { ] ^ ] { ] { ] ^ ] { { { { ^ { { / ^ ] { / { ` _ ^ _ _ l {.{.{.c.c.h.i.h.h.v.x.x.P.{+.+W..+-+-+'+-+:+'+:+<+6+e+7+7+n+7+y+r+q+q+C+D+C+D+D+S+X+X+@@@@x@=@@@/@/@=@|@/@/@f@|@f@s@g@g@t@y@t@z@+ + + + + + G+G+G+G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+A@B@C@+ + + + + + + + + + + + + + + + + + + + + + + q+C+J+s+s+o+q+n+y+7+2+2+g+]+]+]+'+'+'+-+.+$+X.X.O.O.D.V.w.i.h.h.r.c.2.{.7.!.!._ $.^ =.{ { ;.V V >.V C V >.4.4.>.C V 4.C V C V >.C >.>.>.C >.>.W ",
-" : { { { ] ^ { ] ^ { ^ ] { { ^ { / { ^ { ] / / { ] { ] { / J ] _ _ %.~.!.2.2.{.c.C.c.w.K.v.D.D.O.X.W.W..+.+.+-+'+'+]+6+2+]+]+7+n+7+q+y+q+J+s+D+C+C+D++@W+S+@@X+@@@@/@=@^@/@7@f@f@f@f@f@f@D@t@t@t@E@F@G@H@+ + + + + + G+G+G+G+G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+I@J@+ + + + + + + + + + + + + + + + + + + + + + 8@C+K+C+K+s+s+x+y+7+7+7+7+6+<+]+]+'+'+-+-+.+X. +D.D.D.D.w.i.i.h.c.i.c.2.3.!.%.!.l %._ ^ _ S ^.V 4.>.C 4.C C V C 4.>.>.4.C 4.4.C 4.V V V C 4.V C K@ ",
-" u.{ ^ { / ^ { ^ / / ] ^ { { ^ ^ { ] ^ { { ] { ] ] ] ] { ] _ ^ _ _ l !.%.!.2.2.2.c.c.h.h.i.x.D.D.X.X.X..+.+-+-+Z+m+]+6+7+f+2+7+7+x+q+q+s+C+s+C+D+C+D+D+@@@@W+@@=@=@=@=@=@f@=@f@f@f@s@f@s@L@t@E@t@F@M@M@F@+ + + + + + + G+G+G+G+G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+N@n@+ + + + + + + + + + + + + + + + + + + + + + O@D+C+K+s+K+q+q+s+y+7+7+2+2+<+2+:+'+-+-+-+.+$+O.X..+W.w.w.D.i.v.h.2.C.2.7.!.!.$._ _ _ _ ^ T V C C C C >.C C C C 4.>.>.V >.C C 4.V V >.4.V V 4.C z. ",
-" P@/ / { ] / { ^ ^ { ] ] { ] { ] / ] { ^ { / / ] { ] ] { ^ ^ { J _ $.!.%.{.{.{.2.c.h.i.h.w.V.w. +D.X.X.-+.+-+-+'+'+<+]+6+7+7+7+y+q+7+s+s+s+Q+C+D+D+S+X+S+X+@@=@=@@@/@7@/@|@f@f@s@t@g@f@t@s@y@t@E@Q@F@Q@Q@M@+ + + + + + + G+G+G+G+G+G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+u@M++ + + + + + + + + + + + + + + + + + + + + ;@D++@D+C+C+s+q+q+s+r+7+n+7+g+2+<+<+'+'+'+.+'+.+ + +D.D.D.x.w.h.j.h.r.c.l.{.{.%.~.%._ _ { ^ +.V 4.C 4.C V C V >.C 4.V C C V V >.C C >.4.C C C V V R@ ",
-" S@{ { ^ { / { ^ { / { { { { / / / / ] { { { { ^ ] { { ^ ^ ] { ^ _ _ ~.~.~.{.c.c.h.h.h.i.D.w.x.D.O. +O..+X.-+'+-+'+'+<+e+7+g+7+7+o+q+s+s+J+D+K+D+S+X+S+T@X+@@=@=@=@^@r@f@f@f@f@f@f@t@t@t@t@G@E@U@M@Q@V@W@W@X@+ + + + + + + G+G+G+G+G+G+G+G+G+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+A@B@C@+ + + + + + + + + + + + + + + + + + + + + Y@T@C+D+C+K+K+s+s+q+q+7+n+7+6+2+:+]+]+'+'+$+X.$+ +D.P.D.x.w.i.h.i.h.r.2.{.2.!.#._ l _ _ J s V C V C C V 4.C V >.V V V V V 4.C V C 4.V C >.>.C C V !+ ",
-" Z@{ ] ] ] ^ ] { { ] / / / / { ^ ] ] { ^ / { ] { / ^ ^ { ] ] { _ _ %._ %.{.!.2.2.2.j.h.h.i.K.D.O.D.D. +X.|+.+'+'+:+'+<+g+7+g+7+7+x+y+q+q+D+K+D+C+S++@X+S+=@@@@@@@/@6@^@^@|@g@s@t@t@t@D@y@t@y@Q@F@F@V@Q@W@W@`@ #+ + + + + + + G+G+G+G+G+G+G+G+G+G+G+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+.#G+G+G+G+G+G+G++#@#+ + + + + + + + + + + + + + + + + + + + + @@X+D+D+C+C+C+q+q+q+q+n+7+<+2+2+e+<+'+-+-+-+.+X. +W.O.D.w.D.x.i.c.c.c.2.2.{.!.#.!.l _ ^ J G.C C C V C V V V >.V 4.V >.V >.>.C V 4.>.C C >.4.>.V V Y ",
-" ##^ ] ^ { { ] { { { ] ] { { ] { ^ ] { ^ / { { ] ^ { ^ { ^ ] ^ _ ^ $.!.#.{.2.2.3.j.2.h.v.i.V.D.W.D.W.X..+.+.+-+-+]+<+]+2+<+7+7+7+s+r+r+s+D+s+D+D+S++@W+x@=@=@@@=@/@^@|@^@f@s@t@s@g@t@t@t@F@Q@E@Q@Q@Q@Q@W@$#W@$#%#+ + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+&#+ + + + + + + + + + + + + + + + + + + + + *#W+T@+@D++@D+C+q+q+s+n+n+7+7+f+<+2+<+]+:+-+-+$+.+ +O.D.D.D.w.K.i.h.c.2.l.2.{.!.{.!._ J =.F.C V V C V V C 4.V C V >.C C C C V >.V V V 4.C 4.C C >.4.## ",
-" =#/ { { { / ] / { ] { ] { { ^ / { { { { ] ^ ] { { { { { { { ^ { _ _ l %.~.{.7.2.c.h.i.w.D.v.D.D.X.O.{+.+X.-+-+-+<+<+2+g+7+7+7+7+q+r+s+s+C+D+D+C++@T@@@=@=@@@=@r@6@f@|@|@f@f@f@t@D@t@t@t@U@Q@Q@Q@Q@Q@Q@$#`@-#-#`@+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+;#C@+ + + + + + + + + + + + + + + + + + + + >#@@S++@D+D+D+D+C+J+s+s+n+7+7+7+7+<+2+]+:+]+'+.+$+X.X.X.O.W.D.x.w.w.i.h.c.c.c.!.~.{._ _ _ { ,#C 4.>.V 4.>.C 4.C C >.C >.4.>.C 4.V >.C 4.V C >.V C >.V '# ",
-" y / { / { { { ^ ^ { ^ ^ ] ^ { ] ^ ] { / ] { ] / { ] ] ] { { ^ J _ $.$.!.{.{.c.c.2.c.i.v.x.D.D.W..+X..+X.-+-+:+]+<+]+2+<+7+7+q+n+o+q+q+s+D+D+D+X+X+@@@@@@=@/@/@=@|@f@|@f@s@t@g@y@t@y@F@Q@Q@F@Q@Q@Q@W@W@$#`@)#)#W@+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++#@#+ + + + + + + + + + + + + + + + + + + + X@X+@@X+D++@D+D+C+s+q+r+s+y+7+7+6+2+<+'+'+'+'+'+.+ +W.W.W.P.x.i.h.h.h.h.2.g.2.{.{.~.#._ _ F.V C 4.V 4.V C C C >.C C 4.>.4.C C C >.V >.>.V >.>.C V V b+ ",
-" ).^ ] ^ ] { ] / ] / ] { / ^ ] { { { ^ ^ { ^ { ] / ] / ^ / { { J _ _ ~.!.!.{.{.c.h.c.w.w.D.x.D.D.D.X.W.-+$+-+'+<+]+]+<+2+7+7+n+q+r+s+s+C+C+C+D+S+X+@@S+@@=@/@6@/@|@f@g@f@t@t@t@t@t@y@F@F@M@Q@W@W@$#W@$#)#`@)#-#)#!#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+~#G+G+G+G+G+G+G+{#+ + + + + + + + + + + + + + + + + + + + E.@@@@@@W+D+D+D+C+C+s+s+7+s+7+7+2+2+6+2+<+'+-+-+-+-+.+.+D.{+D.w.D.x.c.i.c.2.3.{.%.!.#.l _ J L C C 4.>.4.V C V C V V >.V C V C >.V 4.>.V 4.C C 4.>.>.>./. ",
-" ]#/ / { / / ^ ^ ] { { ] { ] { ] ] ^ / { ^ ^ ^ { { { ] / { { =._ _ _ {.~.{.{.{.2.c.h.h.v.h.h.D.O.D..+.+.+-+'+'+<+]+<+2+7+7+7+q+y+q+s+C+J+D+C+D+S+@@@@@@W+@@/@/@r@/@f@f@s@D@t@t@y@y@E@Q@Q@W@W@Q@W@$#$#)#`@^#)#/#/#(#_#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+~#G+G+G+G+:#+ + + + + + + + + + + + + + + + + + + + =@@@X+x@S+D+D+X+C+s+C+s+y+n+n+y+2+g+g+]+<+]+'+'+|+-+W.W.X.D.D.w.i.i.c.h.2.c.l.{.{.%.%._ ^ y 4.V 4.V C V V C V C C C C V C C V C C C 4.V V V C 4.4.C V <# ",
-" [#{ ] { / ] { ] ] ^ { { { { { { ] { ^ / ] ] ] ] { { { ] { / ^ ] { _ l {.{.{.7.2.c.c.i.i.i.V.D.W.D.X.-+.+'+-+]+:+]+<+<+7+7+7+s+r+s+s+s+J+C+D+S+@@W+X+S+@@r@r@r@r@f@|@g@t@t@t@t@F@y@U@E@Q@Q@$#`@W@$#`@$#)#$#)#/#/#/#}#|#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+:@+ + + + + + + + + + + + + + + + + + + 1#=@=@=@=@X+X+S+S+D+C+q+J+y+s+q+x+7+7+]+]+]+:+'+-+-+.+X.W.X.D.D.i.h.h.h.c.r.c.l.{.!.!._ _ _ T ^.C V V 4.C C >.C V >.4.V 4.C 4.C V C C C >.C 4.V C V C >.[# ",
-" 2#/ / { ^ / ^ ] { ] ^ / { { / ] / { ] ^ ^ { ] { / ] ] { { { ^ { _ _ _ l {.2.{.c.j.c.h.i.K.v.D.D.O. +X.X..+-+-+:+]+<+<+<+7+7+n+n+r+s+s+C+C+S+D+X+W+W+S+=@=@/@/@=@f@f@f@t@g@y@t@F@Q@Q@Q@W@Q@W@$#$#W@-#)#/#)#/#)#/#3#4#5#+ + + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+M++ + + + + + + + + + + + + + + + + + + + =@/@=@=@W+S+W+X++@D+K+D+s+y+7+7+7+e+2+e+]+]+<+-+-+-+.+.+D.D.D.D.w.D.i.c.c.c.l.!.{.~.l %._ ] >.>.4.>.V 4.>.4.V V V >.4.V C C 4.V V 4.4.V C C V C C V >.C 2# ",
-" ] { { ] / ^ ] ] { / { ^ ] / ] ^ ] ^ ] ] { / ] { { { { ^ { { { _ _ %.~.$.!.{.2.2.h.j.w.h.V.D.D.P.O.W..+$+$+'+'+]+]+7+f+g+7+7+q+q+q+s+s+D++@+@X+X+x@W+@@=@6@6@/@|@|@f@s@t@t@y@y@t@Q@Q@Q@Q@W@$#6#)#`@-#)#)#/#4#3#4#4#7#W@+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+8#:@+ + + + + + + + + + + + + + + + + 9#=@=@=@=@x@X+D+S+D+D+K+K+q+o+r+7+7+g+2+7+]+<+'+'+-+.+$+X.X.D.D.V.x.h.i.j.c.2.l.7.{.!.!._ _ 9.>.4.V V C >.V >.V V V V C C C 4.V 4.V C V V 4.4.V C >.4.C C ",
-" _+{ ^ ] { ^ { { ] { { { { ] ] { ] { ] { { / / / ] ] { { / { =.^ _ l %._ !.!.{.2.h.h.c.i.D.D.D.D.W..+.+$+-+-+]+]+]+f+f+2+7+n+y+y+y+K+Q+C+D+S+X+W+=@=@=@r@/@f@|@f@f@f@t@t@t@E@M@F@Q@W@Q@`@$#$#)#)#)#)#/#/#/#4#/#4#0#7#a#b#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+~#G+G+G+G+G+G+c#d#:@+ + + + + + + + + + + + + + + + ;@^@=@/@=@@@=@X+X+X+D+D+D+s+J+y+n+7+7+7+7+<+<+'+'+-+-+.+.+P.D.W.D.D.i.w.i.j.h.2.{.{.!.$.~._ y ^.V C V C 4.C >.V C V V >.V V V 4.C C V C C V >.4.V V >.>.C e# ",
-" b.{ { ^ ] / { { { ^ { { ^ ] { { ] ^ ^ { { ] ] ] ^ / ^ { { ^ { ^ ^ _ _ _ #.{.2.2.2.h.c.w.h.D.D.D.{+P.-+X.$+-+'+'+<+<+7+7+7+n+n+y+s+s+K+D+D+D+X+X+@@=@@@/@/@f@^@f@f@s@y@t@U@t@Q@M@Q@W@$#$#`@6#`@`@`@/#/#/#4#4#4#a#0#0#7#f#g#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+;#h#:@+ + + + + + + + + + + + + + + + i#r@r@=@/@=@W+X+D+S++@D+D+s+s+s+7+7+7+7+7+<+]+'+]+-+|+.+.+W.W.D.D.x.i.w.j.c.c.2.2.2.!.~._ _ j#V V V C 4.C 4.V >.V V >.C V V V V >.C C 4.C 4.4.V V 4.C C 4.b. ",
-" k#{ / / { { { / ] / / { { { { ^ ] / ^ ] ^ { ] { ] { { { { ] { { _ ^ _ $.l {.7.c.c.c.c.h.D.V.D.D.D.O.X.$+-+'+]+]+2+6+f+f+7+n+s+s+q+s+J+C++@D+S+W+-@X+@@/@=@/@f@s@f@t@s@t@y@E@U@Q@Q@Q@$#$#l#$#`@)#/#/#4#4#4#3#3#7#7#7#f#f#f#m#+ + + + + + + + G+n#G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+;#o#+ + + + + + + + + + + + + + + + H@/@f@f@=@/@=@@@S+*@D+D+D+D+s+s+r+n+7+7+f+g+7+]+'+-+'+-+$+X.X.D.D.x.w.i.w.h.r.c.2.{.{.!._ %.F.^.>.4.4.4.C >.4.4.C 4.C >.C C C C C V >.V C >.>.C 4.V 4.C C V p# ",
-" # ] { ] / ] { { ^ ] { ] { ] ] { { { ] { ^ ] ] { ] ] { / ^ { ^ _ _ _ %.$.!.!.l.c.c.h.h.v.i.D.D.O.X.X..+-+-+'+:+]+2+g+2+7+7+7+s+s+s+C+D+C+D+X+W+W+=@=@r@f@^@f@f@q#t@t@t@G@F@Q@Q@Q@r#$#`@W@`@-#`@)#/#)#/#3#4#7#f#s#f#f#f#t#u#+ + + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+v#j@+ + + + + + + + + + + + + + + + -@f@f@|@r@=@W+X+@@W+S+S+C+C+q+s+s+n+n+7+7+<+6+6+]+'+l+'+-+X.X.W.D.x.V.h.h.c.c.c.c.7.!.!.%._ G.4.>.>.C >.>.4.C >.C >.C C V V >.V V V 4.V C V V 4.C V >.>.V w# ",
-" x#] ^ ^ / ] / { ] { ^ ] / { { ^ ] ^ ^ / ^ / / / { ^ { / ^ ^ / ] ^ _ l _ ~.!.!.{.c.j.j.v.h.x.D.O.W.X.X.-+$+-+'+<+<+7+7+7+7+7+q+q+q+C+D+D+D+S+@@@@=@=@=@=@/@^@f@s@s@y@y@t@E@G@F@W@W@$#W@$#)#)#)#/#/#4#4#5#a#3#5#f#f#f#f#y#t#z#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+M++ + + + + + + + + + + + + + + + A#|@f@f@/@/@=@X+=@X+X+D+D+K+K+s+q+r+n+7+7+<+g+]+'+'+-+-+.+X.W.X.O.D.D.V.h.j.2.c.c.7.~.{.l %.K ^.>.C >.V V C V C >.>.C C >.>.>.V 4.C 4.V C C C C >.C V 4.V 4.B# ",
-" C#^ / { { { { { { ^ ^ ] { ] ^ { ^ { { ^ { { { ^ ] ] / { ] { { { ^ _ _ ~.!.%.7.3.c.h.h.i.K.x.D.D.W. +X.$+.+'+'+<+]+]+7+7+7+y+y+q+C+q+C+D+D+S+@@S+=@/@6@^@|@f@|@s@f@s@y@t@E@Q@Q@Q@r#l#`@`@)#-#/#)#D#4#4#a#7#7#f#f#f#y#f#E#y#E#F#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++#+ + + + + + + + + + + + + + + + + t@|@r@^@6@=@=@@@W+@@D+X+D+K+C+s+s+s+y+7+2+g+2+:+:+]+'+-+1+W.D.O.D.x.v.i.i.h.c.2.2.!.{._ _ _ +.4.C V C C 4.4.>.>.>.C >.C >.>.>.>.>.V V >.V V V C V V C C V C G# ",
-" #./ { ^ ] { ^ ] { ^ / ^ ] { / ^ { { ^ { ^ { { ^ ] ] { { ^ ^ { ^ _ _ !.l {.{.!.c.2.j.j.w.h.i.D.D.D..+X.1+-+m+]+<+6+6+g+7+7+q+y+q+s+C+D+D+W+@@@@@@=@=@=@^@f@|@t@t@s@y@t@Q@M@Q@W@H#W@`@6#`@)#/#/#}#4#3#5#7#f#7#f#f#I#E#u#I#J#u#K#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + L#s@|@|@|@f@=@=@W+@@S+D+D+D+C+q+q+y+r+7+n+7+g+<+:+'+-+'+1+-+.+ +D.D.D.x.h.i.c.2.{.2.{.!.!._ u+C >.4.V V C >.4.C C C V C V V C V >.V >.V V C V C V C 4.C V >.,. ",
-" M#] { ] / { ] { ^ { { / / { ] ^ { ^ { { ] { ] { ] { { ^ ] ] { ^ ^ _ l !.l !.c.2.c.c.h.i.w.D.i.D..+{+X.-+'+'+m+]+]+]+2+7+y+x+r+s+s+Q+C+S+X+S+S+=@@@=@=@6@f@f@|@s@t@E@U@G@Q@Q@Q@r#W@W@$#`@`@)#4#D#4#3#3#f#3#f#y#t#y#y#u#E#N#u#O#P#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + |#t@g@f@/@f@|@=@=@=@W+X+X+D+D+s+s+s+7+7+7+7+7+2+6+<+'+:+-+.+.+X.X.W.D.i.x.i.c.c.c.c.2.{.$._ ] ^.>.B V >.4.4.>.V C V >.V C C C C 4.V 4.>.C 4.V C V C >.4.V C C Q# ",
-" / / ] { ^ ^ / { { { ] ] / ^ / { ^ / { ] { ] { { { / / ] { ^ { ] J _ _ !.{.{.2.2.,@h.h.w.v.D.D.W..+W.-+-+'+-+<+2+6+7+2+7+7+q+q+J+s+D+D+X+W+@@=@x@r@=@=@|@R#R#S#t@F@M@F@F@Q@Q@W@W@)#-#-#`@/#4#4#5#3#7#7#f#f#T#f#E#E#u#N#N#u#U#U#+ + + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + i#f@g@s@f@f@/@V#=@=@W+X+D++@C+Q+C+s+x+s+7+7+6+e+]+]+-+-+-+.+X.X.W.D.D.v.D.w.i.r.c.c.2.{.$.%.j#^.W#C 4.C V >.C C C C C 4.C V 4.V C >.V C >.V C C V V C C >.V C ",
-" P / ] { { { ] { { ] { { ] ^ { ] ^ { ^ / ] ^ ^ ] ] { ^ { { ^ ] =.^ _ _ $._ 7.2.2.c.i.c.i.v.w.D.W.W.X..+-+-+:+<+<+6+2+7+7+y+q+q+q+C+D++@S+S+W+X+=@=@r@7@f@f@s@t@s@y@U@y@Q@Q@Q@Q@H#`@$#)#/#/#/#3#5#7#5#5#f#f#f#y#E#u#u#u#N#N#U#U#X#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+~#G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + Y#t@g@f@f@|@=@|@=@=@@@@@W+S+D+D+Z#s+q+o+7+x+e+7+2+<+<+'+-+-+.+X.O.W.D.w.i.K.i.h.c.c.{.{.%._ b ^.B C >.V C C 4.V V C 4.C 4.V V >.V >.C V C V >.>.V >.4.4.>.>.4.W ",
-" `#^ { { { ] / { { { ] { { { ] { ^ ^ ] { ^ ] ] { { ] { { { / ^ / =._ _ %.~.{.!.2.2.c.h.h.x.D.D.W.D.X. +.+'+'+]+]+]+g+<+7+7+n+q+s+C+D+D+S+@@@@-@-@=@r@6@|@R#g@t@y@E@y@F@Q@W@W@`@$#`@`@)#/#)#/#4#3#7#4#7#f#f#y#E#t#u#u#u#U# $.$+$@$#$+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + f@y@g@g@f@^@^@/@=@x@S+@@W++@+@C+s+q+q+r+y+7+7+2+2+<+'+]+'+-+ + +O.D.D.D.w.i.c.h.2.c.2.!.%.~.+.$$$$>.C C C C V V V 4.C >.>.>.C C C C >.V V C C C C 4.V C C C V `# ",
-" %$] { { ] ] ] { { ] { ^ { { ] ] ^ { { / / ] { ] { { / ] / { { ^ J _ _ l {.{.!.{.h.i.i.w.w.w.D.D.P..+X.'+-+'+<+2+7+g+7+7+q+s+s+C+C+D+D+S+X+@@W+=@/@6@|@|@g@f@s@y@E@E@Q@Q@W@l#W@-#`@)#/#4#4#3#4#3#5#f#f#f#T#E#I#E#J#U#U#U#U# $ $&$*$+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+=$=$=$-$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + ;$t@t@s@s@f@r@^@=@>$W+x@@@S+S+C+K+C+s+s+x+7+7+7+f+<+<+-+-+-+.+X.{+D.P.D.i.h.i.r.j.2.!.{.l {.e ^.^.C >.>.>.>.C C C 4.>.C >.V 4.C C 4.C 4.4.4.4.>.C C V >.C V >.,$ ",
-" '$^ ] ] ^ / ^ / { ] ] { ] { ^ ^ ^ { ] ] ] { ^ { ] ] { { ] ] ^ ] ^ _ $.%.l !.2.l.c.h.c.h.D.V.D.D.O..+-+$+-+]+'+b@<+g+7+7+7+r+s+s+s+s+D+S+@@=@@@=@=@/@/@^@|@g@s@t@t@y@U@Q@W@`@$#l#-#)#/#/#/#4#3#3#7#7#f#)$I#y#u#N#N#U#U# $U#!$@$.$~$+ + + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+{$]$-$=$=$=$A@^$=$=$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + E@t@t@|@f@/@f@=@r@@@S+W+*@S++@D+J+s+q+s+7+7+7+<+]+]+<+-+-+-+$+X.W.D.D.D.i.i.c.c.c.c.!.{.~.] ^.$$>.C V 4.V 4.C V C V C V V 4.V V >.4.>.>.>.C 4.V >.C 4.4.V C V /$ ",
-" ] / ^ ^ / { { { ] / { ] ] / ] ^ { { ^ { ^ ] { ^ { ] { { { / ] ^ _ $.l ~.!.{.l.c.c.h.c.h.w.D.D.D.X.X.X..+-+:+]+]+<+2+7+n+y+s+s+D+D+D+D+X+@@($@@/@r@7@f@f@s@s@t@E@E@Q@Q@$#$#W@-#)#/#/#/#4#3#3#a#7#f#y#f#y#u#E#N#u#U#U#.$+$+$~$~$~$_$+ + + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+:${$<$[$}$:$}$-$[$=$A@=$=$]$=$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + |$E@y@t@s@f@f@/@=@=@@@X+@@X++@C+D+s+q+y+q+y+7+2+6+]+6+]+-+-+.+.+W. +D.D.h.x.v.h.h.l.{.{.{.%.1$^.$$^.C C C C C >.V V C C C V V 4.>.C 4.C >.4.>.V C >.C 4.C V >.>. ",
-" 2$^ { { ^ ^ { { ] ] ] { ] ^ ] ] / { { ] ] ] ^ { ^ ] ^ / { ] { =.^ _ %.l _ {.{.2.c.c.h.v.D.D.D.W.D.X.$+-+'+-+'+<+]+e+7+y+7+s+q+D+C+e@D+D+X+X+x@@@/@r@/@|@f@t@t@U@t@M@Q@Q@$#W@W@$#)#)#4#3#5#0#3#f#f#f#E#y#u#E#u#O#O#U# $.$~$&$~$~$3$4$+ + + + + + + + + G+G+=$]$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+5$5$<$5$5${$}$:${$[$[$-$=$:$=$=$=$-$=$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + ;@E@t@t@s@f@g@f@/@^@=@=@X+S+S+S+D+D+s+s+r+q+7+7+e+6+]+'+'+-+.+X.W.X.P.W.D.v.x.i.r.2.c.{.{.{.K ^.^.$$C V >.>.C C >.C >.V C V V >.C C >.C C V C C >.>.>.V >.>.C V 6$ ",
-" =#] { / ^ { ^ / / { ^ { ] { { { { { ] { / / / ] ^ ] { ] ^ ] / { ] ^ _ _ ~.!.7.{.2.h.h.h.w.w.D.W.W.X..+X.-+m+'+6+6+]+2+7+y+s+y+s+Z#C+D+D+S+W+-@r@r@6@|@f@s@t@D@G@F@F@Q@Q@W@$#l#)#`@)#/#4#4#3#3#7#f#f#f#E#u#u#N#U#U#U#U#+$!$~$~$7$3$8$9$+ + + + + + + + + =$G+=$=$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+0$a$a$a$a$5$a$b$5$5$c$c$5$d$}${$=$:$-$=$=$=$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + e$E@t@f@t@R#f@r@/@=@=@=@X+S+S+e@C+D+s+q+n+7+7+2+e+<+2+]+'+-+.+.+.+.+X.D.i.v.h.j.c.2.2.{.{.=...^.^.V C C C V C >.>.>.C 4.V V >.C 4.4.V C >.C >.4.C 4.C >.V C 4.4.'# ",
-" f$] { ^ ^ ] { { / ^ ^ ] { { / ] ^ { / ] { ] / ] ] ^ { { ^ ] { ] / _ _ #.{.g${.c.2.h.c.w.w.x.D.W. +W.X.'+-+-+<+6+7+2+7+7+q+q+s+C+C+D++@T@-@X+=@=@|@|@f@t@f@s@t@t@G@Q@W@Q@W@`@-#-#/#/#4#4#7#0#3#f#T#)$E#u#u#J#u#U#U#U#!$~$~$~$3$h$7$3$i$+ + + + + + + + =$=$-$]$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+j$k$k$k$k$a$l$0$a$a$a$a$5$a$5$5$5$<$[$}$A@:$[$-$=$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + H@Q@E@t@t@s@q#f@/@/@/@@@-@S+W+D+C+D+C+s+n+n+7+7+g+7+<+<+:+'+-+-+.+.+X.D.V.D.w.i.j.c.7.2.{.~.9.^.>.C 4.4.C V >.C C C >.V C 4.V V V >.C >.>.>.C C V V C C V >.>.>.m$ ",
-" n$^ { ] { { ^ { ] { / ] { { { ] ] ] ] ] { { ^ ] { / ] { ] ^ ] ^ { / ^ _ !.%.{.3.c.h.h.h.i.i.D.D.W..+-+-+'+'+]+:+7+2+g+7+q+q+s+C+J+D+S+X+@@@@=@=@r@f@f@f@|@f@t@E@E@E@W@W@Q@$#$#^#)#/#4#5#s#7#7#f#T#y#t#u#O#u#U#U# $@$&$@$~$7$7$_$_$3$o$+ + + + + + + + + [$}${$c$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+p$q$r$s$s$j$p$k$s$a$q$a$l$l$a$a$5$a$5$}$}$}$A@[$-$=$G+G+G+G+G+G+G+G+G+G+G+G+G+G+n#G+G+G++ + + + + + + + + + + + + + + + |@M@M@t@s@s@f@f@f@=@=@@@@@W+D++@C+D+s+s+s+7+7+2+6+2+]+'+]+-+1+$+W.O.W.D.D.w.h.i.h.c.{.{.{.t$^.^.^.4.>.C V C >.4.4.4.C C >.C >.V C V C >.>.C V C V >.V >.>.C C C n$ ",
-" l@{ ^ { / { ^ { ] { { / { { ^ ^ { ] ^ ^ ^ ^ ] ] ] ] { { { ] ^ / / _ _ _ %.{.{.2.2.c.h.h.V.D.D.X. +.+.+'+-+'+]+<+2+2+7+7+7+q+s+C+D+D+S+W+@@-@/@/@/@^@s@g@g@y@t@M@Q@M@W@W@`@-#)#)#D#D#3#4#3#f#f#f#E#E#u#u#O#U# $ $@$!$~$7$~$7$7$3$_$u$.$+ + + + + + + + + {$}$5$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+v$w$w$x$w$p$p$r$w$s$p$s$k$j$k$a$k$a$a$a$b$a$5$}$}$[$}$-$=$=$=$G+G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + y$Q@F@y@t@t@s@g@f@f@=@r@=@@@W+S++@e@s+s+q+q+7+7+7+2+<+<+'+-+$+X.-+X.X.D.D.i.i.c.c.c.2.7.{._ ..a+^.>.C V 4.C C V V C >.C C C C V 4.C C >.C C >.V C 4.V V V C V >.w@ ",
-" z$] ] / ^ ] ^ ] ] { { { ] ] { { { { { ] / ^ { ^ / ^ / { { { ^ ^ ^ / _ l %.{.{.!.c.c.c.c.i.w.D.W.P. +.+.+'+'+:+]+<+7+7+7+n+s+s+s+C+D+D+S+X+@@=@=@/@|@f@f@t@t@t@M@y@W@Q@`@W@$#)#/#/#}#}#4#5#7#7#I#)$u#u#O#O#N#U#U#+$+$~$~$7$~$_$3$3$o$A$B$+ + + + + + + + 5$5$5$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+C$C$C$v$C$v$r$w$v$D$E$E$w$w$j$k$j$j$k$k$a$l$a$a$5$c$:$[$[$=$A@=$=$G+G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + Q@Q@F@E@t@f@f@|@|@6@/@=@=@S+W++@C+C+C+s+r+y+n+7+g+7+]+]+'+-+-+X.X. +D.D.w.v.i.h.j.l.2.{.!.G...>.B C C V V C >.C C 4.C C C 4.C >.V >.>.C C V >.C C V >.V C C V 4.z$ ",
-" d@/ ] { { ^ ] { / { { ] { { / ^ { { ] ^ { ] ] { ^ ] ] / ] { ] { { _ _ l %.!.!.{.c.i.v.i.i.x.D.D..+ +-+-+-+]+]+]+<+7+7+y+q+s+s+D+C+C+X+@@W+@@r@/@7@|@f@t@s@t@y@F@Q@W@W@Q@`@-#/#)#/#/#3#4#0#f#f#T#y#u#E#u#U#U#U#+$~$~$~$7$_$3$3$3$F$F$F$G$+ + + + + + + + 5$a$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+C$H$C$C$C$C$I$C$C$v$v$v$v$w$D$w$p$E$k$k$j$k$a$a$a$a$5$5${$:$[$=$-$=$G+G+G+G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + J$Q@E@t@t@t@t@f@|@|@/@/@=@-@X+X+X+C+s+s+y+q+y+7+7+<+f+]+]+m+-+X..+.+D.D.D.x.i.h.c.c.2.{.{.K M ^.>.>.V V C >.C C V 4.C 4.C C C V C C 4.C C V >.>.>.C >.V 4.C V C W ",
-" 2#{ ] / / ] { ] { / { { ] { / { ^ / ] ] ] ^ ] ] ^ ] { ] ] ] ] ] { _ _ _ !.{.{.c.c.c.h.i.D.D.D.O.P. +.+.+-+:+<+<+7+2+7+x+y+y+s+J+s++@W+X+W+@@=@6@^@f@f@f@g@t@F@t@Q@W@W@$#`@-#/#)#/#/#4#3#f#f#f#f#E#E#u#O#U#U#U# $&$~$~$7$3$3$A$_$_$A$F$K$L$+ + + + + + + a$a$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+M$N$O$P$H$O$O$O$C$C$C$v$C$v$v$v$v$Q$p$r$q$s$s$q$k$l$a$c$5$d$5$}$:$:$A@R$=$G+G+G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + S$W@Q@U@t@y@t@g@|@|@7@/@=@=@S++@D+D+C+D+C+n+q+7+7+2+<+'+]+:+'+.+X.X. +D.D.w.v.i.h.h.c.2.{.T$[.a+^.B 4.C >.C V V >.C V >.C V C V 4.C C V >.V >.C C C C 4.V C C 4.>.2# ",
-" U$] ] { / ] { / ^ ] ^ { { ] / { / ] { ] ^ { { ^ ] ^ { ^ { ^ { / { { _ _ #.!.2.7.c.c.i.i.V.D.D.{+W.-+.+-+-+-+6+g+<+7+7+o+y+s+q+D+D+S+S+W+@@=@=@6@/@f@|@t@s@y@y@Q@W@W@$#W@$#$#^#4#/#4#7#a#f#y#y#f#u#V$O#N#U#.$@$@$&$7$_$7$3$o$A$F$A$W$W$X$m#+ + + + + + + a$k$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+Y$P$M$Z$M$M$M$P$O$M$I$C$C$H$C$C$v$v$v$r$w$r$p$r$k$j$k$a$a$5$a$5$d${$[$:$=$G+]$G+G+G+G+G+G+G++ + + + + + + + + + + + + + + + `$W@Q@E@E@E@t@g@s@|@f@|@=@=@S+W+@@S+C+s+C+s+x+q+7+7+2+6+<+'+]+-+.+.+D.W.D.D.w.i.i.2.c.2.{.{.j#^.^.W#>.W#>.4.V C V V C >.C V C >.>.V C >.V >.>.V V V C C V V >.C >.0. ",
-" { ^ ] ^ { { / ^ / { / ] { ^ / ] ] ] ] { ^ { / { { { / ] / ] ] / J _ _ _ !.!.{.c.2.h.i.v.i.D.X.X. +.+$+$+'+'+]+2+7+2+n+n+s+J+D+D+D+X+@@@@=@=@/@|@|@f@f@s@t@y@y@Q@W@W@l#l#`@)#/#4#/#3#7#7#f#f#E#E#E#U#O#U#.$U#.$~$7$7$3$3$3$A$F$A$F$W$W$ %+ + + + + + + + s$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+.%+%@%+%+%#%+%Y$N$Y$+%O$M$H$C$I$O$C$C$v$v$v$Q$w$v$p$k$q$j$a$a$a$a$5$}$[$:$]$=$=$G+G+G+G+G+G+G++ + + + + + + + + + + + + + + |#Q@Q@Q@Q@y@t@t@g@|@f@^@/@=@@@=@S+S+X+D+s+s+s+s+7+7+7+f+<+]+]+.+.+X.W.W.D.D.w.i.v.h.2.c.7.{.U+O+......^.$$$$$$4.C C C C C V C C V >.C V C >.C >.>.V C C C C C V C >. ",
-" $%{ ^ ^ { { ] { ^ ^ { ] ^ { / ] { { ^ ^ { / / ] ] ] ] { { { ^ { ^ ^ _ !.{.~.!.{.c.c.i.w.w.i.D.D. +.+1+-+'+'+'+2+e+7+7+y+s+r+J+K+D+D++@X+=@@@=@6@|@f@f@s@t@G@F@Q@Q@W@$#`@-#-#/#4#4#3#3#f#7#t#f#E#%%E#N#U# $@$@$~$h$7$3$3$_$&%A$A$K$W$K$ %*%+ + + + + + + s$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+=%@%-%;%@%@%Y$>%Y$Y$#%+%Y$N$Y$Z$M$O$C$C$,%v$v$C$Q$w$r$p$q$k$k$l$a$a$5$[$}${$[$-$=$=$G+G+G+G+G++ + + + + + + + + + + + + + + + l#Q@W@M@M@t@y@t@t@f@f@^@/@=@@@@@X+X+C+C+q+s+s+y+7+7+7+]+<+<+'+'+.+ +.+W.D.D.w.h.h.c.2.{.!.b '%......$$W#$$$$W#C $$>.4.V >.V C 4.V C C V C C C C 4.C V C C V 4.C C )% ",
-" { / { ] ] ] ^ ] { ] ] / ^ ^ { / { ^ { { ] ^ { { { { ^ / ^ ^ { ] ^ _ _ ~.$.{.2.7.c.c.h.w.D.x.D.X.D..+.+'+]+:+]+2+2+7+7+r+q+s+s+C+X+S+S+@@=@=@/@/@f@f@s@t@t@F@M@Q@W@W@)#$#`@)#D#/#7#7#5#f#f#y#E#u#E#U#U#U#!$&$~$~$7$7$_$_$_$A$!%W$F$W$ %X$~%+ + + + + + p$Q$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+{%]%-%{%{%{%-%-%@%@%@%@%.%Y$@%+%+%+%N$O$M$P$C$C$C$C$v$v$w$p$s$j$q$a$a$5$5$c$5$}$[$=$=$=$G+G+G+G++ + + + + + + + + + + + + + + + l#Q@Q@Q@U@E@G@t@f@f@|@r@=@=@@@W+X+X+D+C+J+s+r+r+7+7+7+6+<+:+'+'+-+.+ +W. +x.V.w.h.c.c.{.!.=.^%....../%$$W#W#$$^.W#$$$$C >.C V >.V 4.V C >.C >.>.>.C V V 4.C V V C >. ",
-" b.^ / { { { ] ^ { ] ^ ] / ] ] ] { { { ] { / ^ / { ] ] { ] ] ] ] ] _ _ $.l ~.d+2.c.h.i.i.V.D.D.W..+ +-+.+-+]+<+<+6+7+7+7+n+s+q+K+C++@S+@@X+@@/@/@f@|@f@s@y@M@y@Q@Q@W@$#$#-#/#/#/#4#7#5#f#f#E#u#E#E#O#O#U#.$~$@$7$~$_$_$3$A$_$(%K$ %W$X$ %_%:%+ + + + + + v$v$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+<%]%[%[%}%[%{%-%[%-%-%-%=%@%@%@%|%+%Z$#%+%M$#%I$M$C$C$C$C$Q$w$r$r$q$j$k$a$a$a$}$d$[$-$-$=$-$G+~#G++ + + + + + + + + + + + + + + 1%W@$#Q@Q@y@Q@t@t@f@|@|@|@^@=@=@@@W+S+C+C+C+q+y+o+7+7+]+<+]+]+'+-+-+X.X.W.D.V.i.h.h.r.2.{.2.~ 2%O+..^.B B W#B B ^.^.$$W#W#B V 4.>.C C 4.C V 4.4.4.C C >.V 4.>.C C C b. ",
-" 3%{ / / ] ] / ^ ] { { { ] { { { { ^ { ^ / / ] ] ] { / ^ { { { { { { _ _ !.{.!.2.2.c.i.h.w.D.D.O.W..+-+'+-+:+<+<+2+7+7+y+s+s+C+C+S+X+W+-@W+=@=@|@|@s@t@t@t@y@Q@M@W@Q@W@$#`@)#/#4#4#0#f#f#)$)$y#u#O#U# $@$.$~$~$h$~$3$3$_$A$W$W$K$ %X$X$_%4%5%+ + + + + + v$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+6%6%7%<%}%<%}%8%[%}%}%[%=%-%-%-%@%@%@%@%Y$+%+%+%N$O$O$H$C$C$v$v$w$E$E$q$q$k$a$5$c$d$[${$=$=$G+G+G++ + + + + + + + + + + + + + + 9%`@W@Q@Q@F@E@y@t@f@R#|@r@r@=@=@x@W+D+D+D+C+s+q+n+y+7+e+2+<+:+:+-+-+.+X.O.D.D.V.h.h.r.r.2.{.K M ..../%^.W#W#W#W#B B W#W#W#B $$C 4.>.4.V >.4.V C C V >.4.4.V C C V 4.0% ",
-" 2#] { ] { ] { { { { ] { { { { / ^ ] ^ ] { ^ { { { ^ ^ ] { ] ^ ] ^ =._ _ !.#.{.2.c.C.c.h.h.w.D.P.D.X.X.-+'+)+6+2+f+e+n+r+x+s+K+D+D+S++@@@W+=@r@|@=@f@s@s@t@E@Q@a%Q@Q@l#$#)#/#/#4#3#5#0#f#f#y#E#E#E#b% $@$.$~$~$~$7$3$A$A$A$F$W$!%W$c%X$_%4%_%d%+ + + + + C$M$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+e%7%f%g%6%e%7%f%8%8%6%f%8%[%]%-%}%-%=%h%@%@%@%+%Y$#%P$N$O$C$C$v$v$v$w$r$k$j$s$l$a$a$}$:${$]$=$G+n#+ + + + + + + + + + + + + + + L$$#$#Q@W@M@y@E@t@t@g@q#/@|@=@@@X+X+S+S+D+D+s+J+n+y+7+e+f+<+'+'+'+-+$+W.X.{+V.D.v.i.c.2.c.l.i%,#,#......^.^.W#W#$$$$$$W#W#^.^.W#$$C >.C C 4.4.>.C >.C V V >.>.4.C V C j% ",
-" a / { { { / { ] / ^ { { ] ] / ^ ] ] { { { ] { { ] ] ^ { { ] ] { J ^ _ _ %.{.{.2.c.h.h.h.v.D.D.D.W.-+.+'+:+]+<+6+6+7+n+q+s+C+K+C+D+D+D+@@@@=@/@|@f@|@s@t@y@F@M@W@Q@W@$#`@/#)#3#4#5#3#f#f#t#u#u#E#O#U# $~$.$~$~$_$_$A$A$A$W$F$F$K$X$X$_%k%4%4%l%+ + + + + H$M$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+m%n%e%m%e%m%e%e%7%e%e%e%f%8%<%]%}%[%]%o%=%-%-%@%@%+%@%#%N$Z$O$I$C$H$v$v$w$r$p$k$j$a$a$5$<$[$}$}$]$=$+ + + + + + + + + + + + + + + ;@)#$#r#l#Q@Q@t@E@y@L@s@f@|@r@@@x@@@W+S+D+C+D+q+r+y+7+7+g+]+6+]+'+-+-+X.X.D.D.D.i.i.c.c.2.l.{.2%^%..p%..^.B $$B $$^.^.$$B $$W#$$^.W#C V C >.C >.>.V >.C >.C >.>.4.>.C q% ",
-" ] ^ ^ { / ^ ] ] { ^ { ] { { ^ { { ^ { / { { { / ] { / ^ ^ ] ] { ^ _ _ l {.!.l.2.h.r.i.K.V.D.D.O..+X.-+-+:+]+]+7+6+x+n+q+q+C+D+D+X+S+S+W+=@^@7@f@f@g@t@y@t@Q@W@W@W@W@`@^#)#)#/#7#7#0#f#y#y#u#u#O#U#U#U#!$7$~$~$7$_$A$A$F$F$W$W$ %X$X$4%4%r%r%s%+ + + + + O$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+m%t%m%m%m%m%n%m%e%e%e%e%g%e%g%7%7%6%8%f%]%[%-%<%@%-%@%@%+%#%#%+%N$N$C$C$x$D$v$E$w$k$a$l$a$u%c$[$=$]$+ + + + + + + + + + + + + + + + -#$#`@Q@Q@Q@y@F@y@t@s@g@f@7@r@V#X+=@S++@D+K+s+q+q+y+7+7+2+]+]+]+-+$+X.X.X.D.D.h.w.c.h.c.2.!.M.2%....v%^.$$$$B W#$$W#^.W#$$^.W#W#$$$$V >.C C C V C C V V 4.>.4.>.4.C C ",
-" w%] { ^ { ^ { ^ ] ^ / ^ / { { { { ] ] { ] ] ^ ] { { { ^ ] ^ { { =.^ _ _ %.%.{.c.2.2.r.x%i.w.D.D.X..+.+-+'+Z+'+6+<+7+7+r+y+q+K+C+S+X+W+@@=@=@=@/@f@t@s@t@t@Q@Q@W@Q@l#$#`@^#4#4#/#4#7#7#T#I#E#N#u#u#U#U#+$&$~$y%7$z%_$F$A$F$!%X$X$_%_%A%A%r%r%B%+ + + + + + #%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+C%D%D%E%F%G%m%H%m%m%m%m%n%e%e%e%e%e%7%8%7%6%[%]%=%]%-%@%@%@%#%Y$M$M$N$C$I$v$v$p$w$r$w$k$a$5$a$}$c$A@:$+ + + + + + + + + + + + + + + a%$#$#$#Q@W@E@Q@t@L@s@g@f@/@|@>$=@@@X+D+S+C+s+q+s+n+n+7+7+f+'+m+-+-+-+X.W.D.D.D.v.h.j.c.c.{.U+'%....p%..W#W#$$^.B W#$$^.W#$$W#$$^.$$^.B >.C V C C C >.C C >.>.C C 4.4.I% ",
-" J%^ { ] ^ { { / ] { ^ { / { ^ / { { ] ] { ] ^ ^ { ] { ] { { ^ ] ^ ^ _ %.$.#.{.c.2.2.h.h.w.D.D.O.W. +.+'+:+:+b@e+2+7+x+r+y+J+C+C+D++@@@x@=@=@=@|@f@t@f@t@F@F@Q@W@$#W@)#-#D#)#4#3#7#f#y#I#I#u#N#U#U#@$.$ $~$~$3$_$A$_$F$F$W$X$X$X$X$4%K%K%r%L%r%+ + + + + |%@%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+C%M%G%N%F%M%O%G%F%G%E%E%E%m%E%H%m%e%e%e%e%e%7%6%8%<%[%[%{%-%@%@%@%+%+%M$M$O$H$C$v$v$E$w$j$s$0$a$5$<$:$:$+ + + + + + + + + + + + + + + P%/#-#$#$#Q@W@F@y@t@t@f@f@f@7@=@@@x@@@W+D++@C+q+s+n+o+7+2+2+]+'+'+'+.+-+D.X.D.D.i.w.i.c.2.!.] ,#......^.v%^.^.^.$$^.$$$$^.B $$W#B ^.$$B V C C >.4.C 4.>.4.C V V >.C 4.Q% ",
-" { ] / ^ ] { / ^ ] ^ { { ^ / { ] ^ { / / ] { ] ^ ^ ] { { ] ^ ] ^ ^ / ^ ~.l !.2.c.c.c.h.i.D.D.D.O..+X.$+-+]+2+]+6+e+7+x+q+q+q+D++@+@D+@@=@=@=@^@/@f@t@t@t@F@Q@W@W@$#l#`@)#/#4#5#0#f#f#T#y#E#O#E#U#U# $&$@$~$7$3$_$A$A$W$F$!%K$X$_%_%4%r%r%r%R%S%+ + + + + .%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+C%T%C%T%T%C%T%M%N%O%C%N%F%D%F%E%m%m%H%n%e%e%e%7%f%6%f%6%{%{%-%-%@%@%+%@%+%Y$M$I$C$v$v$r$r$E$s$k$0$a$5$}$+ + + + + + + + + + + + + + + U%^#$#6#W@W@Q@Q@E@t@s@s@f@^@=@=@=@=@@@S+S++@C+C+q+s+y+7+<+2+<+]+'+-+X..+O.W.W.x.D.v.h.h.C.c._ '%'%2%..^.B B ^.$$W#^.W#$$$$W#^.W#$$$$W#W#B ^.V >.C V C 4.4.4.V C V V C V ",
-" [+{ ^ ] { ^ / ^ { { ^ ] ^ ] ^ ] ^ { ] ^ / { { ^ ^ ^ / / { ^ / ] { / ^ _ !.!.7.{.2.c.c.i.i.h.D.W.X..+-+$+)+]+]+2+]+2+n+y+s+J+C+C++@T@@@W+=@=@6@f@f@s@s@t@E@M@E@V%$#W@-#)#/#W%5#3#7#f#f#y#I#N#U#O#U#.$&$~$~$~$3$A$A$F$F$F$F$X$_%X$4%k%4%r%r%r%X%Y%+ + + + + {%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+T%Z%`% &T%T%T%T%T%T%T%T%C%O%O%F%G%D%G%G%E%m%m%e%e%e%7%7%7%7%<%[%-%h%-%@%@%+%P$P$N$C$v$v$v$w$r$s$j$a$a$5$+ + + + + + + + + + + + + + + Y#)#.&)#`@W@r#Q@F@F@E@t@s@f@|@/@=@@@=@W++@D+C+D+s+q+n+x+7+g+<+]+:+-+-+.+X.X.W.D.x.D.h.h.c.2.7.+&..2%..../%$$$$^.W#$$W#W#W#W#W#$$$$$$W#W#$$B 4.C >.4.V C V 4.C C C V C V [+ ",
-" w+^ { { { ] / ] / ^ ] { ] ] ] ] ^ ] ] { / { { ^ / ] ^ ^ ] ^ { { ^ J ^ _ !.{.!.2.2.2.i.i.v.w.D.{+X.X..+'+'+]+]+7+e+7+7+y+s+s+C+D+D+@@@@=@@@/@^@|@f@R#s@t@t@Q@Q@`@$#6#`@-#/#W%}#3#5#f#y#I#E#O#U#N#U# $~$@$h$3$3$3$u$F$F$F$X$X$X$_%A%4%A%r%r%@&#&$&+ + + + + [%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+%&&&`% &*&`%`%`%`%Z%`%=&T%-&C%T%O%D%F%C%E%E%m%t%m%n%e%e%e%7%8%<%o%{%-%-%@%@%Z$O$N$N$H$I$v$x$w$w$E$k$s$5$5$+ + + + + + + + + + + + + + h@/#)#-#`@$#Q@W@y@F@t@t@t@f@f@/@=@=@@@X+D+S+C+C+s+s+s+7+7+7+]+'+'+'+-+1+X.W. +D.D.w.i.h.h.2.2.U+'%2%......B W#$$$$$$$$^.$$W#W#^.$$^.^.W#^.^.$$$$4.4.V V >.4.>.>.>.C V C m$ ",
-" ] { { / ] { { { { { ^ / { ] { ] { { / ^ ^ { / / ^ / / ^ { ^ { ] ] =._ $.%.!.{.{.c.i.h.D.x.D.P.W.W..+X.'+)+'+]+2+7+n+n+s+q+C+C+D+S+*@@@=@=@/@f@f@f@t@t@E@U@W@Q@$#`@`@-#)#/#4#5#7#f#y#u#E#u#N#U#U# $&$@$~$h$_$A$_$F$F$!% %X$X$_%;&K%K%r%B%B%>&,&'&+ + + + <%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+)&%&)&!&%&&&%&&& &~&*&*&`%`%T%T%T%C%C%C%M%M%F%G%m%n%n%e%e%7%7%6%[%}%<%<%-%@%@%|%Y$+%H$O$I$v$v$p$q$s$q$k$a$+ + + + + + + + + + + + + + + /#/#`@-#`@W@Q@Q@y@t@t@t@f@f@^@r@/@=@X+W++@+@K+q+q+y+o+7+7+f+]+]+]+-+$+.+.+.+D.D.w.i.i.h.c.{.{&]&+.......$$$$$$^.W#W#^.$$^.W#W#W#^.B $$$$^.^.B ^.V C >.C V C V >.>.C >.>. ",
-" ^&^ ^ { { { { ] / ] { ] { { / ] / { { { / { { ] ] { ] / ^ ] ] { { _ / _ %.l {.c.2.r.h.h.v.w.D.W.X.X..+-+-+<+:+2+2+7+7+n+q+s+D+D+C+W+X+x@=@=@|@f@|@f@f@t@U@U@W@l#`@`@)#)#/#3#3#a#a#f#y#T#y#u#U#U# $!$~$~$7$8$_$_$_$F$F$/&*%X$X$4%A%4%r%r%@&,&,&(&*$+ + + + 8%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+_&_&&&_&_&&&&&)&)&&&%&%&)&*&~&~&T%T%T%T%C%M%M%F%G%G%m%m%:&m%e%g%f%7%}%[%{%{%-%@%|%#%N$M$I$C$C$v$w$p$r$l$k$+ + + + + + + + + + + + + + + 4$4#-#/#6#$#W@Q@F@E@y@t@g@f@f@=@=@=@-@@@D++@+@D+C+s+q+7+7+7+]+]+]+:+.+.+ +O.W.D.V.h.i.h.c.c.` 1$<&'%..^.$$^.^.W#W#W#$$W#^.B ^.^.W#$$$$$$$$B B C C >.V 4.C V V C C C V C %@ ",
-" [&/ { { ^ ^ { ^ ^ { { { ] ^ ^ { ^ { ^ { { ] / { { ] { { ] { { / { ^ _ _ _ !.2.{.c.j.h.i.x.w.D.D..+X..+-+]+:+'+]+7+7+x+s+q+q+s+D+D++@X+@@=@=@6@/@f@s@y@F@F@F@W@l#l#-#)#/#/#4#7#3#f#f#E#E#u#u#U#U#U#@$~$7$3$8$_$A$!%F$K$ %X$4%4%_%A%B%B%B%R%X%,&}&s%+ + + <%7%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+|&_&|&|&|&1&_&_&2&3&&&!&!&&&)&`%!&`%Z%T%`%T%T%T%C%N%M%H%t%m%m%e%e%e%6%f%[%[%o%-%@%+%>%+%O$O$C$v$v$v$r$q$k$+ + + + + + + + + + + + + + + b#/#)#)#$#`@`@Q@M@y@t@t@s@f@f@|@/@=@@@@@X+D+C+D+C+q+n+y+7+6+6+]+:+]+-+1+X.O.O.D.D.h.i.c.i.c.!.]&2%M ......^.$$$$$$B $$W#B W#^.W#B W#W#$$W#$$$$W#C C >.>.V V C C C >.>.V 4& ",
-" f ^ { / { ^ / { ^ ^ / { ] { { ^ ^ / ^ ] { / { ] ^ ] / ] { ^ ] ] / ^ _ $.l !.{.2.2.h.h.i.i.D.W.O.X.-+l+-+'+'+<+2+g+7+y+s+s+s+D+D+S+X+@@=@=@=@^@f@g@t@t@t@F@Q@Q@$#$#-#-#/#4#3#3#f#f#u#)$u#u#N#U# $~$&$~$3$_$z%_$A$F$!%W$X$_%X$4%_%A%r%@&B%,&@&5&}&+ + + + e%8%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+6&7&|&|&|&|&|&|&|&_&|&|&_&2&&&8&3&&&%&`% &`%`%`%=&C%O%M%G%G%m%n%m%m%e%7%7%7%[%}%-%-%@%@%@%#%+%O$H$v$v$p$w$r$+ + + + + + + + + + + + + + + y$/#/#$#`@$#W@W@Q@U@y@t@f@g@|@f@r@=@=@X+S+S+C+C+C+s+n+q+7+2+g+<+6+]+'+X..+W. +W.D.w.i.h.h.c.{.+&1$1$2%2%....$$p%W#^.$$$$W#$$W#^.W#^.^.W#$$B ^.^.W#V C C V >.C V C 4.C C `+ ",
-" { ^ / { { ] { / { ] { { { ] / ] { / / / ] / ] ^ ^ ] ] / ^ ^ { { { / _ _ !.{.l.{.2.i.h.x.x.w.D..+.+-+'+-+:+]+7+<+7+r+s+q+s+D+D+9&X+X+@@=@=@7@f@s@s@S#t@y@Q@Q@l#`@`@`@^#4#3#4#7#f#f#T#)$E#O#U#U#&$&$~$~$~$3$_$F$F$W$0&a&X$_%4%r%A%r%r%@&R%,&5&}&b&+ + + + g%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+c&d&d&e&f&c&6&c&c&|&c&c&g&|&|&|&_&_&!&&&_&!&)&`%`%T%T%T%T%C%C%C%E%G%m%e%e%e%7%8%7%]%=%-%-%@%#%Z$P$O$O$C$Q$r$w$j$+ + + + + + + + + + + + + + h&}#4#)#`@$#r#W@F@Q@y@F@s@f@s@|@/@/@=@@@@@T@D+D+C+C+q+q+x+7+2+2+]+'+]+.+-+X.D.D.x.x.x.c.c.2.c.t$1$2%2%2%......v%^.B W#$$$$$$B $$$$$$^.$$W#^.$$$$W#W#C V 4.4.C >.V C V C C ",
-" F ^ ^ { ] { ^ { ] { ^ { { ] ^ { / ] ] / { { ] ] / ] { ] { { ] ^ ^ / ^ _ _ ~.{.l.2.2.h.h.h.D.D.W.P..+-+1+'+'+<+2+2+7+n+q+s+C+D+C+D+X+@@=@V#6@f@/@f@t@t@G@t@a%W@`@-#)#-#/#}#3#3#3#f#E#)$E#u#O#U#U#@$@$~$7$7$8$A$A$F$W$K$ %_%4%4%r%r%r%@&@&X%(&,&}&i&+ + + e%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+j&j&f&j&e&f&j&6&6&7&6&7&7&|&|&g&|&|&|&2&_&)&8&_&~&%&`%*&T%T%C%C%F%O%F%m%n%m%e%8%7%8%[%-%o%-%|%+%#%P$O$O$C$v$x$r$+ + + + + + + + + + + + + + + 4#D#/#)#`@W@W@Q@E@t@t@t@t@f@f@7@^@/@=@X+S++@S+D+C+s+q+n+7+2+g+<+]+'+$+-+$+X.O.P.w.x.i.h.2.7.b 1$^%'%2%2%/%v%....^.B W#B B ^.B $$$$W#$$^.B ^.W#$$$$V >.>.>.C >.>.V V 4.4.Y ",
-" : / ^ { ] / / ] ^ ] { ] ] / ^ / ^ { { ^ { { ^ { { { ] ] { ^ ^ { ] _ J $.%.{.!.{.c.c.h.i.v.V.D.D.X..+|+-+<+'+2+6+<+x+y+q+q+s+C+D+D+W+X+=@=@^@^@s@s@s@t@E@E@Q@W@W@`@-#/#)#/#5#3#0#f#f#u#u#O#u#U#!$&$~$~$7$_$3$A$!%K$ %X$X$_%_%4%A%r%B%R%B%,&X%}&}&k&+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+l&l&l&l&l&l&m&f&j&j&l&n&f&e&e&n&6&7&|&c&|&|&_&_&&&&&)&)&*&`%`%T%T%C%C%C%D%G%m%n%e%e%8%<%<%o%-%@%@%.%+%M$O$O$C$D$w$+ + + + + + + + + + + + + + + 7#/#/#/#$#l#$#Q@Q@F@F@y@t@g@f@|@^@/@=@=@W+S+C+C+C+q+q+n+7+6+g+6+'+'+-+.+-+X.X.D.x.K.i.h.j.c.] 1$1$o&2%2%2%../%p%/%$$$$$$W#^.$$$$^.W#^.W#$$$$$$^.^.V V C >.4.V C >.V C 4.K@ ",
-" S ] / { { { { / { { { ] / ] { ^ ] ^ ^ { { ^ { { { ] { ] ^ ] { ^ / ^ _ _ %.%.2.2.2.c.h.v.D.D.D.D.X.$+.+-+]+'+]+2+7+7+n+y+s+K+e@+@+@W+x@=@/@/@|@s@t@f@t@G@F@Q@$#$#`@-#)#/#4#3#f#f#)$E#u#O#U#U# $U#&$~$7$_$_$A$F$F$!%W$X$X$_%4%r%A%r%B%X%}&}&}&}&p&q&+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+l&l&r&r&r&s&r&r&l&l&t&l&t&n&j&j&e&j&7&d&c&c&|&g&_&_&_&&&&&%&)&`%T%T%C%C%M%F%E%E%m%e%7%8%8%8%<%{%@%@%@%Z$Y$N$C$C$Q$+ + + + + + + + + + + + + + + u&4#/#)#$#v&`@W@W@Q@M@t@L@f@f@f@/@6@=@@@W+S+D++@C+q+s+n+7+2+7+g+<+)+-+.+.+.+O.D.D.D.x.h.i.c.%.1$<&'%o&2%../%/%p%/%p%p%^.$$$$$$$$$$$$^.^.^.W#$$$$$$W#>.V C >.>.V V C 4.C D ",
-" { ] { ^ / { / ] ] ^ / ] ] ^ ^ ] ^ { ] ] { ] { / ] { ^ { { / ] ^ { ^ _ #.!.!.2.3.c.j.c.w.D.w. +X.X.1+-+-+<+]+<+6+7+n+n+s+q+J+D+D+W+X+W+@@/@|@f@f@g@t@E@y@F@Q@W@$#`@)#/#4#4#4#7#f#)$I#E#u#U#U#.$@$~$~$_$_$o$_$F$F$F$X$X$_%_%4%4%r%B%,&X%}&}&}&}&w&x&+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+y&z&z&r&z&z&s&s&z&r&l&r&l&r&l&m&t&j&j&e&j&6&c&c&|&|&_&|&2&&&!&`%%&`%Z%C%C%C%G%E%n%n%m%e%e%7%}%]%=%-%@%@%+%N$O$C$v$+ + + + + + + + + + + + + + + #$4#4#/#)#)#$#`@W@Q@E@t@y@t@g@|@|@=@=@=@=@X++@C+D+q+s+q+x+7+7+7+]+m+-+X..+X.X.O.D.i.i.h.c.C.%.]&<&<&2%2%2%/%/%/%v%....p%$$B W#W#$$$$^.^.W#^.^.$$^.$$$$C 4.V C 4.>.C C V C ",
-" A&] / ^ ] ^ ] { { ] { / { { ] / ] { ] { ] ^ ^ ] / / / ] { ] ] ^ { ] _ _ l _ {.2.{.C.h.j.i.w.D.W.O.X..+-+'+]+<+7+g+7+y+q+s+C+D+D+X+D+X+=@=@^@/@g@f@f@t@t@Q@W@W@W@l#)#)#4#/#4#f#f#f#I#)$V$O#U#.$@$@$~$~$_$3$A$_$F$K$X$ %_%_%_%r%r%B%X%,&B&(&}&}&C&p&D&+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+y&E&F&G&F&z&y&H&z&z&y&z&s&r&I&r&r&r&f&j&j&j&j&6&c&c&c&|&J&|&!&_&%&&&T%T%T%M%C%E%D%F%m%e%e%e%8%8%[%[%h%@%+%Y$O$N$C$+ + + + + + + + + + + + + + + K&3#/#/#)#-#`@H#`@Q@Q@Q@t@t@f@|@|@/@=@W+x@W+D+D+D+C+s+s+r+7+2+6+]+'+'+'+.+.+.+W.O.x.i.i.i.c.2.L&<&o&2%2%/%/%../%/%..v%p%^.^.^.$$B $$$$B W#W#^.W#W#W#^.C C >.4.4.C C C >.C M& ",
-" [&{ { { ] ^ / / ] ] ^ ^ ^ ^ { / / ] { { { { ] ] / ] { { { / { ] ^ { ^ %.l {.{.7.2.c.c.i.h.D.O.D. +X.-+.+:+]+g+2+7+7+y+q+q+C+D+S+*@W+@@=@^@6@f@f@t@t@M@F@F@Q@W@W@-#`@4#}#3#4#7#f#y#E#E#N#N#U#U#@$&$7$7$3$3$A$F$!%/&K$X$_%A%r%r%r%B%B%@&N&}&w&b&p&p&O&+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+P&P&G&Q&P&F&P&F&P&G&F&R&y&z&H&z&z&r&S&l&r&l&f&l&f&e&c&c&c&c&|&_&3&)&&&!&~&`%T%T%C%G%F%G%m%e%e%7%8%6%<%-%-%@%@%Z$N$I$C$+ + + + + + + + + + + + + + T&3#3#4#D#)#)#$#Q@W@Q@M@F@t@g@g@|@=@=@@@=@X++@D+C+C+s+r+q+r+2+]+6+]+:+-+1+.+.+O.P.x.D.i.i.j.2.U+]&]&]&o&2%U&/%/%../%/%..$$B B ^.^.^.B ^.$$$$^.B $$W#$$$$V V 4.V >.C >.C V V& ",
-" _ ] { / / { { { { ] { { / { / / ] { ] ] { / ] ^ ] ] ^ { { { { ^ ^ ^ _ _ #.%.2.2.2.i.c.w.x.x.D.X. +$+-+'+-+2+]+2+7+7+q+s+C+C+D+S+S+W+@@@@=@|@|@f@s@y@E@Q@M@Q@W@W@`@-#)#/#3#0#7#f#E#E#E#U#O# $!$~$~$7$3$_$o$A$F$F$X$c%X$_%A%A%r%@&B%B&,&}&}&W&X&p&Y&+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+Z&Z&Z&Z&Z&P&Z&R&Z&G&Z&P&P&F&R&F&F&z&r&r&s&S&l&l&t&l&j&f&n&|&|&|&|&3&_&%&&&`%`%T%T%C%F%C%m%m%m%e%e%7%[%<%{%-%@%#%+%Y$H$+ + + + + + + + + + + + + + + 4#3#4#/#)#`@W@Q@W@M@Q@t@t@t@f@f@f@|@r@X+X+X+D+C+C+Z#s+r+7+7+7+]+]+'+-+-+-+X.W.D.D.v.i.c.2.c.U+1$<&1$2%2%2%/%../%p%v%../%$$$$W#$$$$^.W#$$W#$$$$^.B $$V C V 4.C >.C 4.C 4.B ",
-" { ^ / { ] ] { { ^ ] { { ] ^ ^ ] ^ { ^ ^ { ] { ^ ] { { { / / { / ] ^ ^ _ _ {.!.l.c.h.h.h.w.D.D.O..+-+.+'+'+'+<+2+7+n+o+s+J+s++@S+W+X+@@=@^@^@f@s@t@t@t@Q@M@$#$#v&`@-#D#3#4#7#f#f#t#E#O#U#U#.$!$@$~$h$7$_$u$!%K$ %X$X$_%k%r%r%r%`&B&@&,&}&b&}&p&p&p&+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+ * * * * * *Z&Z&Z& *Z&Z&Z&.*Z&P&G&H&H&z&E&z&s&r&l&l&l&t&n&d&f&|&g&|&_&_&2&%&~& &=&T%C%F%D%E%n%m%e%7%f%]%[%=%@%@%@%N$M$+ + + + + + + + + + + + + + + 7#5#4#)#/#/#`@W@Q@F@Q@t@t@t@R#|@^@/@=@@@@@S+D+C+D+C+s+q+n+7+g+f+'+]+'+'+.+.+W.D.D.w.w.h.c.2.( +*o&o&^%2%2%/%/%..v%v%p%../%W#$$$$^.^.B W#W#$$$$B W#B $$4.V >.C C C C 4.4.C ",
-" @*] / ] { { ^ ^ ] ] ^ { { { ] / { { ^ ] ^ ] / ] { { / { { ^ / { ] { ^ _ $.{.{.{.{.2.h.j.x.w.D.O..+X.-+-+m+<+]+2+2+7+x+q+q+s+K+D+S+T@W+@@=@/@/@f@g@t@y@M@Q@Q@l#l#-#-#)#)#4#5#a#f#)$E#I#u#U# $U#~$~$7$8$7$o$u$F$W$X$X$_%_%A%K%r%@&B%@&,&B&}&C&p&p&p&W$+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+#*$*%*%*&*%*$*#*$* * * *$* * *Z&Z&Z&P&P&R&R&R&H&r&r&r&l&l&j&j&7&n&c&**|&_&_&2&%&*&`%T%T%C%O%O%E%m%t%e%e%8%}%{%{%-%@%Y$Y$+ + + + + + + + + + + + + + + =*3#4#/#/#-#)#$#l#Q@F@U@y@g@f@f@f@r@=@=@S+X+@@S+D+Z#s+q+q+7+2+2+6+]+'+-+-+X.O.O.D.i.h.i.i.r.=.-*]&]&2%2%..../%/%..v%p%/%..$$B ^.$$B ^.^.W#W#^.^.$$$$B C C C V C C C C C 4.;* ",
-" >*^ ] { { { ^ ] { / ^ { ^ ] ] { ^ ] { ^ ] { { ] { ^ { ] / { { ] ^ _ _ _ ~.%.{.2.2.c.j.i.h.D.P.X.W.,*.+'+]+'+<+6+7+r+y+s+q+s+D+D+D+X+x@=@=@f@f@g@g@y@F@U@F@Q@$#W@$#)#/#3#'*4#5#f#f#u#E#u#U# $.$!$~$7$8$3$A$A$W$!%W$_%X$_%r%r%r%B%B&@&}&,&}&C&b&p&Y&)*+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+%*!*#*&*%*%*~*%*&*~*#*&*~*&* *$* * *.*Z&.*P&z&P&z&s&z&r&s&r&l&e&j&f&7&6&|&_&_&!&&&)&~&T%T%{*C%G%G%m%m%e%7%f%<%[%-%@%@%Y$]*+ + + + + + + + + + + + + + ^*3#4#/#)#)#-#$#$#Q@E@E@E@t@f@|@f@r@/@=@@@@@X+D+D+C+q+y+7+n+7+]+]+]+m+-+-+X.W.D.O.x.w.i.h.h./*+*-*]&'%2%U&U&/%/%....p%v%v%B $$$$^.$$^.$$^.$$W#$$^.^.$$V >.C 4.V >.4.>.4.V (* ",
-" _*{ ] ] { ] { ^ ] { ] / { / ^ { ^ ] { { ] ^ { { ] { ^ { ^ { { ^ { / ^ _ l {.{.2.c.c.c.i.w.v.D.W.X.-+-+'+'+]+]+<+7+7+7+y+C+C+D+e@X+W+@@=@=@/@|@f@t@t@y@E@F@W@$#$#$#)#/#4#4#3#0#y#f#t#u#U#U#@$U#@$~$h$y%o$u$F$W$W$X$c%4%_%A%A%B%B%X%X%}&b&p&w&p&:*<*[*+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+}*}*!*}*|*|*1*|*%*1*!*%*#*#*$* *2* * *3*Z&Z&Z&Q&G&F&R&z&s&s&r&r&j&e&j&n&c&c&|&|&&&&&!&`%T%T%C%C%G%H%m%m%e%7%7%<%-%-%@%+%4*+ + + + + + + + + + + + + + 5*f#5#4#4#)#)#$#W@Q@F@E@t@y@f@s@f@=@/@=@@@X+W+D+D+D+C+r+o+7+7+7+2+]+'+-+.+.+.+O.D.V.x.i.c.c.!.+*1$1$<&'%2%....../%/%../%v%p%..$$^.$$B ^.W#W#^.W#$$B B W#V >.C 4.C V V C C 6* ",
-" P { { { { ] { ^ / / ^ { { { { { / / { ] { ] ^ ^ ] ] ^ ^ / { ] { { J { _ {.!.{.2.2.c.c.h.D.D.O.X.X.-+.+'+)+:+<+7+7+7+q+s+s+K+D+D+@@=@=@=@=@|@f@|@g@t@G@F@Q@W@$#$#`@)#/#/#4#a#f#)$u#I#J#U#U# $+$~$~$7$3$3$&%W$W$W$X$X$_%K%r%r%B%@&X%5&}&}&X&C&p&:*Y&x&+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+7*}*7*7*7*7*7*7*}*7*|*|*}*1*!*%*%*~*2*&*#* * * *Z&.*Q&R&F&G&y&r&l&l&l&e&f&c&c&|&|&|&&&2& &*&`%T%C%C%G%H%t%m%e%e%6%[%{%-%@%8*+ + + + + + + + + + + + + + ;@3#5#3#/#)#`@$#V%r#Q@Q@t@t@s@g@f@=@=@=@=@x@D+S+D+D+J+s+s+7+7+2+]+<+'+-+-+.+.+X.O.D.D.v.i.r.c.+&]&1$2%2%..2%../%/%v%..p%..v%W#W#$$W#^.W#$$W#$$^.B $$$$$$$$V C C V V C C >.W ",
-" ] { ^ ] { { { { { { { { / ^ { / ] { { { { { ^ ^ ] ^ { { ] ] ^ / { / _ $.%.!.{.{.2.i.h.i.K.D.O.X.X.X.-+-+]+<+6+7+7+x+y+q+C+s++@D+W+@@@@=@r@/@f@9*s@y@F@F@W@$#W@)#^#/#4#4#7#0#y#E#I#u#u#O#U#~$~$~$7$7$8$o$A$F$K$ %X$_%4%r%r%K%B%X%@&X%0*W&b&w&p&<*Y&a*+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+b*c*b*d*e*b*f*b*b*b*g*7*7*7*7*7*}*}*1*~*%* * * * * *Z&P&Q&P&z&H&s&r&r&l&l&j&n&c&h*|&2&!&!&%& &`%T%T%N%F%G%H%m%7%7%]%]%<%-%i*+ + + + + + + + + + + + + + + 7#3#4#D#)#-#v&$#`@F@E@F@t@s@s@|@|@f@/@X+@@S+D+C+K+s+q+7+n+7+2+2+'+'+'+$+.+.+X. +w.D.i.h.c.c.L&]&]&'%<&2%/%../%....p%..v%..p%W#$$^.B ^.^.$$^.^.^.$$$$^.>.C C C 4.>.C C V V ",
-" { ] ^ ^ { { { ^ ] ^ { { ^ / { ] / { ^ { ] ] { { ] ] { { ] ] { ] J ^ J _ %.!.!.c.2.c.h.i.D.D.D. +X..+|+-+:+:+2+7+7+7+s+s+Z#D+D+X+W+@@-@^@=@f@f@g@t@t@F@Q@Q@$#W@)#-#D#4#4#4#a#y#y#f#E#N#U#U#~$@$~$3$7$A$A$A$F$W$K$X$k%4%K%r%`&X%X%,&}&}&w&w&p&Y&<*Y&j*+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+k*l*f*b*l*m*n*l*b*l*b*b*b*b*7*7*7*}*7*}*}*%*~*&*#*o* * *Z&R&P&z&z&y&r&r&l&l&n&c&c&**_&2&&&&&*&`%Z%T%C%C%D%m%p*e%f%6%}%{%-%q*+ + + + + + + + + + + + + + + -#7#5#3#/#)#)#`@W@Q@Q@E@t@t@g@s@=@/@=@x@W+W+D+D+K+C+s+7+q+7+7+7+]+'+'+-+X..+ +D.D.D.h.h.j.c.M.]&o&]&2%2%2%..../%..../%/%p%$$$$B $$$$W#^.B ^.^.W#W#^.$$4.C 4.>.C V >.C >.V ",
-" ] { ] { { ] { ^ { ^ { { { { { ^ / ] { { ] { { ^ ^ { { / { ] ^ ] J { _ %.#.{.!.2.2.c.w.i.D.D.D.X.X.|+-+'+:+]+7+7+7+q+r+s+C+D+S+W+X+=@=@/@^@f@s@g@t@y@E@Q@Q@`@$#`@)#)#4#4#4#f#y#y#u#%%O# $U#@$&$~$7$3$_$F$F$W$W$X$X$_%k%4%r%B%B%X%}&}&C&r*p&p&Y&s*s*t*+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+u*l*u*n*v*n*w*l*x*m*n*k*m*k*b*b*7*7*7*7*}*1*%*#*%*~* *2* * *Z&R&G&E&H&r&r&l&l&j&f&6&c&y*|&_&_&~&`%`%T%C%G%E%E%p*e%7%}%]%<%z*+ + + + + + + + + + + + + + + A*3#4#4#D#)#)#`@W@Q@F@t@t@t@s@f@f@=@=@@@S+W+D+D+C+K+s+n+q+7+7+<+2+'+'+-+$+.+P.D.D.D.h.h.h.c.B*1$]&]&2%2%..../%........v%../%$$B ^.$$B $$$$W#W#$$B ^.W#B 4.V C C C V C C C ",
-" C*{ { { / / ^ ^ { ^ { ] { / { ] ] ^ ^ ^ { { ] ] ^ ^ { ] ] ] ] ] { { _ 3%_ !.!.2.3.2.h.h.w.D.D.D.D..+.+-+'+]+2+2+<+q+x+q+q+K+s+S+S+@@@@>$r@r@f@f@f@t@E@M@F@W@W@`@-#)#/#4#5#5#3#f#y#E#O#u#U#U#@$~$~$7$3$A$F$F$W$X$X$X$4%D*r%r%B%R%5&X%}&C&r*C&p&Y&E*F*t*+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+w*w*w*G*w*w*w*u*w*v*w*v*x*w*l*n*l*m*l*f*b*b*7*7*}*|*%*~*#* * *Z&.*P&P&R&H&s&r&l&l&t&d&6&|&|&|&&&)&!&`%T%C%C%F%G%n%n%e%7%8%]%H*+ + + + + + + + + + + + + + + I*7#4#/#/#)#`@-#l#W@Q@F@M@t@f@q#f@^@=@@@W+@@S+S+C+s+s+s+y+7+7+<+<+]+'+-+.+.+ + +D.x.w.w.h.2.t$J*]&1$'%2%......../%....v%/%..$$$$$$^.$$W#^.$$W#W#W#$$B B >.C C C C V V C >.K* ",
-" L*{ ] { ^ { { { { ] ] ^ ^ / ^ { { { ] { ] ^ ] / / ^ ^ ] ] ] { ^ ] J _ _ _ $.{.{.c.c.i.i.K.D.D.D.W.-+$+-+'+6+<+2+7+7+y+r+C+C+C+D+X+@@@@/@=@/@f@g@t@y@G@Q@V@Q@`@-#)#/#D#3#3#4#f#f#f#E#N#u#U#@$~$7$8$7$_$_$A$K$X$W$X$4%_%A%K%B%@&@&,&}&}&}&W&M*Y&Y&N*N*O*+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G*G*G*G*G*G*G*G*w*G*G*G*w*w*w*v*x*u*u*n*l*f*b*b*7*7*}*!*}*!*&*2* *Z&Z&G&P&y&E&r&r&r&l&f&6&c&7&|&_&&&)&`%Z%T%C%C%M%m%n%e%e%f%<%<%+ + + + + + + + + + + + + + + L$0#4#/#/#)#)#`@`@r#Q@M@t@t@L@f@|@=@=@@@X+=@X+D+D+C+s+q+n+7+7+2+]+]+]+-+|+$+W.P.D.D.D.h.c.h.S 1$1$o&o&2%....../%....p%....p%B $$^.^.$$W#^.$$$$W#^.B B B V C V >.4.C C C V L* ",
-" P*{ { { { / { ] { ] { ^ { { / { ] / { { ^ ] { ^ { { { ] { ^ { ^ / ^ ^ _ !.%.2.!.2.c.i.i.v.v.D.{+D..+X.'+-+]+6+2+g+7+n+r+C+K+C+X+@@S+=@=@=@f@|@R#t@y@E@Q@Q@W@$#-#`@/#4#3#4#f#f#E#u#u#O#U#U#+$&$~$7$_$o$_$F$F$W$X$*%_%4%A%r%B%B%X%,&,&b&}&b&:*Y&:*E*Q*R*+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+S*T*G*U*S*S*S*S*S*G*T*G*S*G*G*w*w*w*w*x*v*x*l*b*b*e*b*7*}*|*~*}*~* * *Z&Z&F&z&E&r&l&l&l&t&f&c&c&_&_&&&&&`%T%T%M%F%G%H%e%m%f%}%[%V*+ + + + + + + + + + + + + + W*7#4#4#W%)#)#)#l#W@W@Q@M@t@t@s@f@|@=@=@@@S+S+D+D+s+C+q+q+r+7+g+<+<+-+-+-+X.O.X.D.D.V.h.h.j.H J*1$o&2%2%../%../%/%/%/%/%p%p%..$$^.$$W#$$$$B ^.W#^.^.B C C V >.C V C V C C X* ",
-" _*{ { ] { ] ^ ] ^ ] { ^ { ^ ] / { / ^ { ] ^ { ^ ] / { ] { { { { ^ ^ _ _ %.{.2.2.2.i.c.i.w.D.D. +.+W.X.'+]+:+]+<+7+o+y+s+s+K+D+D+S+X+@@=@6@r@|@s@s@t@F@M@Q@W@$#$#`@/#/#3#s#f#f#u#y#u#u# $.$~$~$~$y%7$A$3$F$W$K$a&X$4%4%K%4%B%#&,&5&}&}&w&w&:*Y&Y*s*Q*Z*+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+`*S*`*S* =`*`*.= =.=`*+= =S*S*S*+=G*G*G*G*u*u*v*x*x*k*b*b*7*7*}*}*}* *&* * *Z&P&R&H&S&l&l&m&j&d&6&|&_&8&_&&& &T%T%C%O%t%m%e%f%7%}%@=+ + + + + + + + + + + + + + + 3#a#4#3#/#)#$#$#W@Q@G@y@E@g@s@g@/@/@=@-@@@S+D+D+C+C+q+s+7+7+7+<+'+]+'+$+.+X.P.W.D.D.v.c.c./*-*1$<&'%2%/%..../%../%/%/%..p%^.^.B $$$$W#$$$$W#$$W#B W#^.>.>.4.C >.V V >.>.#= ",
-" _.^ { ^ / { ] / { { { ^ ] ] ] / { ^ ] { ] { ^ ] ] { { { ] ] / { / { ^ _ $.{.!.l.2.C.i.h.w.D.D.D.W..+.+]+]+6+f+<+7+7+q+q+C+C+S++@S+@@=@/@|@^@|@f@D@t@U@M@Q@Q@$#$#/#/#4#4#a#0#y#f#E#E#u#U#U#U#~$7$~$_$A$A$W$F$ %W$_%_%A%4%B%B%@&X%X%b&X&C&w&Y&:*N*s*N*$=+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++=`*%=&=`*`*&=%=.=.=%=.=%=`*.= = =S*S*G*G*G*G*w*w*m*n*l*b*b*7*7*}*1*%* *o* *Z&Q&G&G&z&r&r&l&j&n&c&7&|&1&3&&&!&T%T%C%N%D%t%H%e%8%7%*=+ + + + + + + + + + + + + + + a%7#4#/#/#/#l#$#W@W@Q@t@y@t@f@g@f@/@=@=@@@X+X+D+D+C+s+o+n+7+2+7+<+]+-+$+.+ +X.D.D.x.v.c.r.` +*1$1$2%o&2%../%..../%....../%W#^.$$^.$$B ^.B $$^.$$W#W#W#>.C C 4.C >.C >.4.6$ ",
-" P ] ^ { / { { { ^ / ] { ] ] { ] { { { ^ ] { / ] ] ^ { { ] { ] ^ ^ J =._ %.!.{.2.c.j.j.i.D.w.D.W.X.$+-+'+<+<+]+g+7+y+q+q+s+D+D++@X+X+@@/@^@|@s@s@t@F@F@F@W@Q@`@$#)#)#}#4#3#7#f#I#u#E#N#b%+$.$~$~$8$7$&%F$F$W$W$X$4%4%r%L%B%B%X%B&,&}&b&p&p&:*Y&Y&Q*Q*+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+.===&=&=&=&=-=&=&=&=&===%=%=%=.=%=%=.=S*T*U*G*G*w*w*w*l*l*b*f*c*}*7*!*&*&*&* * *R&F&F&r&r&r&l&l&n&c&7&**|&)&)&%&T%T%C%N%F%m%m%g%7%;=+ + + + + + + + + + + + + + + >=7#3#4#/#)#v&l#H#Q@Q@M@U@g@s@f@f@/@=@=@@@W+X+D+C+s+q+y+r+7+g+]+'+-+m+.+X.X..+D.D.x.h.h.j.` +&]&,#,#o&2%/%/%/%v%/%v%p%....B W#^.^.$$W#B ^.$$W#$$$$$$$$4.4.4.4.4.C C 4.C W ",
-" {.] { ] { ] / ] ^ { ^ ] ^ { ] { / ] ] { ^ / { ^ { / ^ { / ^ / ^ ] { ^ $.%.{.{.3.c.h.j.i.v.D.D.W. +X.'+'+:+2+]+g+7+7+q+s+D+s+D+D+W+=@=@=@|@f@|@g@s@E@F@Q@W@$#$#`@)#/#}#3#a#f#f#y#E#E#u# $U#U#&$7$7$3$_$A$W$/&X$_%_%4%K%r%B%B%@&}&}&}&C&p&p&<*E*Y&Q*Q*+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+-=&=-=-=-=-=,='=-=-=,=-=&=)=&=&=)=%=`* =S*S*T*S*S*G*G*w*x*n*b*b*7*7*7*1*#*%*~* * *.*Q&R&z&z&r&m&j&n&7&c&_&3&&&!&~&`%T%C%C%G%m%e%7%!=+ + + + + + + + + + + + + + + A#f#4#4#)#-#)#$#`@Q@F@y@y@t@g@R#f@/@=@=@W+X+D+D+D+J+s+x+x+7+2+2+2+]+-+.+.+W.W.W.D.w.i.i.h.=.1$+*<&^%2%2%....../%v%../%p%W#B B B W#W#W#^.B W#$$W#$$^.C V C C V C V >.C C ~= ",
-" / / ] / { ] ] ] { ] { ^ { / / { { { ^ ] { ] ^ / ^ / ^ ] { ] { ^ ] _ ^ _ !.!.{.3.c.h.j.i.K.D.W.W..+$+1+)+'+<+]+7+7+7+n+C+q+D+C+S+X+-@@@=@7@f@|@s@y@U@G@Q@Q@$#)#)#/#)#3#4#7#f#f#u#u#E#O#U# $&$~$3$7$A$A$F$F$W$X$X$_%A%K%{=r%@&,&(&}&}&p&p&p&Y&E*F*N*Q*+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+-=-=]=]=]=]=,=,='=^=/=]=]=-=,=-=-=-=&=)=== =%=S* =T*G*G*G*w*w*w*n*b*7*7*7*}*}*#*o*$*Z&Q&R&y&y&r&l&j&f&6&c&|&_&_&!&%& &T%C%C%G%m%m%g%(=+ + + + + + + + + + + + + + + _=0#5#4#4#)#)#$#$#H#F@U@t@y@s@f@f@^@/@=@=@X+X+D+D+D+s+s+r+7+7+<+6+]+'+-+X..+P.D.D.w.w.h.h.!.+*1$]&o&2%2%../%......p%../%p%W#B $$^.$$^.^.$$$$^.B W#B >.>.>.>.>.C 4.C 4.C 4. ",
-" y { { ^ ] ] ] ] ^ { { { { ] / ] ^ { { ^ / ] { ] ^ ] / ] ] { { { / _ _ l !.{.7.2.c.h.h.D.v.D.W.D..+-+X.'+]+2+2+g+7+n+s+J+K+K+D+X+@@@@=@=@/@|@q#t@t@y@U@Q@W@`@l#)#-#/#7#s#f#f#f#)$u#E#O#U#!$!$:=8$h$3$A$F$F$/&W$X$_%A%4%r%r%R%B&,&,&X&p&p&p&E*Y&N*N*Q*+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+]=<=/=]=[=}=/=[=]=}=<=|=]=]=/=}=-=-=-=&=&=&=)=%=%=`*1=S*G*G*w*w*n*m*f*b*7*7*|*#*~*2*Z&Z&P&F&R&y&l&r&l&j&j&6&|&_&&&!& &=&T%C%C%D%H%e%2=+ + + + + + + + + + + + + + + + 7#5#4#}#)#-#v&$#Q@Q@Q@F@t@g@g@f@6@r@=@W+@@W+S+K+K+s+q+x+7+7+g+<+:+-+-+.+X..+D.D.i.h.c.c.%.+*+*1$'%o&2%........p%....p%$$^.B ^.^.W#$$$$W#^.W#B ^.B V >.C C C >.C 4.V V 3= ",
-" f / { { ^ ] ^ ] { ^ { { { ^ ^ { ] { { ] { { { { / / ^ ] ] { ] ] / ` _ %.!.{.!.c.2.c.i.i.v.D.W.O.X..+-+'+-+<+2+7+7+n+s+J+Z#D+D+D+W+@@@@/@^@f@g@t@y@t@M@a%Q@W@)#)#/#4#3#7#a#f#y#I#u#u#u#U#&$@$~$h$3$3$o$F$F$W$ %X$4%;&A%r%r%>&@&5&}&}&X&p&:*E*E*E*N*Q*+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+<=<=[=[=4=5=4=[=|=6=[=[=4=[=4=]=<=]=]='=-=-=-=)=%=)=%=S*S*G*G*w*w*l*l*g*b*7*7*}*|*#* * *Q&P&G&z&r&l&l&f&7&6&|&|&2&_&`%`%`%C%N%G%m%m%7=+ + + + + + + + + + + + + + + + 3#f#4#4#)#$#$#W@Q@M@E@y@t@s@s@f@7@=@=@@@X+X++@D+C+C+q+y+7+7+2+2+'+'+'+.+.+W.O.D.v.w.w.i.!.+&]&]&]&2%2%../%p%..p%v%v%$$$$W#W#^.^.$$$$$$W#^.B B $$W#4.V V C V C C V V C 8= ",
-" y { / ] { { ] / ^ ^ { / ^ { { ^ / ^ ] ^ { ] { { ^ ^ ] ] { ] { { J ^ _ l ~.~.l.c.c.j.i.i.D.D.D.X..+.+.+m+]+6+6+7+7+7+q+s+s+D+X+X+X+@@=@^@|@f@g@g@t@G@E@M@Q@W@`@)#)#4#4#7#3#f#f#I#E#u#U#U# $~$~$_$_$_$_$F$F$/& %X$_%k%4%r%r%X%X%,&}&r*b&p&Y&:*Y&E*Q*9=0=+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+a=6=5=6=b=6=6=6=6=6=6=6=6=4=6=b=4=[=<=[=<=,=]=]=-=-=&=&=%=`*+=S*G*G*w*u*m*b*k*7*7*|*!*~* *Z&P&P&P&H&z&l&l&m&n&7&**|&_&&&`%`%Z%C%O%n%m%c=+ + + + + + + + + + + + + + + + d=0#4#4#/#)#`@W@l#F@y@G@t@s@g@|@f@=@r@@@X+@@D+D+s+s+s+y+7+e+g+<+:+]+'+-+W.W.D.D.v.x.x%r.%.+&+*1$'%'%2%2%../%....v%..^.W#^.^.B W#$$$$^.^.$$^.$$W#V V >.V >.4.4.C V C C n. ",
-" ^ ^ ] ^ / ] ^ ] ^ ] ^ ] / ] / / { { { / ] ^ ] { / ] { ] ^ ] { ] ] ^ _ _ !.!.!.c.h.r.h.h.x.D.W.W.X.$+-+'+'+]+f+7+y+7+s+s+K+D+D+S+X+x@=@r@^@|@f@f@y@t@M@M@W@r#W@)#/#/#4#3#f#f#E#y#u#u#O#.$@$~$~$y%3$_$o$F$F$K$X$X$_%A%A%B%X%@&N&N&X&b&W&:*<*Y&E*s*Q*e=0=+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+6=f=f=f=f=g=f=f=f=f=f=f=f=f=6=6=b=[=h=[=|=]=/=-=]=]=-=&=)= =`*.=G*G*G*w*u*l*l*b*7*7*1*&*#* *Z&Z&P&z&r&S&l&i=e&j&d&|&|&)&%& &*&C%C%G%D%j=+ + + + + + + + + + + + + + + + M@5#4#4#)#/#`@`@W@Q@M@U@E@f@f@f@=@r@=@@@@@+@D+C+C+q+q+y+x+7+]+<+]+]+-+.+-+O.D.D.D.v.c.c.%.+*1$o&^%^%2%/%..p%p%v%p%p%$$W#B $$^.$$B ^.$$^.$$^.$$^.4.4.C C V C >.>.4.4.C C ",
-" ] { ] { { ] { { / / { ^ ^ { ] { ] ^ { { ] ] ] { { ^ { / / ^ ] / { ] _ $.l !.2.{.j.h.~@i.x.D.D..+X.|+'+m+'+2+7+7+n+o+s+s+K+C+D++@S+=@=@=@=@f@R#t@k=t@E@Q@W@W@$#.&/#4#4#7#f#f#I#E#E#O#O#U#&$~$&$7$3$A$&%F$K$W$_%_%4%A%A%r%@&R%B&(&}&w&C&p&Y&E*Y&Q*Q*l=+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+f=m=f=n=o=o=o=f=p=o=q=n=p=f=n=n=r=6=6=6=6=[=|=/=}=/=-=-=-===s=%=1=S*S*G*w*n*g*l*e*7*}*~*#*&* *Z&Z&F&H&z&r&l&j&e&d&|&_&&&2&%&`%T%C%N%E%H%+ + + + + + + + + + + + + + + + u&3#4#/#)#)#)#$#W@F@U@Q@t@g@f@f@f@6@=@S+X+X+D+e@C+C+q+y+n+7+6+6+]+-+'+.+W.W.D.D.w.i.h.h.!.J*1$1$o&2%2%2%..p%/%p%/%^.W#$$^.^.$$$$W#$$W#^.$$W#$$W#^.V V C V >.V C V C 4.C ",
-" ] { { / ^ / ] ^ ^ ^ / ] ^ ] ] { / ^ ] ^ { ^ ] ] ^ ] ^ { ^ ^ { { ] _ _ _ %.!.{.c.2.h.c.w.w.D.D.O..+.+-+'+'+]+e+7+7+q+q+C+C+D++@S+X+@@=@6@|@f@f@t@t@G@Q@Q@H#`@-#)#/#D#3#0#a#f#E#E#u#u#b%U#@$~$~$h$_$A$A$F$K$X$X$k%4%r%B%B%B%@&,&,&}&b&w&p&p&E*s*t=Q*u=+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+q=p=q=o=v=v=w=w=v=q=q=v=o=q=q=o=n=f=f=6=f=6=[=[=]=a=]=-=-=&=%=%=.=1=S*G*w*w*x=n*g*f*7*}*!*~* * *Z&R&G&s&s&r&m&j&6&|&|&J&)&)&~&T%C%N%F%m%+ + + + + + + + + + + + + + + + S+4#3#4#)#)#$#$#Q@Q@y@t@t@t@|@R#r@r@=@=@X+T@D+D+Z#s+s+7+7+7+6+]+]+:+-+.+X.X.D.D.D.i.i.2.%.y=1$o&1$'%2%2%z=..../%p%B W#B $$$$W#W#B B W#$$B W#$$^.V C >.C C 4.>.V V V C 4. ",
-" { { ] ] ^ ] ^ / ] ^ ^ ^ / { { / / ] ^ / { ^ / ^ { { { ] { ] ] { / { ^ _ l {.{.2.j.j.w.x.D.P. + +X.$+-+]+<+]+g+g+7+n+r+s+C+D+C+@@@@@@=@=@f@|@f@s@y@t@F@Q@W@$#l#`@/#)#4#5#7#f#)$y#E#U#N# $~$~$~$8$8$A$o$F$ % %_%X$A%k%r%r%R%B%,&}&}&r*p&:*Y*Y&N*N*Q*9=+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+o=o=w=A=B=C=D=E=A=A=A=A=C=F=G=w=o=p=p=p=m=p=f=6=6=5=6=4=a=/='=-=&= =.=S*S*G*u*w*x*b*b*7*7*}*|*%*o*Z&Z&y&y&H&r&l&l&f&7&**|&&&2&)&`%T%C%G%H%+ + + + + + + + + + + + + + + + 1%3#4#4#/#-#l#$#Q@M@U@E@y@g@g@|@^@r@/@@@@@*@D+C+s+s+s+n+7+7+7+6+<+'+'+-+.+X.W.D.w.K.h.h.c.+&1$1$2%2%2%../%/%p%/%B $$W#B ^.$$B $$W#$$B $$W#W#W#C V C 4.V V C 4.4.>.4.V C ",
-" y { ] ^ ^ { { { { ] ] { / ] ^ { ] ] / ] ^ { { { / { ] ] { ^ ^ ^ ^ J _ $.~.!.!.c.C.j.h.x.D.D.W..+.+.+'+]+:+<+7+2+n+n+y+s+C++@S+D+x@=@=@/@/@f@s@t@y@E@M@W@l#`@`@-#)#)#3#3#f#f#)$u#%%U#O#U# $!$7$~$3$A$o$F$W$W$ %_%k%4%B%r%@&@&,&}&}&X&p&p&E*E*E*N*Q*Q*+ + + + `%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+A=C=E=E=A=E=E=E=E=E=E=E=E=H=A=A=E=C=w=w=v=n=f=n=f=6=[=[=<=]=/=-=&=&=)= =S*+=G*w*u*m*g*e*7*7*!*&*$*$*Z&Z&R&z&r&r&l&e&6&6&|&_&)&&&*&T%T%E%F%I=+ + + + + + + + + + + + + + + J=f#4#4#)#`@$#`@Q@M@Q@t@y@g@s@|@/@/@=@=@@@S+S+D+C+K+y+q+7+2+g+<+'+m+-+$+X.W.D.O.D.V.h.c.c.J*+&]&2%]&2%2%../%p%$$W#W#B ^.W#$$^.$$W#^.B B $$B W#C C >.C 4.C >.C C 4.V C n. ",
-" f { { ] { { { { ^ ] { ^ ] ^ ] ] ^ ^ { / { { { { ] { ^ { ] { ] / ^ J _ ~.%.!.l.2.c.c.h.K.x.{+W.W.X.'+-+'+]+<+<+7+7+s+q+C+q+C+D+@@@@@@=@^@|@f@f@t@F@M@F@Q@W@W@`@$#)#/#4#7#0#7#f#y#u#O#U#U#!$~$~$~$7$3$F$F$X$W$X$4%4%A%r%B%`&@&,&}&b&b&p&p&:*Y&E*N*Q*u=+ + + + G%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+K=K=L=K=K=K=M=M=M=M=M=M=M=N=O=E=E=H=A=A=w=w=o=g=m=6=6=6=4=]=}=]=-=-=&=.=`*S*P=G*w*x*m*k*b*7*}*&*#*#* *Z&F&E&z&r&t&j&6&7&g&_&3&&&`%T%T%C%N%Q=+ + + + + + + + + + + + + + + R=5#4#3#)#^#$#$#W@Q@M@U@t@g@s@f@|@/@=@W+@@S+S++@q+q+y+7+7+7+6+2+:+]+-+$+$+W.W.D.D.x.h.j.c.+*]&<&<&'%'%2%..v%v%^.W#$$B $$W#$$W#^.^.$$W#$$W#B V C C C 4.C C 4.V C >.V C V ",
-" y { { ] ] { ^ ] ^ { { ] { / { ] ] { ^ ] { ^ { { ] { { ] ] { ] ^ { =._ _ ~.{.{.c.2.,@h.i.x.D.O.W.X.'+-+]+<+<+<+7+7+q+s+s+Q+D++@S+X+($=@=@^@f@f@f@t@t@F@Q@W@$#)#)#)#/#3#0#0#f#f#I#u#O#u#U#!$~$~$h$3$_$u$A$W$K$X$X$k%4%L%B%@&X%5&}&}&b&w&p&:*Y&N*Q*N*e=+ + + + 6%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+K=K=M=S=S=T=U=V=W=X=W=V=Y=S=U=M=M=N=E=N=E=A=A=B=v=p=q=f=f=5=5=}=a=^='=&=%=%=S*S*+=G*u*u*b*f*b*7*|*}*~* *Z&R&F&z&r&l&t&f&c&g&|&_&&&!&`%Z%C%O%Z=+ + + + + + + + + + + + + + + `=4#3#/#)#)#`@W@W@Q@Q@y@t@s@g@f@^@^@=@X+X+S+D+C+C+s+n+q+7+7+g+2+]+'+-+-+.+X..+D.D.v.i.h.!.+*1$]&^%2%2%2%/%/%p%B B $$^.W#W#W#W#$$^.B W#W#^.W#V V >.C C 4.C 4.4.>.>.C V b+ ",
-" ^ { / ] ] ] { { / ] { ^ ] { { / { { { ^ ] ^ { / ^ ] ] / { ] { / { ^ _ %.{.!.7.{.c.j.i.i.V.D.W.X..+-+'+:+]+<+2+7+7+s+r+s+s+D+D+@@@@@@@@=@f@f@s@s@t@F@F@Q@W@$#`@`@)#}#5#f#f#f#f#E#E#N#N#@$ $.$7$7$3$_$F$!%!% %X$_%_%_%K%r%B%@&X%5&X&}&C&M*p&Y&E*Q*Q*l=+ + + 2*>%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+S=X=U=W= -.-+-@-.-@-W=#-T=T=Y=V=S=$-S=M=E=N=E=E=D=F=v=o=q=6=6=4=a=a=]=%--=)=.=`*S*G*w*u*n*x*f*7*}*}*$* * *Z&P&y&z&l&t&e&c&c&|&2&3&)&*&`%T%C%&-+ + + + + + + + + + + + + + + d%3#3#4#/#`@$#`@W@Q@F@t@y@g@g@f@f@6@>$W+@@D+D++@s+q+q+o+7+7+2+<+'+-+-+-+X.W. +D.D.v.v.h.!.+*]&]&]&'%2%../%$$$$$$B ^.$$W#$$W#$$$$$$^.^.$$B >.>.4.>.C 4.C V C V V >.C V >. ",
-" Z ] { / ] { ^ ] { / / ^ { ] { ] { ^ ] { { ] ] { { { ] / ^ { { { / ^ _ %.%.!.!.2.j.h.w.w.w.D.W.W..+l+X.'+:+<+]+7+7+y+r+q+C+D+X+S+-@@@=@|@f@f@f@s@t@E@Q@Q@Q@Q@$#)#4#3#3#4#0#f#I#t#u#N#*-.$+$&$~$7$_$o$A$F$K$X$X$X$A%K%A%B%=-B&@&}&}&w&b&p&:*Y&E*N*Q*--+ + + 3&E$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+;->-.-,-'-)-'-'-)-'-'-'-)-!-'->-@-W=T=V=X=M=N=E=E=B=D=p=g=f=f=5=4=a=]=^=-=&=&=.=S*S*G*~-x*l*b*7*7*#*!* * *Z&P&y&y&r&l&l&f&6&c&_&_&&&*&T%{*M%{-+ + + + + + + + + + + + + + + ]-4#4#/#/#`@$#l#Q@Q@E@G@y@t@s@f@=@/@=@=@@@S+D+C+J+s+q+q+7+7+7+<+'+-+'+-+.+ +{+D.w.i.h.C.%.+*+*1$]&]&2%..v%$$^.^.B W#B W#^.B W#B W#$$^.^.$$V V C >.C >.>.V V >.C C V 4.+. ",
-" P { ^ / ] / { / { ^ { / ] ] ^ { / / ] / ^ ] { ] ] { ] ^ { { ^ ^ ^ _ _ %.%.{.g.2.h.2.h.v.h.D.D.W.W.-+.+-+]+6+g+7+7+7+q+s+s+C+D+W+X+@@r@=@6@f@s@t@t@y@Q@Q@H#$#$#)#)#)#4#7#3#f#t#t#u#N#N# $~$&$~$7$_$_$_$F$F$W$X$X$k%A%r%L%B%X%,&}&}&p&C&p&<*Y&E*Q*Q*@&+ + + 8%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+,-'-!-^-^-^-/-/-/-/-/-(-!-!-!-_-:-<-.-Y=V=Y=X=N=E=E=C=C=q=o=f=6=6=[=]=<=^=-===&=%=+=[-w*w*n*b*b*7*}*|*#* * *P&P&E&s&l&l&j&c&|&|&_&)&!&*&T%T%C%+ + + + + + + + + + + + + + + }-3#/#/#)#)#-#l#$#F@M@t@t@t@f@f@/@=@=@-@@@X++@C+J+s+q+y+7+7+]+<+m+'+-+|+ +.+W.D.w.i.h.j.!.|-]&1$]&o&..^.p%$$W#B B $$$$$$B $$$$$$B W#B W#^.C V V C C >.V C >.4.4.C >.V W ",
-" 2${ ] ^ { { { ] ] ] / / { ^ ] ^ / { ] ^ { ] { { ] ^ / ^ ^ { { / ] _ _ l ~.{.!.{.2.h.h.h.D.D.W.O..+$+'+)+]+]+<+7+7+n+s+q+K+D++@X+X+=@=@=@7@f@f@g@t@F@M@F@Q@W@`@`@^#3#4#5#f#7#)$)$I#O#N#U#U#@$~$7$_$3$o$F$F$ % %X$_%A%K%B%B%X%@&}&b&p&p&M*Y&Y&Y&1-Q*,&+ + + E$G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+2-3-3-/-4-5-/-6-6-6-6-6-4-4-7-(-8-!-'-'-+-.-W=W=X=O=E=E=B=9-o=f=6=6=[=]='=-=&=%=.=S*[-G*G*x*m*g*7*}*1*%*2*Z&.*P&H&H&r&l&e&e&****|&!&)&*&`%T%M%+ + + + + + + + + + + + + + + 0-4#3#3#)#$#$#$#W@F@Q@y@y@f@s@|@f@=@=@@@X+X+S+D+C+s+q+q+7+e+g+]+'+'+-+.+.+.+{+D.D.v.h.c.!.+*-*<&'%..../%..$$$$W#^.$$W#^.B B $$B $$W#$$$$$$V C >.>.V V V V 4.4.>.>.C C a- ",
-" _*^ { / ] ] { / { { { { { / ] { { ^ ^ ^ ^ ^ ^ { { { / { { / ^ { J _ _ l !.!.{.2.r.h.i.i.x.D.D.X..+X.-+'+]+<+g+2+7+7+x+s+C+D+D+X+S+=@/@=@/@f@g@t@t@t@F@Q@$#$#)#)#)#4#7#7#7#f#y#t#u#u#U#U#U#&$~$h$b-_$o$F$!%K$X$X$4%4%A%r%@&X%,&,&,&}&C&p&p&:*E*Y&1-4%+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+7-6-c-c-d-c-d-e-e-f-e-e-d-g-h-6-6-/-(-(-!-<-i-V=U=S=M=E=D=A=9-f=f=6=[=[=a=/=-=-=.=1=S*G*G*u*l*n*c*7*}*|* *$*Z&R&P&z&r&l&l&f&6&c&_&_&!& &`%C%O%+ + + + + + + + + + + + + + + j-4#/#4#)#)#$#r#W@Q@U@t@t@g@s@f@=@/@=@@@X+X+X+C+s+q+n+q+x+g+6+<+'+-+-+.+-+.+{+D.w.i.h.j.d+]&+*]&M M ..^.$$$$$$^.$$^.$$^.B $$$$$$B W#$$C C C >.>.>.V V 4.>.C C >.C C >.#= ",
-" 1 ^ ] ^ / ] { ] ] { { ] ] ] { ^ ] / ] { / ^ ] ^ / { / ] { ] / ] ] _ ^ ~.l !.!.2.2.r.c.x.x.D.D.{+W.$+'+'+]+2+2+7+7+r+q+s+Q+D+S+S+X+W+=@/@=@|@g@t@t@t@M@Q@W@$#W@-#/#/#/#4#7#f#f#E#E#N#U#U#.$&$7$~$3$_$_$F$F$ %X$X$k-A%A%B%B%@&X%}&,&b&r*C&p&<*E*N*Q**%+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+c-l-m-n-o-n-p-q-r-s-t-r-n-u-o-v-w-g-6-4-(-^-!-+- -Y=U=K=E=A=D=9-p=f=5=[=4=]=-=&=%=.=.=T*G*v*v*f*b*7*}*}*&*&*Z&Z&z&z&r&l&l&j&n&g&|&_&8&*&=&T%T%+ + + + + + + + + + + + + + + $=7#4#4#)#)#`@W@Q@Q@M@t@t@s@f@f@/@=@=@=@S+X+D+D+s+C+y+x+7+7+6+2+]+-+-+.+X.P.D.D.D.w.h.,@$.1$1$,#O+2%..W#p%^.$$B W#^.$$B W#W#B W#B W#V C C >.C V V V V 4.4.C 4.V >.V >.X* ",
-" L*^ ] ] / { ] ^ { ] / { { / ] / { { ^ { { { { ] { { ] ] / { { ] =.{ _ ~._ l {.2.c.i.h.i.V.D.D.W..+.+-+-+]+]+7+7+7+y+q+s+K+D+D+W+W+@@=@=@^@|@f@f@t@G@F@W@W@l#l#)#^#4#4#7#7#f#T#)$u#N#u# $@$&$7$~$7$7$o$F$F$!% %X$_%D*A%A%r%@&,&5&}&W&C&p&p&:*N*E*t=*%+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+m-x-y-z-A-B-C-D-E-F-G-F-H-I-A-A-n-u-o-c-h-6-8-^-)-@-.-W=S=S=E=D=J-K-n=5=[=a=]=]=&===%=.=T*G*G*u*n*g*7*7*1*}* * *Z&L-y&y&r&t&f&6&c&|&_&)&)&*&T%T%+ + + + + + + + + + + + + + + M-7#3#D#/#-#)#W@Q@F@G@t@s@t@f@|@^@=@=@=@S++@e@s+C+q+y+7+7+7+g+:+<+'+-+.+.+W..+D.D.w.h.c.=.,#,#,#......p%^.B $$B B $$^.$$^.W#^.W#$$$$$$>.C 4.>.C >.C V >.4.C C V 4.V >.N- ",
-" O-] ^ ] / ] ] ] / { { / ^ { / / { { { ] { / ^ ] ] { { ] / ^ ^ ] / ^ ^ _ !.{.{.c.2.h.h.h.D.D.D.X.X.-+'+'+'+]+e+<+7+n+7+q+D+D+D+D+@@=@=@=@|@f@f@t@g@y@Q@Q@$#H#-#$#)#)#}#3#f#f#T#I#f#%%O#U# $U#@$7$y%o$A$A$!%F$W$ %4%K%A%A%B%@&@&,&,&}&p&p&:*E*:*s*N*P-+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+Q-R-S-E-T-U-U-V-W-X-Y-Y-U-Z-Z-I-I-A-R-n-u-e-w-6-(-^-'-i-S=U=M=A=J-K-F=6=6=[=4=]=-=&=&= =T*S*G*w*x*n*g*7*}*&*2* *`-Z&H&y&S&l&j&7&c&|&_&2&)&~&T%C%F%+ + + + + + + + + + + + + + m#7#D#/#)#/#W@$#Q@F@y@t@t@t@|@f@/@r@=@X+S++@D+K+C+s+o+q+7+<+g+]+'+'+-+-+ +X.D.D.D.h.i.r.=.1$'%..'%2%..$$W#$$$$W#$$W#$$^.$$$$$$W#$$4.V V V >.C >.4.V V V C V C V V >.V ; ",
-" ] ^ { { ] ^ { ] ] { ^ { ] ] ] ] ] ^ / ^ { ^ ] ] ] { ] ^ { ^ ] ] ^ _ #.#.{.{.2.c.j.c.i.i.x.D.O. +.+l+-+<+'+<+7+7+7+r+s+q+C+D+S+X+x@=@^@/@/@|@t@y@Q@U@F@Q@Q@$#$#/#/#/#7#3#f#f#t#E#u#N#O#.$.$~$7$7$3$_$A$A$F$X$X$X$k%4%4%B%@&,&}&,&}&b&p&M*Y*:*N*Q*P-+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+.;T-+;U-Y-Y-@;#;$;$;%;%;%;#;&;V-U-Z-I-A-s-o-m-6-6-(-*;=; - -M=K=A=K-v=m=6=h=<=/=-=-=)=`*+=S*G*w*x*l*b*7*-;1*%*2*Z&Z&G&E&S&r&l&f&7&c&|&_&%&%&`%C%C%+ + + + + + + + + + + + + + ;;3#4#D#)#)#$#l#W@Q@t@y@t@g@f@f@6@=@@@@@W+D++@D+C+r+y+y+7+7+6+6+'+-+.+.+X.D.D.V.D.w.j.2./ '%]&'%..2%^.^.$$$$$$$$B W#B W#B $$W#^.C C V C C >.4.C C 4.C 4.C 4.C V C V V ",
-" { { { { ^ { ] / ^ { { ^ { { / ] / ] { ] / { / ] { ^ ^ ] / ^ ^ / =.^ _ _ !.!.2.2.h.i.h.x.D.D..+W.$+'+-+'+6+<+7+7+n+s+q+s+C+D+S+X+@@@@=@/@f@R#f@t@t@y@E@Q@l#l#-#^#/#4#/#7#0#f#f#u#u#u#U#U#.$&$7$~$_$A$A$A$K$!%_%_%4%_%4%B%@&R%B&,&b&b&W&:*p&Y*E*s*J#+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+U-W->;,;';,;);!;~;{;];~;^;';/;(;%;&;_;U-I-H-n-l-c-6-/-!-:;<;U=M=L=B=K-[;f=6=[=<=}=-===&=%=+=G*w*l*n*f*b*7*1*&* * *Z&F&H&z&l&m&j&f&|&|&_&)&!&`%T%C%+ + + + + + + + + + + + + + + 4#4#4#)#)#`@Q@Q@Q@F@t@g@s@s@f@r@/@@@@@*@S+D+D+s+s+r+x+7+2+]+<+'+-+$+.+X.O.D.D.i.h.c.c.( +&,#^%O+M v%B $$B B $$^.$$^.W#$$W#$$>.V V V 4.C 4.C V 4.C >.>.V >.V C C V >. ",
-" ] / ] { ] / ^ { { / ^ ^ ^ { ^ ] ^ / { { / ^ ^ / / ^ ^ { { / { { J _ l ~.!.!.{.l.j.h.i.V.D.D.D.W..+-+-+]+<+<+2+7+n+o+r+s+D+D+S+T@X+=@=@=@|@f@f@t@E@y@M@Q@H#`@)#)#/#4#3#5#7#f#I#u#E#J#O#+$U#@$~$_$3$_$A$F$W$X$ %_%X$A%A%r%@&@&@&}&}&b&p&:*:*Y&Y&E*};+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+>;|;{;1;2;3;4;5;5;5;6;5;5;7;7;8;9;0;%;W-V-a;A-r-b;c-6-3-^-<-c;S=M=E=D=v=v=6=[=a=}=-=&=)=%=+=U*u*w*l*f*e*7*}*}*&* *Q&P&z&r&r&l&j&e&c&|&|&!&`% &T%O%+ + + + + + + + + + + + + + + 4#/#/#`@v&l#W@Q@E@t@t@t@s@f@^@|@r@=@@@S++@+@C+C+s+q+y+7+<+<+'+-+'+'+ +X.W.X.D.w.w.h.2.( U ,#'%^%....p%W#$$W#$$$$$$^.^.$$^.^.V C >.4.C 4.C C C V C C >.>.4.>.>.C C 4. ",
-" P ] ^ ^ ^ / ^ { ] { ] ] / ] { { { { { / ] ^ ] ] ^ ] { ^ { ^ { { _ _ l $.%.{.c.c.2.h.i.i.w.W.X.X..+.+'+:+:+2+2+7+7+q+q+s+s+D++@X+@@-@=@=@/@f@g@t@F@G@Q@Q@r#`@l#/#)#4#d;f#7#f#y#u#E#u#*- $U#~$~$7$3$o$A$F$F$F$X$*%_%4%A%B%@&@&,&}&}&X&p&w&p&E*Y&1-};+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+);e;f;g;h;i;j;k;k;k;k;l;l;m;n;5;3;o;';,;%;U-E-A-r-p;q;6-3-r;;-<;M=K=C=9-v=6=[=[=a=}=-=&=.=+=S*G*u*u*f*g*7*1*}*&*s;Z&R&G&H&r&t;j&n&7&|&_&%&`%`%T%M%D%+ + + + + + + + + + + + + + 4#4#/#-#)#l#Q@Q@Q@y@y@t@s@f@6@7@=@=@=@X+X+D+D+C+q+7+7+2+2+]+]+'+'+$+$+X.X.D.D.i.i.h.c.u;1$,#2%......^.W#$$$$W#$$$$^.$$$$W#4.V >.4.4.V >.V >.V 4.C C >.V >.V C >.V W ",
-" _*] ^ ] { ^ ] { / { { { { ] ] / { { ] ] ] ] ^ { { ^ { ^ { ^ ] / _ ^ $.~.{.{.2.c.2.r.h.w.w.W.P.O..+'+'+'+]+2+2+g+n+y+s+s+K+D++@X+W+@@=@^@|@|@f@g@s@M@Q@Q@Q@l#v&`@-#/#4#3#0#7#E#f#u#E#N#U# $!$~$7$7$_$o$A$F$W$W$X$k-4%A%r%B%@&@&N&B&X&}&p&p&:*Y&E*v;+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+w;3;i;x;y;z;z;A;A;B;A;A;C;D;l;l;5;h;3;E;,;%;W-U-I-o-m-q;6-^-r;<;$-M=F;D=J-G;h=|=a=-='=&=)=T*1=G*w*u*x*b*b*H;|*~* *Z&P&E&r&s&r&f&n&c&|&_&2&&&~&T%O%C%+ + + + + + + + + + + + + + /#3#/#-#`@$#Q@Q@M@t@t@s@g@f@|@=@=@=@W+X+S+D+C+D+q+q+q+2+2+<+:+]+'+l+$+.+X.D.x.v.i.h.c.U+1$^%M ......^.B B $$$$$$B W#W#^.4.C V 4.>.>.C >.C C >.V C V 4.4.C 4.>.4.V #= ",
-" >*/ ^ { { ] { { ] / { { ^ ^ { { ^ ^ / { { ^ ] ] ] ^ { / { { { / { _ _ %.{.7.{.2.c.c.h.x.x.D.P.X..+.+-+:+]+]+e+7+x+r+y+s+C+D+S+X+=@X+/@r@6@|@f@t@y@E@E@F@Q@$#`@`@)#4#4#3#3#f#f#y#E#u#u#U#.$.$~$7$~$o$u$F$W$W$ %X$_%A%4%A%r%B%@&@&5&,&w&C&p&:*<*E*4$+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+I;J;z;z;K;L;L;M;M;N;N;O;P;Q;R;D;z;S;5;T;8;U;|;W-+;A-o-V;q;5-W;'-X;M=M=J-9-v=g=6=<=]=,=&=&=.=S*G*v*w*m*g*7*}*1*~* * *P&E&H&S&r&f&e&d&|&_&3&%&`%`%T%C%E%+ + + + + + + + + + + + + 3#)#-#)#$#`@W@F@F@F@t@f@f@f@/@^@=@@@W++@D+D+C+q+q+o+7+]+<+]+]+m+-+-+ +D.W.W.D.h.h.h.c.e 1$,#,#2%../%$$$$$$W#$$$$W#$$4.>.V V >.C C >.>.C C V V V 4.4.C V V V V V 4.j ",
-" ;*/ ] ] { { { { ^ { { { { ^ / ] { ^ / ^ ] { / ] / / / { { { ] / ] ^ _ $.{.!.{.c.c.c.c.i.x.D.W.W.-+.+1+]+:+2+2+g+n+q+n+J+s+D++@S+@@($@@=@=@f@g@g@s@E@Q@Q@Q@l#`@`@/#)#/#4#0#f#I#f#I#V$O#u#.$+$&$7$3$_$_$o$W$W$K$X$_%_%D*r%r%B%X%@&,&}&b&C&b&p&Y&Y&Y;+ + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+Z;`;L;M; >.>+>@>#>$>%>+>&> >*>N;=>D;k;5;5;->);|;W-E-A-o-;>>>,>'-T=$-K=K=J-'>g=6=<=]=-=-=%=.=.=S*~-u*m*k*b*}*#*#*#*Z&Z&P&z&S&r&j&f&6&|&|&_&%&%& &T%C%D%+ + + + + + + + + + + + + /#D#/#`@l#l#Q@Q@U@y@t@f@s@f@r@|@=@W+@@+@)>D+C+s+y+n+7+7+<+]+m+-+'+|+X.D.D.w.x.i.i.h.c.J*1$'%M ....B ^.$$W#B $$$$>.4.>.C >.>.C 4.V 4.V C 4.C V V C 4.>.C C V V 4.4.!> ",
-" ] { { ] / ^ ] ] { ^ ] { / { { ] ] ] ] ] ^ { ^ { / { ^ / / ] { { ^ _ _ {.!.7.2.h.c.h.w.V.w.D.O. +.+.+'+]+<+]+6+7+y+q+q+C+K+C+X+X+@@=@/@/@^@|@s@t@t@E@G@W@W@$#-#/#)#4#}#4#f#f#)$I#u#U#O# $ $~$~$h$3$A$o$F$W$0&K$_%4%A%r%A%B%B%@&,&}&}&b&p&p&:*Y*~>+ + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+{>L;M;]>$>^>/>(>(>_>_>:>_>_>@><><>[>A;k;l;h;7;{;}>|>B-q-o-q;5-r;W;$-U=K=1>[;g=n=[=}=]=&=&=`*S*T*G*w*m*k*b*7*|*&* *Z&P&P&z&E&l&l&j&c&g&|&3&&&!&T%C%M%G%+ + + + + + + + + + + + + 3#/#`@)#W@H#Q@Q@Q@F@t@g@f@f@^@=@=@X+S+D+D+s+C+s+n+7+7+7+]+]+<+]+-+-+.+X.X.D.D.i.h.h.c.M.'%,#^%M ......^.W#^.V >.V V V C C C C V >.>.C V V >.>.V C C V C C V C 4.C ",
-" 2>{ ^ ^ ^ ^ { / { { { { { / / ] { ] ^ ] { ^ / ] / ] { { ] { { / ^ _ ~._ !.2.2.c.h.h.i.x.D.D.W..+.+1+)+:+]+f+7+2+r+o+s+J+Q+C+D+S+=@@@=@^@^@f@s@t@t@y@E@Q@W@W@$#)#/#4#4#7#f#f#)$y#u#E#O#U#+$U#~$7$7$A$A$A$W$F$X$_%_%4%4%A%`&@&@&,&X%}&}&b&w&:*Y*3>+ + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+4>5>6>7>7>(>8>9>0>a>a>a>9>b>_>/>@>c>d>A;k;l;h;e;);e>+;f>x-x-q;g>h>i>$-K=j>F=G;g=[=]=]=-=&= =S*G*G*w*x*x*k*7*}*#*~*3*Q&P&F&z&l&l&e&d&c&|&_&&&`%=&T%C%F%+ + + + + + + + + + + + + V@/#`@$#l#W@Q@Q@Q@y@t@|@|@|@6@=@=@=@S+D+D+s+J+s+y+n+7+7+]+]+:+-+-+.+X.W.D.x.D.v.v.C.c.1$,#^%M O+..^.B ^.$$V C >.>.C V V >.V >.>.V >.C >.V C V V V C V C C C V V k> ",
-" [&^ ] / { ^ / { ] { { ^ ] / ^ { ^ ] { ] / ] ] ^ ] ^ ^ { ] ] { / ^ _ _ {.!.!.2.c.c.j.w.w.V.D.W.X..+.+-+]+]+6+7+2+7+q+q+J+C+D+D+D+@@x@=@=@/@f@f@t@t@E@Q@Q@$#W@$#`@/#/#/#5#a#f#y#y#f#u#O#u#U#&$~$7$7$l>o$A$F$W$/&X$_%4%4%A%B%R%B%X%N&}&X&w&p&p&:*m>+ + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+n>o>p>q>r>s>s>t>t>u>v>w>x>s>9>y>_>$> >z>A;k;5;3;!;e>A>.;R-x-q;B>C>,-$-$-j>v=g=g=|=}=,=-=&=`*`*[-G*w*u*b*7*7*|*1* * *Z&F&F&E&l&m&f&c&|&g&_&)&&&T%C%C%F%+ + + + + + + + + + + + + t@)#$#)#$#r#Q@Q@F@E@t@f@f@f@|@=@@@=@W+X++@D+q+s+o+7+7+f+<+<+]+m+X.-+ +O.D.D.x.h.h.c.%.1$'%2%O++...B C V C V C C V V C V C V C >.4.C V V >.V 4.C 4.4.C >.>.V V V D> ",
-" 0 ^ ] ^ { ^ ] ] { { ^ ^ ] { ^ { ] ] ] ] { ] { ] { { ^ ] ^ ^ { ^ ^ _ _ $.{.{.2.2.c.i.v.i.w.D.D. +$+.+-+]+<+]+<+7+7+x+n+C+D+C+D+S+X+@@=@=@6@f@|@t@t@t@M@Q@r#r#-#)#)#)#4#7#5#f#f#y#E#u#O#O#U#+$!$~$~$3$_$F$A$W$/& %X$_%_%K%A%r%B%#&B&}&b&b&X&p&<*5%+ + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+E>7>r>r>F>G>H>H>I>I>I>I>J>w>x>K>9>/>6> >M;A;k;h;e;);L>M>A-N>O>w-P>,-$-Q>j>A=g=g=R>}=]=-=-=.=`*U*G*w*n*g*7*7*1*~*$* *Z&Z&R&H&r&l&f&n&**|&_&_&`%`%C%C%E%+ + + + + + + + + + + + + S>/#$#`@$#$#W@F@M@y@t@q#|@f@=@=@=@S++@D+D+C+s+y+q+7+7+<+<+]+'+-+-+.+X.D.D.D.D.i.h.c.=.1$o&+...^.^.$$V C >.C V >.V V V V 4.C C C C >.V 4.C 4.>.4.C V >.V >.V V C 0 ",
-" { { ] ^ / { { / ] ] { ] { { ] ] { ] { { ] { ] / / { { ^ / { ] ^ J l _ %.!.7.2.c.h.i.i.v.D. +.+.+-+'+'+<+2+7+e+7+q+q+s+C++@D+*@T@x@=@/@^@|@f@f@t@t@y@F@W@W@$#-#)#)#4#7#3#7#f#)$y#E#O#O# $ $~$~$~$7$3$A$F$F$X$W$K$_%4%4%K%r%`&X%X%(&,&b&b&W&:*T>+ + }*G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+U>V>W>G>X>Y>Z>`>`> ,., ,+,H>H>@,K>#,/>6>c>[>`;j;$,e;%,&,.;*,O>=,3-,--,;,K=j>v=g=>,[=<=-=)=%=+=T*U*w*m*m*b*7*}*#*&* *.*R&E&s&r&l&j&d&c&|&_&&&&&T%C%C%E%+ + + + + + + + + + + + + ,,)#)#l#r#Q@F@M@U@s@s@g@f@/@=@@@@@@@D+e@C+K+s+s+o+7+7+2+]+<+]+|+-+X..+D.D.K.h.c.2.2.( ,#M M O+^.C ^.V V >.V C >.V C >.C V C C C V V C 4.C C C >.C C C C C V >.4. ",
-" y ] ] { { { ] { { { ^ ] { ] { / / ] ] { ^ { ^ ^ ^ { { { { ] { { =._ _ {.{.2.2.C.i.i.w.x.D. +O..+.+1+]+:+<+<+7+7+7+y+q+C+D+D+D+@@@@=@/@^@|@f@t@t@y@Q@U@Q@W@W@)#)#)#}#4#7#3#f#)$)$u#N#N# $@$~$~$7$3$3$A$u$A$W$X$c%_%_%_%K%B%r%@&@&N&(&X&b&w&p&^*+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+',),G>!,Z>~,{,],^,^,/,(,/,],_,X>@,W>:,^>n>M;A;`;h;<,[,L>.;R-},|,3-1,-,X=;,j>K-g=g=4=]=-=2,%=+=G*G*w*x*l*e*7*1*#* * *L-R&y&r&r&l&m&j&g&|&_&%&*&=&T%M%M%+ + + + + + + + + + + + + 3,/#$#l#Q@Q@M@F@t@s@s@|@|@=@/@@@@@S+X+D+D+C+q+y+x+7+2+<+2+<+m+'+.+ + +{+D.D.w.c.i.h.F.+.O++...^.>.>.V C 4.V V V C 4.C 4.V C C C V C 4.V C >.C V V C >.>.4.C V 3= ",
-" : ] { ^ { { / ] ^ ] ^ { { { / / { { { { ] { ] { { ] / / { ^ { ] ^ _ l !.!.!.3.2.j.h.i.i.D.W..+X..+-+-+]+<+6+2+7+7+y+s+K+D+D+S+S+X+@@@@/@^@f@f@f@t@F@F@Q@Q@V%W@)#)#)#/#4#a#7#f#)$E#E#O#N#U#@$~$~$8$3$3$A$A$!%F$X$X$_%_%K%K%r%@&@&@&N&}&}&r*p&4,+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+5,6,!,7,8,9,0,a,b,c,d,a,/,/,],e,X>x>a>f,g,c>L;`;l;h,i,}>j,R-N>},B>P>-,k,Q>j>K-v=R>l,^=-===%= =S*G*w*v*g*g*7*7*~*&*$*Z&Z&H&s&r&t&m&6&7&|&2&&&`%T%T%C%D%+ + + + + + + + + + + + + m,)#`@Q@W@Q@Q@M@t@g@s@f@|@/@=@W+@@X+D+D+K+q+s+s+y+7+g+2+]+'+'+-+X.X.X.D.D.D.i.v.C.2.U++.M M ^.^.B >.V >.V >.V C C C >.C 4.>.V >.C 4.C V >.C C V C >.V >.4.>.>.n, ",
-" F ^ { / { ^ { { ] ^ { { / { ] ^ / ^ { { { / ] / { ] ] { ] { / ^ / ^ %.l !.{.2.c.i.w.h.x.D.{+W.X.X.-+'+]+<+]+2+7+7+y+o+s+s+D+D+S+X+@@=@/@6@f@f@t@y@E@M@Q@Q@W@$#)#)#)#/#}#a#a#f#u#E#u#E#U#U#.$@$@$~$3$3$3$&%F$W$W$_%_%_%K%r%r%`&@&@&}&,&}&X&p&9%+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+),o,8,9,d,p,q,r,q,s,t,u,v,w,x,y,Y>G>5,z,^>A,4>B,Z;h;C,D,E,f>Q-;>F,P>-,k,M=1>1>g=g=R>]=-=&=&=%=T*G*w*v*k*e*7*}*}*$* *Z&R&z&E&r&l&j&e&c&|&_&_&!&`%T%O%N%+ + + + + + + + + + + + + Y+$#$#$#W@Q@F@E@t@t@f@f@r@/@>$=@@@@@S+S+D+C+s+x+7+7+<+<+<+'+'+|+.+X.D.D.w.D.v.h.c.2.j#+.M ^.[.^.W#V C C >.V V >.C 4.>.>.4.C C 4.C C 4.C V C >.C C >.C >.C 4.C Y ",
-" { ] ^ ] ^ ^ ] ] ] ] { ] { { { ] ] ] ^ { { { { ^ ^ ^ { { ^ { ] J _ _ %.~.2.7.c.2.c.h.x.D.W.X.X..+X.'+m+'+]+2+g+y+7+s+s+C+D+D++@X+W+=@=@^@f@f@f@s@t@F@F@Q@l#$#v&)#/#4#4#a#f#f#y#T#u#E#N#O#U#U#@$h$~$_$_$3$F$W$K$K$_%_%k%K%K%B%`&X%X%(&}&}&b&i$+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G,H,I,J,K,L,M,M,K,N,s,s,u,u,/,O,P,X>x>5,7>Q,R,S,T,U,<,V,E,W,X,},Y,P>Z,`,K=j>1>g=r=R>]=,===)=+=S*G*v*n*m*7*7*}*|*#* *Z&Z&F&z&r&l&f&e&6&|&_&&&*&T%T%C%F%+ + + + + + + + + + + + + '$#`@l#M@F@F@t@t@s@f@f@f@^@@@X+@@W+S+C+s+s+s+x+y+e+e+<+<+-+-+.+.+W.X.D.V.i.w.h.2.c..',#+.M ^.^.>.>.>.4.C C V C 4.C V >.4.4.V V V 4.>.V C C V C C C V C C >.C ",
-" f { ^ { { ] { ] ^ ] ^ / { ^ / { / ^ ^ ] ] { ^ / ^ { ] / ] { { { _ _ _ !.{.{.c.,@c.i.i.w.D.W. +X..+'+]+<+<+2+7+7+x+q+s+D+D++@S+W+=@($/@6@=@f@g@f@y@t@F@Q@W@`@`@`@)#/#/#4#0#7#f#T#E#u#N#U#U#@$~$~$~$7$3$A$A$F$F$X$X$_%4%r%r%r%r%B%B&X%}&0*b&h@+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G++'I,J,@'#'$'%'&'*'='K,s,s,d,c,-'y,;'G>5,q>^>n>>'T,I;,'''E,.;*,)'V;B>Z,`,!'1>1>g=>,~'-=-=&=&=.=T*G*v*m*b*b*|*}*}*#*Z&Z&G&E&H&l&t&e&c&c&|&3&&&)&`%C%C%D%+ + + + + + + + + + + + + {'-#$#r#Q@M@F@y@s@9*f@7@|@/@@@=@X+D+D+C+C+C+y+7+y+2+7+2+:+'+-+.+X.W.X.D.x.x.h.r.c.!.U M ....^.^.4.V C V C >.C C >.4.>.C 4.V >.>.C 4.V V 4.C V >.V >.C C V 4.3+ ",
-" ]'{ ] ] / / ] ] { / { { / ^ / { ^ { ] { / ] ] ] ^ / { { ^ { ^ / ^ ^ %.!.{.2.2.j.r.i.w.w.D.W.{+.+1+'+'+'+]+<+g+7+y+y+s+s+D+S++@S+W+X+r@=@f@|@f@g@t@F@Q@Q@W@$#$#)#)#4#4#5#3#f#f#I#E#u#u#N#U# $@$~$7$7$l>A$A$F$F$W$K$*%_%4%A%r%r%r%@&@&X%(&X&+ + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+^'J,/'%'('_':'<'['}'|'N,s,r,b,x,8,Z>G>5,',1'5>2'`;I;,'''3'4'R-x-5'6'7';-!'j>1>g=R>8',=&===%=T*G*w*w*m*b*7*}*1*&*&* *Z&P&H&S&l&m&j&c&6&|&&&!& &~&T%O%G%+ + + + + + + + + + + + + 9'l#Q@r#F@U@t@t@t@f@f@f@=@@@@@S+X+D+D+Q+C+q+s+7+7+]+]+<+]+-+.+.+X.W.D.D.D.w.h.C.c.0'+.+.M ..^.B C >.C V >.C C C V V V C C V V V V V V C V 4.4.>.C V 4.>.C >.D> ",
-" a'/ { ^ { ] { / / { ] ^ { ] { ] { / ] ] ] { { { ] ^ { { ^ ^ ] { J _ _ %.{.2.{.c.j.~@x.x.x.D.W.{+-+-+-+m+<+]+2+7+7+q+r+s+D+D+S+S+S+=@@@=@r@f@g@s@t@t@F@F@Q@$#`@`@)#/#/#3#4#f#7#f#)$u#u#U#U#.$@$@$~$_$3$o$3$A$A$K$ %c%_%4%A%A%B%B%B%R%5&,&W$+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+b'c'd'e'f'f'g'h'i'%'j'k'N,r,l'm'8,n'G>),o'p'q'4>`;r'h,''e>4's'x-|,6'7't'u'K=1>>,R>~']=&=)=%=S*U*u*u*m*b*7*7*}*&* *Z&R&P&y&S&l&m&f&n&h*|&2&&&)&`%T%C%E%+ + + + + + + + + + + + + v'`@W@Q@M@Q@E@t@g@q#f@^@r@@@=@@@X+S+C+s+s+q+q+7+7+<+]+<+'+-+'+.+X.X.W.D.D.h.h.c.2.w'+...M ..^.4.V C V >.>.>.C 4.C V C V C V V 4.>.C 4.V V >.4.C >.4.V V C C %@ ",
-" / ] ] ] { ] ] { ] ] { / / { { { ] { / ] { ] ] ^ { ^ / ] { ] ] ^ _ _ %.%.{.2.c.i.i.h.w.i.D.D.X..+-+-+-+:+6+2+e+y+7+y+s+C+K+X+*@S+W+W+/@=@r@f@s@s@t@y@M@Q@Q@H#`@.&)#/#4#7#3#7#y#E#u#E#O#O#U#@$@$~$~$7$3$_$A$F$F$!%X$c%X$_%_%A%B%@&@&@&X%d=+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+x'y'z'A'B'B'C'D'E'F'='N,p,l'G'y,n'G>),r>^>q'4>H'I'$,''e>J'K'x-L'6'M't'N'j>O'R>6=l,-=-=)=%=+=G*w*w*m*b*7*7*%*#* *Z&Z&P&H&r&l&l&e&6&c&|&_&!&*&`%C%C%n%+ + + + + + + + + + + + + P'`@$#Q@F@y@t@t@f@|@/@=@=@=@X+W+D++@C+s+C+s+y+7+2+g+<+'+-+'+.+.+X.W.P.V.x.h.j.j.2.S +...^.^.^.^.W#C C >.V >.C C C C C 4.C C C >.C C C C >.4.C 4.V 4.C >.V >. ",
-" w+] ] ^ / / / ^ { / { ] ] { { ^ ] { ] ^ { ^ { / ] ^ / { ^ ] ^ { _ _ l %.{.3.c.2.h.v.w.D.D.{+O..+X.-+'+]+]+2+7+n+7+s+q+s+C+D+D+S+S+=@/@6@6@f@t@t@y@y@F@E@Q@l#`@6#)#/#)#'*7#7#f#f#t#E#%%u# $ $@$~$~$~$_$7$A$F$F$ %W$X$X$k-k%A%r%@&@&R%X%>=+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+Q'g'B'R'S'R'T'C'U'V'W'p,r,l'm'n'H,!,X'',Y'Z'2'H'`'h,'' ).)+)@)#)6'M'`,!'j>O'r=r=l,,=&=)=.=S*G*v*n*n*g*7*}*|*~* * *P&H&z&I&l&l&7&7&|&_&_&~&*&T%T%C%F%+ + + + + + + + + + + + + $)W@Q@Q@t@F@t@t@f@f@f@=@/@-@X++@X+C+C+q+q+x+x+7+2+2+'+]+-+-+-+.+.+P.D.D.K.v.h.c.2.e M O+^.^.^.W#C C C V C V V >.V C C C C C C C >.V >.4.V V >.4.C V C 4.V m$ ",
-" %){ { / ] { / { ^ { { ^ ] { ] { { / ^ ] { { / { / ^ { ^ ^ / { { J _ {.$.{.{.2.j.c.i.h.D.D.O.X.X.X.-+:+]+<+]+7+7+n+7+s+C+C+D+D+X+X+W+=@=@^@r@f@g@y@y@M@Q@Q@W@l#l#)#-#/#3#7#3#f#y#f#u#u#N#u# $~$~$&$~$7$8$o$F$A$F$X$*%X$X$A%4%r%r%r%R%@&'&+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+&)*)=)-);)>)R',)D'')))J,l'l'0,n'H,!,X'!)p'~){)H']),'''^)W,+)x-#)/)M'()!'1>O'R>[=[=-=&=.= =G*G*w*x*g*f*7*7*}*~* * *P&G&y&r&t;e&n&7&|&_&&&)&*&T%C%N%m%+ + + + + + + + + + + + + _)$#W@M@F@y@t@s@|@|@^@/@/@x@W+S+S+C+D+Z#q+s+r+7+2+<+<+'+-+l+.+.+X. +D.w.x.i.h.2.7.+&+.a+^.^.^.W#C V C V C C >.C V 4.C >.4.>.4.V C V 4.V >.>.>.V V C C 4.C [+ ",
-" { { / ] ] { ^ { { { ^ { ] / / ] / { { { ] { / ^ { ^ ^ / { { / ^ _ _ $.!.2.{.c.j.h.h.x.D.P.D.O..+-+'+-+<+<+<+<+7+s+r+J+K+C++@+@X+X+=@=@/@f@s@f@t@E@y@Q@Q@Q@$#W@-#)#4#3#4#5#7#7#I#E#u#%%O#U#@$U#&$~$~$_$o$:)F$F$W$K$_%X$_%4%r%B%L%`&R%<)+ + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+[)})|)1)2)1)R',)3)4)@'5)6)7)0,n'o,8)9)0)p'a){)b)]),'''c)d)X,@)#)e)Z,k,!'1>f)~'[=<=&===`* =[-G*w*n*f*e*7*|*&* * *Z&P&E&r&l&l&f&6&7&|&_&&&)&Z%T%C%E%E%+ + + + + + + + + + + + + _)Q@W@F@F@t@g@t@f@|@^@=@@@@@@@D++@D+J+q+n+y+7+7+7+6+]+]+-+-+.+X.D.D.i.v.h.i.c.c._ ,#+.^.a+^.4.V C C C 4.C C 4.V C C 4.V C V C >.V V V C >.>.>.4.V >.C C 4. ",
-" : ] ] { ^ ] / / ] { { { ^ { ] ] { { ] ^ / / ^ / / { { ^ ] / { ^ _ %.%.{.{.2.2.c.h.w.w.x.D.P.W.X.-+-+'+]+]+]+7+7+n+n+s+q+C+D+D+S+@@-@/@/@|@f@t@g@t@G@U@Q@W@$#l#`@`@/#/#3#3#0#7#f#y#I#u#N#U# $!$@$&$~$y%3$3$A$F$F$K$K$ %4%_%A%k%B%B%B%+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+g)z'h)i)1)j)k)*)l)m)n)o)7)0,p)q)G,r)9)0)s)t){)T,])u)v)w)x)y)},z)C>A)B)!'O'K-l,C)<=)=&= =+=G*G*w*m*b*7*}*~*~*$*2*Z&P&H&s&l&l&n&6&6&y*_&&& &`%T%C%D%D%+ + + + + + + + + + + + + D)Q@Q@F@E@t@f@f@f@=@/@=@X+=@@@S++@D+C+q+s+n+7+2+g+<+]+'+.+.+,*X.P.D.D.V.i.i.c.2.` +.M O+^.C ^.4.>.C C C >.V C V 4.C V >.C C V C C 4.V C C C C >.V C V V Q% ",
-" w%{ ] ^ ^ ] ^ ^ ^ ] { ] { { / { / / ] { ^ { / ] ^ / ] / ] / { ^ J %._ !.{.7.l.2.i.i.v.i.D.W.D.W.X..+-+'+2+6+<+7+y+s+r+C+C+C++@D+W+x@=@=@^@|@g@f@t@t@F@M@Q@r#W@`@E))#/#/#4#3#f#f#t#y#u#u#N#U#U#U#@$~$7$h$7$3$F$F$W$F$K$X$X$4%4%4%r%B%+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+x'F)})G)|)H)A'g'I)F'J)I,0,K)n'G,L)M)N)O)s)P)Q)R)S)T)U)4'V)Q-W)X)Z,-,N'1>O'Y)[=[=<=&=%=+=+=G*v*u*k*b*b*}*#*&*2* *Z&P&y&r&l&l&j&f&|&_&_&!&*&=&T%M%D%H%+ + + + + + + + + + + + + Z)Q@M@Q@y@s@s@s@|@^@r@@@@@@@X+D+C+J+s+s+x+7+7+g+7+]+:+:+'+.+.+X.D.D.i.i.j.i.h.2.F.M M a+^.^.>.4.C C C V V >.C 4.V C >.4.C V C >.4.C >.4.>.C C >.C >.4.V w% ",
-" ] { ] { / ] { ] ^ { ] ^ { ^ { ] ^ ] ] ^ { { { ] { ^ ] ] / ^ / { _ _ !.!.2.!.2.2.h.v.V.D.D. +X..+.+'+'+]+<+e+7+n+n+y+q+C+C+D+X+S+-@@@/@|@/@f@g@s@t@t@F@M@Q@$#W@$#)#)#}#4#3#7#7#I#y#y#V$u#O#U#!$@$~$7$_$3$o$A$F$(%!%K$K$_%_%4%4%A%3$+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+c'`)F)z' !.!+!@!m)#!$!0,%!&!G,*!=!9)-!;!~)>!b),!u)'! ))!V))'W)!!~!`,{!1>]!^!8'<=<=&=.=T*G*G*u*l*f*b*7*7*!*&* * *P&E&E&r&l&l&n&6&7&_&8&!&`%T%C%C%G%m%+ + + + + + + + + + + + + Z)F@y@y@y@t@f@|@=@6@=@=@W+@@W+D+C+K+J+7+y+7+2+2+]+:+'+-+-+.+X.O.D.x.D.i.i.c.r.{.u++.+.^.^.>.>.C V C C C >.>.4.>.>.4.4.V >.C 4.V V >.4.>.V >.4.>.4.C V V ",
-" ]'{ / { { ] / { { ^ ^ ] ^ { { { { ] ^ ] ^ { / / ^ ^ ^ ^ ^ { ^ _ ^ _ %.%.{.l.c.c.c.w.w.D.D.D..+-+-+-+-+]+2+g+7+x+s+n+r+K+K+C+D+X+S+=@@@=@^@f@|@f@t@t@F@Q@W@W@$#)#$#/#/#/#4#a#f#f#T#y#u#E#u#U#+$ $+$~$h$7$A$_$A$F$W$!%W$X$_%4%4%A%4$+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+/!x'(!_!:!<![!}!|!1!K)&!q)2!3!4!!);!5!P){)R)6!u)v)7!8!X,},9!0!~!a!!'1>b!c!<=^=&= =%=S*G*w*x*x*b*7*-;}*#*~*o*Z&R&H&I&s&m&j&n&|&|&2&_&`%`%*&O%F%E%n%+ + + + + + + + + + + + + d!F@U@E@t@f@g@7@f@r@=@@@W+S++@D+C+s+y+y+7+7+7+<+<+'+'+-+-+.+ +P.D.x.x.i.j.c.c.{.U +.M ^.^.^.>.4.>.C 4.4.C V V V C 4.4.V 4.C >.V C C C >.V C C C C 4.C e! ",
-" j%] ^ ] { ] { { { { / { / ^ { / { ] { ^ { ] / ] { ] ^ { { ^ { ^ _ _ ~._ {.{.c.2.h.h.w.D.D.W.D. +X.-+'+:+<+<+2+2+o+o+q+s+q++@D+S+@@@@@@r@=@f@f@f@t@t@F@U@F@W@`@`@)#-#/#/#4#3#s#f#f#)$u#V$O#N#O#@$ $@$~$h$_$_$o$o$A$K$K$X$X$X$_%4%b#+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+f!g!h!/!i!}!j!f!&!&!H,q)L)r)k!!)l!s)~)>!b)`'m!n!o!J'p!X,q!r!s!t!u!{!O'c!v!<=<=&=`*+=1=G*x=x=k*k*7*}*|*%* *Z&Z&R&y&r&r&m&j&6&c&_&2&_&*& &T%T%O%E%m%+ + + + + + + + + + + + + d!E@F@t@t@s@|@f@^@=@=@@@S++@D+e@C+s+s+q+7+7+2+]+'+:+-+'+-+.+X.D.D.x.i.i.c.c.c._ +.M ^.[.^.V V C C 4.V C V >.C C >.4.>.C >.V V V C C C V V >.4.>.C >.V 2# ",
-" 3%^ { ] { ] { ] { ] / ] ^ / ^ ] ^ ^ ] / ^ ^ { ] / ] ] { ^ { ^ ^ ^ _ _ {.{.2.2.c.h.w.D.D.D.D..+$+$+'+<+:+<+<+e+7+7+s+q+C+C+C+D+X+@@=@=@=@/@|@f@f@t@y@Q@Q@Q@Q@W@-#`@/#/#/#4#3#7#7#y#y#I#O#U#U#U# $~$~$7$7$8$3$o$F$K$W$X$_%c%_%A% #+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+w!x!y!b'b'z!K)x!2!2!2!A!=!B!C!l!s)~)>!D!R)E!F!v)c)W,V))'G!0!A)H!!'{!Y)Y)~'<=^=`*.=T*S*G*u*v*b*7*7*}*%*2* *Z&P&R&y&r&l&l&e&d&|&_&&&%&~&=&C%C%G%n%e%+ + + + + + + + + + + + + I!E@t@t@t@9*f@|@6@=@@@@@*@D+C+s+C+q+r+q+7+2+e+<+<+-+'+$+X.X..+D.D.i.h.v.c.C.c.3 M [.^.^.C V V 4.C V C >.V 4.V V V V >.V C C C 4.4.C V 4.C 4.>.C C >.0% ",
-" J!] / { ^ { { { { { { { ^ ^ ^ { { / { / ] ^ ] ] ^ { { ] { ^ { ^ _ _ {.{.{.l.c.c.h.i.w.D.D..+W.-+.+-+'+]+]+f+g+7+7+y+y+C+C+D++@X+X+X+@@r@=@f@q#q#s@y@M@Q@Q@Q@W@`@`@)#/#4#4#3#7#f#f#f#u#E#O#N#O# $ $~$~$3$7$3$_$F$F$F$!%!%W$X$_%K!+ + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+N)L!w!M!N!O!L)L)A!=!k!B!P!Q!R!s)P){)S!T!U!V!U)W!X!Y!G!Z!`! ~B).~.~c!+~<=<=%-%=T*S*G*w*v*n*b*c*}*|*~*$* *Z&P&G&S&r&l&t&j&c&|&_&)&&&`%T%C%M%F%n%m%+ + + + + + + + + + + + + + F@t@f@9*f@7@6@|@=@@@@@X+S+D+D+C+s+7+y+7+g+6+]+'+]+-+.+X.X.X.D.x.w.i.h.2.c.c.S O+[.^.^.^.C >.C C >.>.C C 4.4.>.C C C V C C C C C V >.C V V 4.C V V b. ",
-" ^ { ] ] ^ / ] { ^ / { { { ] ] ] { { / ] ^ { ] { ^ { ] { { { { ^ _ !.~.!.2.2.2.h.w.h.K.D.D.X..+.+-+-+:+]+6+f+2+7+x+n+s+K+D+D+D+X+W+=@=@/@^@f@s@g@s@y@F@M@F@l#W@`@`@`@)#4#4#7#f#f#f#u#u#E#N#N#U#U#U#&$7$~$3$3$_$A$F$F$W$/&X$_%+ + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+@~C!C!C!#~#~#~#~#~#~C!$~;!%~s)&~*~=~-~;~>~,~W!8!'~)~!~e)~~`,{!.~O'{~]~<=^=== =+=G*u*v*m*b*7*7*-;~*~* * *Q&P&z&z&r&l&e&d&6&**_&!&!&*&T%M%M%D%m%e%+ + + + + + + + + + + + + ^~y@s@s@f@f@|@=@=@@@@@X+S+X+D+D+s+n+7+x+7+2+6+]+'+-+'+.+.+X.D.D.D.x.i.h.c.c.c.J*......^.>.C C >.>.>.C C C 4.>.>.V 4.V 4.C C >.4.V V 4.V >.V >.C 4.V ",
-" $%] { ^ / ] / / { ^ { { { / ] { ] ^ ^ ] { ] / { / ] / { ^ ] J =._ _ !.!.{.c.2.h.h.x.w.x.W.X.W.X..+-+'+'+<+<+7+7+7+s+s+C+K+D+9&+@X+W+=@=@6@|@|@t@f@t@F@E@Q@W@Q@`@)#)#/#)#4#3#7#a#f#)$)$u#U#u# $U#!$!$~$~$h$_$3$o$F$A$W$!%X$X$+ + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+/~(~_~:~<~[~C!$~$~Q!}~s)|~1~2~3~4~-~u)5~6~7~8~'~'~9~F,s! ~B).~.~^!0~a~^=,=%=S*S*w*w*w*m*b*7*}*|*~* *3*.*G&H&z&r&r&j&e&6&g&|&3&&&~&Z%T%C%D%D%m%e%+ + + + + + + + + + + + + + t@g@g@f@|@6@r@@@@@X+*@X+D+K+K+q+o+q+7+7+<+6+:+Z+'+-+.+X.D.W.D.w.v.i.h.j.c.2.M +.[.^.>.V C C >.V C V V C C C >.V >.V C C V V C V V V >.V 4.>.V 4.)% ",
-" / ^ ] ] ^ { ^ { { { ^ / ] / { { ] { ^ { { { { ] { { ] ] / { _ _ l !.{.2.2.j.j.h.h.w.w.D.W.D.-+.+-+'+'+]+6+]+7+7+7+q+q+D+K+e@X+S+-@=@=@r@/@|@s@t@t@t@M@Q@Q@Q@l#$#$#/#)#}#4#3#5#f#f#f#I#u#N#U#U# $&$~$~$~$7$_$o$_$A$F$F$K$J#+ + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+&~b~s)/~c~d~R!(~e~R!f~g~h~i~=~j~-~k~T)6~7~l~p!y)m~n~0!o~B)N'.~]!+~~'<=p~%= =T*G*G*w*l*b*b*7*1*1*%* *Z&P&P&E&z&r&l&t&f&7&|&|&_&%&~&T%C%C%D%H%m%g%+ + + + + + + + + + + + + + t@f@q#|@|@=@=@=@x@X+D+D+C+D+s+y+7+7+7+6+]+<+]+'+|+.+$+W.D.D.D.x.i.j.,@c.2.` ..[.^.^.>.C C 4.C >.C V C 4.V C C C V V C C 4.V V V C C 4.>.>.V V V ",
-" U$] ] ] { { ] { ] ] { ] ^ ^ { ] ^ ] ] ^ / { / / ] / ^ ] / { ] _ !._ !.{.2.{.2.i.j.x.w.D.D.{+.+-+.+-+]+]+2+2+7+7+r+s+s+Z#D+D+D+S+S+X+@@/@f@|@|@q#t@t@t@M@M@W@Q@`@`@$#)#/#4#7#3#f#7#E#y#u#u#u#N#q~ $~$&$~$7$8$8$_$o$u$A$F$u&+ + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+r~&~s~s~b~t~b~g~u~r~h~*~4~`'T!k~v~'!7~l~p!w~5'x~0!t!y~a!.~z~A~0~~'^=p~S*S*G*w*w*n*n*b*7*H;}*#*$*Z&Z&P&E&H&s&l&l&e&f&c&|&_&&&%&`%T%T%M%t%m%m%e%+ + + + + + + + + + + + + + s@t@|@f@6@r@=@x@@@X++@C+C+K+s+y+x+7+7+6+2+5@<+'+'+-+ +{+D.D.w.w.h.h.c.2.2.U+^.O+^.^.C C C C C >.C C C V >.4.>.V V C 4.C >.C 4.>.C C V V 4.C 4.H. ",
-" 2#] / { / / ] ] { { { ] ] { ] { { ] { ] / { ] { / ] ^ { / / ^ _ _ _ %.~.{.c.c.h.h.h.h.D.D.W.X.$+.+-+'+Z+<+e+2+7+x+y+q+C+q+D+C+X+W+X+=@=@/@^@|@|@t@D@y@F@Q@Q@Q@l#`@)#)#)#/#4#5#s#f#f#t#)$u#u#N#O#U# $~$~$~$~$3$_$o$u$u$F$B~+ + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+4~D!*~*~i~h~h~h~=~C~S!D~E~k~F~'!G~H~I~8!J~K~L~0!~~t!M~N~z~]!0~a~a~'=.=S*[-w*u*n*l*b*b*7*}*~*&* * *Z&R&E&r&r&l&e&6&d&|&|&)&!&*&`%C%C%D%E%p*e%7%+ + + + + + + + + + + + + + t@q#f@/@=@=@@@@@@@D++@D+C+s+s+s+q+7+7+]+]+:+m+'+l+X. +D.O.D.w.w.h.j.c.7.g.j#+.^.^.>.W#V >.C C 4.V >.C V >.C 4.C V C V V >.C V 4.C V C 4.V V 4.2# ",
-" O~^ ^ ] ^ { { ] { { ^ / ] ] { ^ ^ ] ] ] { ^ { ] ^ ^ ] ^ { ^ _ _ _ _ !.!.{.2.2.h.h.K.V.D.W.X. +-+'+'+'+<+<+6+7+n+y+y+C+q+C+D++@X+X+=@=@=@|@^@f@s@g@t@t@F@Q@W@r#`@l#)#/#W%)#4#s#3#7#f#E#y#u#N#U#u#U# $@$~$~$~$3$_$3$F$A$P~+ + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+D~D~Q~S!S!R~R~R~D~S~E!E!F~T~'!U~V~W~X~Y~Z~!~0!`~t! {u!.~.{0~0~C)^=&=S*S*G*w*w*l*f*b*7*}*}*%*&*$*Z&R&H&z&r&r&l&f&c&7&|&2&3&%& &`%O%G%F%m%m%e%f%+ + + + + + + + + + + + + + t@|@|@/@/@=@@@W+X+S+D+K+s+s+r+y+7+2+<+6+]+Z+'+$+.+X..+{+D.V.V.x%i.2.c.2.=.+...[.^.C ^.>.V C C V C C 4.>.V V 4.V 4.C 4.C V V C C 4.V C >.>.V W ",
-" z$^ ] { ] { { ^ ] / ] ] ^ ^ / { / { / ^ ] ^ ^ ] ] / / ] ] ] { _ _ _ {.{.{.2.2.c.c.h.i.x.D.{+X.$+1+.+'+]+<+6+2+7+y+q+q+s+K+D+S+X+S+W+($r@r@f@|@f@g@t@F@U@Q@Q@W@$#W@)#-#/#/#4#d;7#7#f#y#)$f#u#U#u#U#U#&$~$~$~$h$3$_$_$A$+{+ + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+@{E!#{${#{#{@{E!%{&{v~*{={V~-{;{>{,{'{!~){`~t!H!N~z~!{A~~{a~{{p~`*S*G*w*v*x*l*b*7*7*1*|*&*$*Z&Z&P&z&z&l&l&j&j&d&c&|&&&!&*&`%T%C%C%F%m%e%e%<%+ + + + + + + + + + + + + + f@f@^@r@=@=@X+W++@X+D+s+J+s+q+n+7+7+]+]+'+<+-+$+-+X.D.P.D.D.i.i.h.2.2.7.F.O+M ^.C ^.V V >.4.>.C 4.C >.>.4.>.>.>.4.C V C C 4.>.>.V C V C >.C z$ ",
-" l@] ^ { / ] ] ] / { { ^ ^ ] { ] { ] { { ^ / ] { ^ ] ] ] { ] J _ l #.!.7.c.c.h.i.v.v.V.D.W.{+W.-+-+'+'+<+]+]+7+7+y+q+s+s+D+D+S++@X+-@=@=@6@|@f@g@t@s@t@y@F@Q@Q@$#W@)#)#)#/#4#4#5#s#a#T#f#E#u#E#N#O#.$U#+$~$7$7$8$_$_$+ + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+T~&{]{^{&{/{({]{6~_{G~:{<{[{X~>{}{Z~|{1{`~2{3{u!4{!{5{0~8'a~%=6{S*G*w*w*m*k*g*b*7*}*}*~* *Z&Z&G&H&s&r&l&l&j&c&|&|&2&2&!&`%T%M%N%C%H%H%e%7%8%+ + + + + + + + + + + + + + |@|@/@r@@@@@X+W++@D+Q+C+C+y+r+7+7+g+e+<+'+'+-+'+X.X.O.D.x.w.K.h.c.2.{.!.u+a+S.^.4.C V C >.V >.C C C V C C V >.>.C C V 4.C 4.C >.4.V V >.>.7{ ",
-" n${ { { { / { { ] { ^ ^ ] { / { { ] { ] / ] ^ { ] ^ ] ] ^ _ { _ _ l $.!.l.2.c.r.c.h.V.D.D.X.P.X.-+-+-+'+<+g+f+7+7+s+s+s+K+D++@S+@@S+=@=@=@^@^@f@f@t@t@y@M@F@W@W@$#-#)#`@/#4#'*5#7#7#y#I#t#u#%%N#N#U#.$+$!$&$~$7$8$3$+ + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+:{_{8{_{_{9{9{0{a{b{;{X~p!Y~c{Z~9~1{d{`~e{3{N~4{!{f{~{8'{{p~6{T*G*w*w*n*n*g*7*7*7*1*&*$*Z&Z&P&G&F&z&r&r&f&j&6&|&_&_&&&&&`%T%M%F%G%H%p*7%7%]%+ + + + + + + + + + + + + + |@7@f@=@=@S+@@S+D++@C+s+s+r+7+7+2+<+]+]+:+-+-+$+ +X.W.D.w.D.i.c.C.{.{.!.G.[.^.>.B 4.C C C C 4.C 4.V 4.C C V V >.V V C V C V C V C C V V 4.n$ ",
-" w+{ ^ ] { { ] ^ ] / ] ^ { ] ] ] { ] { ] ] { ^ { ] { ] ] { { _ _ %.!.{.2.2.2.c.i.h.w.D.D.D. +.+-+-+:+]+]+]+e+7+7+q+y+s+s+D+D+D+S+W+=@@@=@=@/@|@f@t@t@t@y@F@W@Q@W@$#`@)#)#)#4#4#f#4#f#f#T#E#u#E#N#u#U#U#+$~$&$7$7$f#+ + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+g{h{h{h{i{j{j{;{p!p!Y~c{k{9~l{d{m{t!H!n{N~4{!{]!o{~'{{{{%=S*G*G*w*n*m*f*7*7*7*}*1*#*Z& *Z&P&E&S&r&l&t&f&n&g&|&|&&& &`%T%T%O%M%H%:&e%7%6%[%+ + + + + + + + + + + + + + ^@=@/@@@@@X+X+9&C+s+C+s+x+n+7+2+2+<+'+'+'+1+X.X.P.O.P.x.x.v.i.h.2.c.2./ a+^.^.^.^.>.4.>.4.V C V 4.C V C >.>.>.C C C >.C V >.C C >.C >.V p{ ",
-" =#{ ] { { / { / ] / ] { { / ^ ^ / / ^ { ^ ^ { ] { { { ] ^ ] _ ^ l _ %.{.2.2.2.i.v.V.D.D.D.X.{+-+$+-+]+]+<+e+2+7+n+y+s+q+C+D+D+*@+@X+@@=@=@/@7@f@f@t@y@E@F@M@W@Q@r#$#-#/#/#4#4#4#a#7#7#f#f#I#E#N#N#N# $U#@$~$~$~$J$+ + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+q{r{X~X~>{>{>{c{c{c{s{!~!~1{){t{u{n{v{4{w{x{y{y{a~{{z{%=+=S*w*w*u*n*f*b*7*7*|*}* *$*Z&Z&Z&G&E&r&r&t&e&d&7&**_&3&2&*& &T%C%F%E%H%e%g%f%<%-%+ + + + + + + + + + + + + + =@/@r@@@X+@@S+D+C+q+s+s+o+n+7+g+g+]+]+m+'+-+$+.+W.D.D.D.x.v.j.r.c.2.!.U+..^.>.^.V C V C 4.C >.C V C V C V >.V V V >.C V C C >.C >.V C >.'# ",
-" _.] { ] ^ { / { { ^ ^ ^ { { / / ] ] ] ^ ^ { ] ^ ] { { { / ^ ^ _ %.l !.{.c.,@j.h.i.i.x.O.D.D.X.-+.+'+'+<+<+<+2+y+7+x+s+s+C+C+D+S+X+@@=@=@/@/@/@f@f@t@t@F@t@F@Q@Q@W@`@-#)#-#/#4#4#4#5#f#f#E#E#I#O#O#U#U#!$ $@$&$^*+ + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+k{A{B{C{C{C{C{D{x~E{E{F{`~G{H{3{I{v{w{J{]!y{y{K{z{z{L{1=G*v*u*v*n*b*7*b*7*-;}*~* *3*.*P&H&y&r&s&t&l&e&c&7&|&_&_&)&~&*&{*C%F%D%e%e%M{f%[%-%+ + + + + + + + + + + + + + /@=@@@@@@@S+D+C+D+D+y+q+q+x+7+<+]+]+'+'+'+.+.+X. +W.w.h.i.h.c.c.{.{.!.,#O+^.>.^.C 4.C V C V C C C C 4.C >.4.C C >.V V >.C C >.C >.C >.N{ ",
-" ^ { ] / ] / ] { { ] { ] ] { { ] ] { / / ] / ] { ^ / ^ { ^ { _ _ _ #.g$l.2.i.i.h.x.x.D.O.W. +$+-+'+:+<+5@<+<+7+x+y+r+s+C+C+S+D+D+@@W+@@=@^@|@f@f@t@y@t@E@Q@F@Q@Q@$#W@)#)#)#)#4#7#5#7#7#f#u#t#u#u#N#N#O#U#@$ $g#+ + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+O{l{P{Q{O{R{R{F{S{t{T{U{u{3{V{I{I{w{J{5{W{W{C)z{X{%=1=w*G*w*n*m*g*g*e*H;7*&*%* * *Z&R&G&H&H&r&r&j&f&f&c&|&_&&&&&)&`%T%C%F%G%m%e%7%8%<%[%-%+ + + + + + + + + + + + + + /@@@S+S+W+S+D+C+C+s+n+q+s+7+g+2+<+:+'+-+$+X.W.X.D.D.w.v.i.h.i.c.{.{.=.O+[.^.$$C 4.4.C >.4.V V C C >.C 4.C C V C C V >.C C V V V >.V V ",
-" Y{{ / / { ] ^ { { ^ ^ ^ { ^ / { ] { ^ ] { / { { { { { ] ] J _ _ _ #.%.{.c.2.j.h.h.D.x.D.P.X.X.$+-+'+]+<+<+f+7+7+o+r+s+q+s+D+D+S+S+X+=@^@|@f@f@|@f@g@t@G@y@M@Q@W@Q@$#`@`@`@4#/#}#5#f#7#f#f#u#u#E#u#E#U#U# $+$Z{+ + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+`{ ].]+] ].]u{@]U{3{n{n{#]I{$]J{J{!{y{W{W{z{%]&]p~G*w*w*u*x*m*l*f*7*}*}*%*~*2*$*Z&Z&R&H&y&r&*]l&m&c&7&**|&_&&&%&*&`%T%C%G%n%H%e%7%6%]%[%+ + + + + + + + + + + + + + + =@=@W+X+T@D+D+Q+q+s+q+y+7+g+g+6+]+]+'+-+1+.+{+O.D.D.x.h.i.2.c.c.2.!.-.^.^.^.C C >.C C >.V C V C 4.C V 4.>.C >.V C 4.C V V V >.V C >.=] ",
-" 3 / ] / { { { { { ] { ] { ^ ] / ^ { ^ ^ / { ] ^ { ] { { { _ _ #.%.!.2.2.2.c.c.i.i.D.w.D..+X.-+-+'+'+<+]+]+6+e+7+y+s+q+s+C+D+S+W+X+=@=@/@6@|@|@|@f@t@t@t@y@Q@Q@Q@W@l#$#)#)#)#4#3#3#s#0#7#y#y#E#E#J#u#U#U#U#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+-];]H{H{-]>],]#]#]#]$]I{$]']J{!{y{)]!]<=^=%]~]L{G*w*w*l*n*n*f*f*7*}*|*#*~* * *Z&Q&Z&H&S&r&l&l&j&f&7&|&|&|&2&&& &`%C%C%D%F%n%m%e%f%[%[%-%+ + + + + + + + + + + + + + + =@=@@@S+D+D+C+s+q+q+r+7+7+<+7+<+'+'+'+.+$+W.D.W.D.i.i.h.h.,@2.2.{.!.+&^.^.>.>.>.4.4.C V >.V V >.4.>.V 4.V V V 4.C >.V C C V C C C ,$ ",
-" `#^ ^ { ] / ] { / ^ / ^ ^ { { ] { ^ { { { / ^ / { { ] ] ^ ^ ^ ~.%.!.{.2.2.c.C.h.i.i.D.D.X.D.X.-+.+'+]+:+<+g+7+7+7+y+q+J+C+C+C+S+@@X+x@=@=@=@^@f@f@t@t@t@t@y@Q@W@W@Q@$#`@.&)#/#/#4#4#5#7#f#f#y#E#E#u#u#O#*-+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+{]]]^]]]/]/]]](]_](]_]J{f{!{:]W{W{!]%]p~L{L{P=w*w*x*x*g*b*b*d*7*}*}*!*~* *Z& *Z&F&R&y&r&r&t&j&e&6&c&|&_&3&)&*&`%T%T%M%F%H%e%e%7%[%<%-%-%+ + + + + + + + + + + + + + + @@=@*@T@D+D+s+s+y+s+n+7+7+2+]+'+:+'+1+.+W.X.X.D.D.V.x.h.j.c.2.{.!._ a+^.C C 4.V C >.C >.C C V 4.>.V 4.4.>.C C C C V V >.C C C C 4.= ",
-" =+] { ] ^ ] ] ] { ^ ^ ] ] ] { { { ^ ] ] { { ] ] ] { / { / ^ _ $.!.!.~.{.c.2.c.i.x.i.D.W.X..+.+-+1+-+<+<+]+]+7+7+n+q+q+s+K+D+S+S+@@@@@@=@=@|@f@|@f@g@s@t@U@G@Q@$#Q@W@-#`@)#)#/#4#5#5#7#3#f#y#I#y#u#E#u#-#+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+']']<][][][][]}]x{!{x{|]1]!]W{a~X{%]L{~]2]G*w*w*n*n*l*g*e*b*H;}*}*|*~* * *Z&Q&G&y&z&s&r&m&t&e&f&c&|&_&_&!&%& &`%T%O%E%G%H%e%7%8%]%[%{%@%+ + + + + + + + + + + + + + + x@S+D++@D+C+J+q+r+x+7+7+7+2+<+'+'+'+-+-+X.X.X.D.D.i.w.i.2.c.c.!.!.K a+>.^.>.V V C V V C >.4.>.4.C 4.V 4.>.4.>.V C >.V C 4.C C 4.W ",
-" { { { ^ { { ] / { { { / ^ ] { ^ { { { / { ] { { / ] ^ { ^ _ ~.%.!.!.7.2.h.,@h.w.i.D.D.D.O.X.X.'+-+<+'+6+<+2+7+7+q+s+3]C+J+D+D+X+W+=@=@r@r@7@^@f@f@t@D@y@t@y@Q@Q@Q@W@$#`@-#/#/#/#4#5#4#f#7#f#)$u#E#u#4]+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+5]:]6]5]:]6]5]5]|]5]7]8]9]0]&]~]p~L{a]P=w*w*m*x*k*l*b*b*7*1*-;#*#*%* * *Z&Q&P&P&y&r&r&l&l&j&7&6&|&_&_&&&%&`%~&T%C%E%m%H%e%e%7%]%[%-%-%@%+ + + + + + + + + + + + + + b]X+S+9&D+D+C+q+y+n+n+7+2+6+'+'+]+-+.+.+.+.+O.D.D.i.h.i.i.2.g.g.{.~.;.^.^.^.C C V C >.V C C 4.>.V C V 4.C >.V C C V 4.>.V V >.>.V ",
-" c]{ ] ] ] { { { ] { / ^ ] ] { { ] / ^ ] { / { ] { { { { / _ _ _ {.{.!.7.2.r.j.i.i.w.D.D.W.X.W.-+-+'+'+]+<+6+g+7+y+o+q+C+s+D+D++@S+X+@@=@=@=@|@f@f@f@t@y@t@E@M@Q@r#l#$#`@)#)#)#)#3#5#s#7#3#f#f#)$)$u#d]+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+!]~{!]W{~{W{0]a~0]a~&]e]f]L{L{L{L{P=w*v*x*m*l*f*f*7*7*7*}*|*%*&*~* *$*Z&P&P&H&y&r&l&l&t&m&6&c&c&_&2&&&!&`% &T%C%M%D%t%n%e%7%6%]%[%-%.%+ + + + + + + + + + + + + + + g]S+S++@s+D+s+q+7+7+7+7+7+6+5@'+:+.+.+.+X.O.P.w.V.i.h.c.h.c.2.2.{.=.^.[.>.>.V >.C V 4.C C >.C C C V C V V 4.V C C C V 4.C 4.>.C Q# ",
-" #.^ { { { ^ { ^ / { ] ] { { ] { ] { ] ] ] ^ ^ ^ / { { ^ J { l _ !.{.2.7.c.c.i.D.w.D.W.W.W..+.+.+-+-+'+2+<+2+7+7+y+n+q+J+C+s+D+X+X+@@X+V#=@=@f@|@f@t@t@t@E@t@Q@Q@W@W@$#$#`@)#)#}#4#4#5#3#a#f#y#I#T#h]+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+&]&]&]&]&]&]i]&]&]&]L{L{2]2]j]P=P=x*x*l*n*g*g*e*b*7*}*H;|*%*~*%* *Z&.*G&F&z&r&I&r&r&j&t&j&7&|&|&_&_&!&~&T% &C%N%C%G%m%e%7%7%f%=%-%-%Z$+ + + + + + + + + + + + + + + k]S+D+D+C+Z#r+s+q+7+2+]+]+:+'+m+'+X.X..+D.{+D.w.v.i.h.i.2.2.2.{.!.T ^.^.W#C V C V V C C >.C C >.>.V V C V C 4.>.C >.C 4.C V V a+ ",
-" C#{ ] ^ / ^ ] / ] / / { ] { { ] / ] { / ^ { ] ] { ] ] / / _ _ _ $.!.{.2.2.j.c.v.w.D.D.D.{+.+W.-+-+'+]+<+2+<+7+2+7+r+s+q+C+C+C+S+S+X+-@=@=@=@7@f@f@f@t@t@t@E@F@Q@Q@W@`@`@$#)#)#)#)#/#4#4#7#3#f#f#E#O&+ + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+~]i]~]i]2]l]2]2]2]2]2]P=[-U*m]l*x*l*g*b*b*f*g*7*}*1*!*~*%*%* * *Z&Z&P&P&y&z&z&S&r&m&j&f&7&c&g&_&_&)&!&`%Z%C%O%O%D%m%e%7%e%7%]%=%@%@%+ + + + + + + + + + + + + + + + /*+@D+C+s+q+n+r+x+7+6+6+6+:+m+-+'+.+W.W.D.D.D.D.i.i.c.c.2.2.7.!.l ~=^.^.C V V C C >.>.C C C C C C V >.>.>.V C V C V C C V C C G# ",
-" n]^ ^ / { ] { ^ / / { / { / { ] ] ] ^ ^ ] { ] ^ { { ] ] ^ _ _ %.!.~.!.2.2.c.i.w.v.x.D.D.D. +X.1+-+-+]+]+<+2+7+7+7+o+x+s+K+C+S+D+X+S+X+X+/@^@|@|@f@s@s@y@t@t@F@F@a%l#Q@$#)#-#/#)#/#4#4#4#7#0#7#7#+ + + + + + + + + G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+w*G*U*o]w*o]U*o]o]o]o]w*m*m*m*f*b*b*b*7*7*7*-;}*1*|*#*&* * *2*Z&L-R&F&y&S&r&l&l&l&e&d&c&**|&_&_&%&!&*&T%T%M%M%E%t%m%e%8%7%[%[%p]|%#%+ + + + + + + + + + + + + + + + L#+@C+s+q+r+x+o+7+7+7+2+<+'+'+1+-+.+.+{+P.D.D.i.h.h.c.c.2.2.~.~.( ^.^.>.>.C V C >.4.>.C >.>.>.>.V V >.>.C V C C 4.>.C V V V B# ",
-" q]{ / ] ^ { { / ] { ^ ] { { ^ ] { ^ { / { / { ^ { / ] _ _ _ _ %.!.{.3.2.c.h.h.x.v.V.D.X. + +$+$+'+-+:+<+]+7+7+7+7+s+q+s+K+D+D++@X+@@@@@@=@=@7@^@f@g@f@t@t@t@F@Q@Q@Q@W@$#-#-#)#)#/#/#/#7#4#a#)#+ + + + + + + + r]G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+s]x*t]u]t]s]o]t]s]b*k*b*b*k*7*b*7*7*7*|*H;H;|*%*&*&*&*2* *Z&Z&G&P&z&E&H&r&r&m&l&j&7&6&c&|&_&)&)&`%&& &T%C%O%F%F%m%e%e%8%8%<%-%@%+%Y$+ + + + + + + + + + + + + + + + D+C+C+C+s+o+n+7+7+6+<+2+<+m+1+-+X..+ +O.D.x.V.v.h.h.c.{.{.!.l %.j#^.V >.4.V C C >.4.C C C 4.>.V V 4.C C C V V C C V V V 4.v] ",
-" p#] ] { { / ] / ^ ^ ] { / ] ^ { ^ { ] ^ ^ { { { { { ^ { / ^ l !._ ~.!.7.c.r.h.h.w.x.D.W.X..+.+.+-+'+'+:+<+<+7+7+x+y+s+J+s+D+D+D+S+X+X+@@=@/@/@|@f@|@g@t@y@t@E@F@M@Q@W@$#$#l#`@)#/#)#/#3#3#7#w]+ + + + + + + + x]G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+b*b*7*b*b*f*b*b*b*b*c*7*f*b*7*|*}*}*}*}*%*|*%*#*~* *2*Z&Z&Z&P&R&z&z&r&r&l&r&i=j&n&7&g&|&_&3&_&&& &=&T%C%G%C%E%m%m%M{7%6%-%{%@%@%#%y]+ + + + + + + + + + + + + + + + K+s+C+s+n+x+7+7+7+<+<+]+'+'+'+.+.+X.D.P.x.V.h.v.j.j.c.{.{.%.~.=.^.^.>.$$4.C C 4.>.V V C C V C 4.4.V 4.4.C V 4.C V 4.4.V >.k# ",
-" b.{ ^ ] { { ] { ^ { { ^ ^ / { ^ ] / ] { / ^ { ^ ^ { { ] _ _ _ !.{.!.7.c.c.h.j.i.D.D.D.P.W.O.X.$+|+'+'+2+]+g+e+7+7+7+q+s+s+D+C++@X+W+S+x@=@=@7@7@/@f@g@g@s@t@F@E@F@F@Q@W@$#$#)#`@-#/#/#4#4#U%+ + + + + + + z]A]G+G+G+G+G+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+7*7*7*7*7*7*7*7*7*7*}*}*7*|*1*1*~*1*1*&*&* *&*2* *Z&Z&.*G&P&E&H&E&S&r&l&l&j&f&n&6&d&|&1&_&%&)&`%T%Z%C%C%M%E%m%e%e%7%8%]%[%-%|%#%Z$B]C]+ + + + + + + + + + + + + + ^~D+C+C+q+y+x+7+2+<+]+'+]+'+-+-+.+X.W.D.D.D.v.i.h.,@2.l.{.!.%.l D]^.^.4.4.>.V C >.>.V V C C C >.C V C C 4.C C C >.C V V C b. ",
-" $ ] ] { ] { ] ] ] / { { ] ] { ] { ] ] ^ { / ^ { ] { { { _ ^ _ ~.{.{.2.l.2.h.h.h.w.w.D.D.W.X.$+-+-+'+'+<+]+]+e+7+n+s+q+s+s+K++@+@S+W+W+@@=@/@^@/@r@g@t@t@t@t@F@F@Q@Q@Q@$#$#$#6#)#^#/#)#D#E]+ + + + + + + F]`%G+G+G+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+}*|*|*!*}*}*}*|*|*}*}*}*}*|*~*&*#*%*~*&*2* *Z&Z&Z&Z&P&P&H&z&z&I&S&r&t&m&e&7&f&****|&J&&&)&&&`%T%T%C%M%M%G%E%e%e%8%8%[%-%-%@%.%Y$M$P$G]+ + + + + + + + + + + + + + H]K+q+q+s+7+y+<+6+2+<+]+-+'+1+.+X.{+D.D.D.i.h.i.c.i.c.2.{.{.!.#.+.^.>.C C C >.4.C C C V C V V C C 4.>.C 4.C V V V C 4.V I] ",
-" { ^ ] { ^ ] { ] { ] ^ { { { ^ / { { ^ { ^ ^ ] / / ] { J _ _ l $.{.2.2.c.j.j.i.x.w.w.D.P.X..+.+'+-+-+'+<+2+2+7+n+x+o+s+s+Z#D+D++@D+W+x@X+=@/@=@/@f@|@s@g@g@t@t@U@Q@Q@Q@Q@$#W@$#`@/#)#/#J]+ + + + + + + K]T%G+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+&*#*~*#*#*1*&*~*#*}*~*1*&*~*~*$*&* * * *$*Z&L]Z&Z&G&P&F&E&z&z&S&l&r&l&l&f&7&d&c&|&|&_&2&!&)&`%*&T%C%C%G%F%m%H%e%M{7%}%-%-%@%@%+%Z$H$I$P$+ + + + + + + + + + + + + + + q+s+s+q+7+7+g+<+6+:+<+'+.+$+X. +X.P.x.D.w.v.r.i.c.2.{.{.~.%.K >.^.C V C C >.C V 4.C >.C C V V 4.V C V V 4.C 4.V >.C V ",
-" 2#{ / { ^ ] { { { / ^ / { / / { { ^ ] { ] { ^ / ] { ] { J _ _ _ l {.7.7.2.c.h.h.K.K.D.W.W.W..+.+$+-+'+]+]+2+7+7+7+n+s+s+C+s+C+S+S++@@@-@-@=@=@r@^@|@f@s@t@t@y@U@E@M@Q@W@W@Q@$#W@`@-#/#+ + + + + + + + M]T%F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+ *2*~*~*o* *2*2*~*&* * * * *2* *$*Z& *Z&Z&G&G&R&P&R&P&H&H&r&r&r&l&m&j&e&7&c&c&|&_&_&&&%&!&`%=&T%T%D%E%F%H%m%e%7%}%f%<%-%-%+%.%Y$O$C$C$Q$+ + + + + + + + + + + + + + + + s+n+x+7+7+<+6+]+-+-+1+.+X..+O.W.D.w.x.h.j.r.c.2.l.{.l !.l G.>.4.4.4.C 4.C C C V C C C >.V V V >.>.V V V V 4.>.>.C 2# ",
-" [#{ ^ { / ^ ] ] ] / { ^ { / ] ] { ^ / ] / ] ^ { ^ { =.^ _ _ %.l {.{.2.c.c.c.v.h.K.D.D.X. + +.+X.-+'+'+]+2+2+<+7+y+x+s+q+C+D+D+e@X+S+@@=@X+=@r@r@/@f@R#s@g@g@t@y@F@M@Q@Q@r#r#$#`@`@y@+ + + + + + + + N]N%F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+Z&$*Z&Z&O] *Z& *2* * *Z&Z&Z&Z&Q&P&Z&.*.*P&P&R&H&z&y&H&r&r&r&m&l&m&j&7&6&c&|&|&2&2&_&)&*&*&T%T%C%F%O%H%E%H%e%7%}%}%[%-%@%@%+%+%M$O$C$C$v$+ + + + + + + + + + + + + + + + + 7+7+e+<+]+:+-+]+1+-+X..+O.W.D.D.x.h.i.c.C.2.{.{.%.{.l F.^.$$C V C 4.C 4.V C >.C C V C V C >.V C V V C C C V C [# ",
-" ]#^ { ^ / { ^ { ] { ^ / { { ] { ^ ] ^ { ] ^ / { ^ / { J _ $.#.%.%.2.c.C.h.i.h.h.v.x.D.W.W.W..+-+'+Z+]+]+]+2+6+7+7+o+q+s+s+C++@D++@S+X+@@=@=@=@/@|@f@f@g@g@s@t@t@F@Q@F@F@Q@H#W@W@4@+ + + + + + + P]t%F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+P&L-Q&Z&Z&Z&Z&Z&.*Z&Z&Z&Z&Z&Z&Z&Z&P&F&R&P&y&z&H&r&z&I&l&l&l&m&e&j&j&6&d&g&|&_&2&!&!&)&`%T%T%T%O%C%F%E%m%Q]e%7%7%}%<%=%@%@%.%#%M$C$C$R]v$r$+ + + + + + + + + + + + + + + + + + 2+2+]+<+'+'+-+.+.+.+X.D.D.v.x.i.h.h.2.c.2.{.!.%.$._ j#>.>.>.C V C 4.C >.V >.C >.C C >.C V >.>.C >.C C V C <# ",
-" )./ ^ ] { ] { ] { ^ ] ] ^ { / { ] { { { ] ] { ] { { =._ _ _ l l !.2.7.c.h.i.h.i.D.D.D.{+X.X.X..+'+-+]+6+2+7+7+7+n+q+s+s+s+s+C++@S+D+@@=@=@@@=@/@f@|@f@f@s@g@t@t@E@y@E@Q@Q@W@Q@i++ + + + + + + S]m%F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+y&P&R&P&F&G&P&Z&Z&G&G&L-P&F&F&P&G&F&E&y&E&H&S&z&r&S&l&r&l&l&j&e&e&n&6&|&**_&_&_&_&&&~& &=&T%T%O%M%F%m%n%m%e%g%7%<%<%T]@%@%+%+%O$I$I$C$v$w$E$+ + + + + + + + + + + + + + + + + + 2+<+]+]+]+-+1+X..+ +W.D.D.D.i.w.i.i.c.2.{.7.%.%._ ] B B C C >.>.4.C >.C C 4.>.C V V >.V V >.C 4.C V >.C /. ",
-" y { ] ] ] { ^ { / ] { { { { { ] / { { / { / { ] / / { _ _ l !.~.2.2.2.c.j.h.h.x.D.D.D.D.X.X..+1+'+'+'+6+]+7+7+7+7+y+q+J+C+K+C+9&D+X+X+S+=@=@/@r@|@/@f@f@g@s@y@t@t@F@U@Q@W@$#U]+ + + + + + + V]F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+H&H&H&H&R&y&y&z&F&y&H&E&H&E&F&y&z&H&H&H&r&S&S&l&r&l&l&l&l&t&e&f&c&c&**|&_&_&_&2&&&)&`%*&`%T%C%C%N%D%H%H%e%e%e%7%W]W]W]X]Y]+%M$+%O$C$v$Q$v$w$w$Z]+ + + + + + + + + + + + + + + + + <+]+'+)+-+-+.+.+.+D.P.D.D.x.i.i.h.C.c.2.2.{.l _ _ M.>.C C C V C 4.V V C >.>.V >.4.V V 4.>.V V V 4.V C b+ ",
-" =#/ { { { ^ { { { / { ] / ] / { ] { ^ ^ ] ] { { ^ / ^ { _ _ ~.%.!.2.{.2.h.h.w.x.D.w.D.W.D..+X.$+$+-+'+'+<+2+g+7+7+7+q+r+s+C+s+D+C+X+D+W+@@X+@@=@6@=@|@g@f@f@g@t@t@E@y@E@E@Q@`]+ + + + + + + ^F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+r&r&S&r&r&S&r&z&z&z&s&E&z&y&E&r&z&s&r&r&r&r&l&l&l&l&l&l&f&j&f&7&6&**|&|&|&|&3&&&)&!&`%`%T%M%C%M%G%G%m%m%e%e%M{W]W].^.^.^.^+^@^M$O$C$v$v$x$E$j$k$#^+ + + + + + + + + + + + + + + + + ]+]+m+'+'+-+X. +P.W.D.D.v.K.h.j.c.2.{.2.!.#._ _ ] 4.C C 4.V 4.V C V C >.C >.C C 4.V 4.C C >.C >.V C C '# ",
-" ##/ { ^ { ^ ^ ] ^ { ^ ] { ] { { { ^ { { { / { / { { ^ _ _ _ _ {.{.{.c.c.c.i.i.v.i.D.D.D..+.+.+.+-+]+<+6+6+<+g+7+7+7+o+r+s+s+C+D+D+S+@@X+@@=@@@=@^@/@f@f@f@f@t@t@t@t@t@F@Q@+ + + + + + + + $^F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+t&m&l&r&r&r&l&l&l&S&S&r&r&r&l&r&l&l&r&l&m&l&l&j&l&e&j&f&6&j&7&**h*c&|&_&_&_&!&&&%&`%*&Z%T%T%{*F%D%G%m%:&m%e%W]W]W]W].^.^.^.^.^W]W]W]W]v$w$w$k$a$a$%^+ + + + + + + + + + + + + + + + + + '+'+'+-+.+.+P.{+W.x.x.v.v.i.h.2.2.2.!.{.%._ _ T >.C V C C >.C C 4.C >.V C C 4.C 4.V V 4.V >.4.C 4.&^ ",
-" Z@/ { ] { ^ { ^ ^ ^ ] / { { { ^ ^ { ] ] { ] ^ ^ ] ^ ^ _ _ $.!.!.{.l.c.2.j.h.h.h.D.D.W.W..+X.X..+'+'+'+]+]+6+7+7+7+r+q+y+s+C+s+C+C++@X+X+@@X+@@@@/@r@=@f@f@g@f@s@s@E@t@S>+ + + + + + + + ]%F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+j&j&j&t&t&m&t&t&l&l&l&l&l&l&l&m&t&j&m&l&j&l&e&e&j&j&f&d&7&|&c&h*|&**_&_&_&&&)&!&%&*&`%T%T%C%C%E%G%G%H%m%e%W]W]W]W]W].^.^.^.^.^.^.^W]W]W]W]*^s$a$a$=^&#+ + + + + + + + + + + + + + + + + + '+'+'+$+X.O.W.D.D.w.K.h.h.i.h.2.7.%.%.%.~._ ] >.>.C >.V 4.V V C >.C C V C C C 4.V V C C 4.C C C -^ ",
-" '$^ ] { ] { { / ] / { ] / { ^ { ] ] { / ^ ] ^ / ^ / ^ _ $._ _ ~.7.!.c.c.i.h.i.x.i.D.W.O.X..+.+.+'+'+<+:+2+7+7+7+7+7+7+s+s+s+C+C+9&X+@@W+W+@@=@/@=@|@^@|@f@|@f@t@s@t@R=+ + + + + + + ;^-%F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+c&n&6&j&n&7&f&f&n&n&f&t&f&j&m&f&j&f&j&e&f&7&e&c&d&c&g&6&|&|&|&|&|&_&_&_&3&%&*&%&`%T%=&T%T%M%M%E%D%G%m%e%W]W]W]W]W]W].^.^.^.^.^.^>^>^>^W]W]W]W],^'^)^!^+ + + + + + + + + + + + + + + + + + + + .+.+.+X. +D.D.x.i.i.i.i.h.2.{.{.{.#.l #.=.T C >.C V >.C 4.C C 4.C >.V C V C 4.>.C V C C C V !+ ",
-" ~^] / { ^ { { ^ ] ] ] { / { ^ ] { ^ ] ^ ] / { ] ] { _ _ _ %.!.2.7.l.2.c.c.h.i.i.D.D.D.D.X.X..+'+.+<+]+<+2+g+<+7+7+y+s+7+s+s+K+D+D+D+X+W+@@@@=@=@=@7@/@f@f@t@f@g@g@K&+ + + + + + I={^=%G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+|&|&|&c&|&**|&c&j&c&6&n&7&j&j&e&6&f&c&c&6&d&6&c&c&g&c&|&c&g&|&|&|&2&&&!&%&)&)&`%`%`%T%T%T%C%O%F%E%H%n%]^W]W]W]W]W]W]W].^.^.^.^.^>^>^>^^^>^.^W]W]W].^W]W]+ + + + + + + + + + + + + + + + + + + + + .+.+W.O.D.D.D.i.i.v.c.i.2.2.{.d+{.!.%._ ] 4.>.V C >.C C V V V >.4.V C V >.4.>.V V C C C 4.O ",
-" u.{ ] ] ^ ] ^ ^ ] { { { ^ / ] ] ^ { ] / / { ] / ` J J _ _ !.$.7.2.2.2.h.h.w.i.V.D.D.D.X..+X.-+-+-+'+]+<+6+2+<+7+7+n+o+s+q+J+q+C+D+D+X+X+@@@@=@=@=@/@6@^@f@f@f@t@/^+ + + + + + (^_^@%G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+_&2&_&J&|&|&|&g&|&**|&|&|&6&g&c&7&c&c&**g&6&c&**|&|&|&|&|&|&J&2&_&3&2&&&&&)&`%=&`% &T%C%{*C%F%G%G%H%:^W]W]W]W]W]W]W]W]W]W].^.^>^>^>^>^>^.^>^.^.^W]>^.^W]W]+ + + + + + + + + + + + + + + + + + + + + $+X.D.W.D.w.D.h.c.h.c.c.2.l.!.!.!._ _ =.G.>.>.>.>.4.4.>.>.V V >.>.>.C V C C V >.4.C V C z. ",
-" <^] { ] { { ] ] / ^ { { { ] ] { ^ ^ / { ^ { ] ] { { ^ _ _ !.{.{.2.c.2.c.h.h.w.x.w.O.P.X.W..+-+'+'+'+]+]+]+2+2+2+7+7+7+q+s+s+s+D+D+D+S+X+@@X+@@@@=@=@|@|@/@f@|@+ + + + + + + {^[^}^G+G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+%&&&!&_&&&3&_&2&_&3&|&_&|&_&|&_&|&|&_&|&|&|&_&_&|&|&J&_&|&_&_&2&&&&&!&&&!&~& &T%`%=&T%T%C%C%C%F%G%n%H%W]W]W]W]W]W]W]W].^.^.^W]W]>^>^>^>^>^.^W].^.^>^>^>^.^.^W]W]+ + + + + + + + + + + + + + + + + + + + .+P.D.D.D.D.V.h.h.j.c.2.2.2.~.{.l _ _ f >.>.>.4.>.>.C V >.4.C >.C 4.C C V C >.C >.>.V n, ",
-" d@^ ] { ] { { ] ] / / ^ ] { ^ ^ / { ] ^ { { { ^ { _ _ _ #.%.!.2.2.2.c.c.h.i.i.D.w.D.W.X.X.X.-+'+-+'+'+'+2+2+<+7+7+y+7+q+s+q+s+C+D+e@X+W+W+=@@@=@>$r@r@|@7@f@+ + + + + + + |^{^1^2^G+F+F+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+`%~&`%%&`%%&)&)&!&!&&&2&_&_&_&_&_&_&3&2&_&_&_&_&2&_&&&3&&&)&!&`%`%)&)&`%`%3^T%T%T%M%T%M%M%D%D%E%n%W]W]W]W]W].^.^.^.^.^4^5^6^7^8^9^0^a^b^c^d^e^W]W].^.^.^.^.^.^W]+ + + + + + + + + + + + + + + + + + + + P.O.D.D.w.w.h.h.h.c.c.2.{.!.#._ _ _ _ j#V V V C V V C 4.>.>.>.V V 4.4.V C C 4.V 4.4.W ",
-" f^/ { { ] / { ] ^ { { ] ^ ^ / ^ / ] ] { { { { ^ ^ _ _ l #.{.%.!.{.2.r.c.h.h.V.D.V.P.W.W.O.X.X.-+'+:+-+'+<+6+g+2+7+n+s+r+s+q+s+K+D+D+S+S++@@@=@@@@@=@=@6@s++ + + + + + + + + + g^h^G+F+F+F+F+F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+T%Z%*&`%~&`%*&!&)&)&)&)&)&&&%&)&&&3&%&&&!&)&!&!&&&!&)&!&)&%&`%*&`%Z%T%T%T%T%T%T%C%C%C%E%E%E%m%:^]^W]W]W].^.^.^.^.^i^7^j^k^l^+ + + + + + m^n^o^p^q^W].^.^.^.^.^W]W]W]+ + + + + + + + + + + + + + + + + + O.D.D.V.h.h.i.c.2.2.{.7.{.{.l _ _ ^ K V C C V V 4.V V V V 4.C C C 4.4.V >.C C V V p@ ",
-" l@{ ] ] ] ^ { { ^ { / / ^ { { { ^ ^ ] ] / / ] { ^ _ _ _ %.!.{.7.2.c.r.c.c.h.h.V.w.D.W.O.X..+-+l+-+-+'+]+]+2+2+<+7+n+n+r+s+s+s+C+K+D++@X+X+W+S+x@@@=@=@r^+ + + + + + + + + + + s^t^u^@%F+F+F+F+F+F+F+F+F+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+`%`%`%`%~&&&`%)&!&`%`%`%%&!&!&`%`%T%`%T%`%`%T%T%T%T%O%O%C%C%D%G%H%m%m%m%]^]^W]W]W]W].^.^.^v^w^x^y^W*+ + + + + + + + + + W*m^z^A^B^W].^W]W]W]W]W]W]W]+ + + + + + + + + + + + + + + + + x.w.v.h.c.c.c.2.{.2.~.l _ _ _ { =.O+V V V V C 4.V V C V C V C >.C >.>.V >.C 4.p@ ",
-" O~{ / { ^ ^ { ] ] ^ ] ] { ] { ^ ^ { ] ] ] { { ] { ^ _ %.{.!.%.{.c.2.c.h.h.i.h.D.D.D.W.W. +.+-+-+-+'+'+6+<+2+2+7+7+7+y+s+s+q+s+J+C+D+X+S+X+X+@@@@x@@@E]+ + + + + + + + + + + + C^D^g^E^F^F+F+F+F+F+8%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+T%T%T%*&`%T%=&T%`%=&=& &T%`%Z%T%C%C%T%T%C%O%C%N%F%E%F%H%t%H%e%e%]^W]W]W]W]W].^.^.^G^j^y^W*+ + + + + + + + + + + + + + + + H^I^e^W]W]W]W]W]W]W]W]W]+ + + + + + + + + + + + + + + w.V.v.h.j.c.c.c.{.{.%.!._ _ _ / T V V C 4.>.C C C C C C C V C V >.C >.C V >.W ",
-" x { ] ^ / ] { / { ^ ^ ^ / ] { { { { ] ] { ] ^ ^ _ _ _ %.l !.{.2.2.2.c.c.i.w.x.D.x.D.P.X.O..+-+-+-+'+'+<+]+g+<+2+7+7+x+7+q+s+C+C+D+C+9&+@D+S+@@S+=@J^+ + + + + + + + + ;@+ + + + + + W]W]W]W]W]W]W][%G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+T%T%T%T%T%C%-&T%T%T%T%C%C%C%M%C%N%N%O%E%D%E%E%D%m%n%Q]m%W]W]W]W]W]W]W]W]W]W]i^d^K^W*+ + + + + + + + + + + + + + + + + + + + L^0^W]W]W]W]W]W]W]W]W]+ + + + + + + + + + + + + + w.h.i.i.c.2.l.{.{.!.l %._ _ J S ^.C V V 4.C C 4.C V V >.C >.V V >.V V C C B+ ",
-" _+^ ] / { { { ] { ^ ^ { ^ ] { ] { / ] { ] / { ^ ` _ $._ %.#.{.!.2.2.r.i.h.h.x.x.D.D.D.X..+X.l+'+-+'+]+:+2+<+2+2+7+7+q+y+r+n+J+K+C+D+D++@X++@S+@@+ + + + + + M^5+@@|@f@i++ + + + + W]W]W]W]W]W]W]W]W]G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+M%C%M%O%N%M%C%C%C%C%D%G%O%G%F%G%F%D%n%n%n%m%H%e%:^]^]^W]W]W]W]W]W]W]W]W]W]9^N^y^W*+ + + + + + + + + + + + + + + + + + + + + + m^O^K^P^k^Q^R^W]W]W]W]W]+ + + + + + + + + + + + i.h.r.c.c.2.{.{.!.$._ _ ^ ] _ G.V C V C C C V >.>.V >.V 4.4.C V >.>.C 4.z. ",
-" S^] ] { { { ] { { / { ^ ] / ^ { ] / ] ^ ] ^ { J J _ _ %.~.{.!.{.c.c.c.h.h.K.K.w.D.D.D.X.X..+-+-+'+'+'+-+2+6+e+2+2+7+x+q+o+y+q+C+D+C+D++@D++@X++ T^U^V^@@=@^@/@/@6@^@f@O@+ + + + + W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G+G%G%G%F%E%E%C%G%E%D%D%D%F%G%D%E%D%E%n%:^:^:^:^]^]^W^W]W]W]W]W]W]W]W]W]W]9^+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + W*y^W]W]W]W]W]+ + + + + + + + + + + + h.c.2.2.c.!.!.{.%._ _ ^ / U+C C C C >.V C V >.>.C 4.V V >.V C V >.V }@ ",
-" X^/ ] ] ^ ^ ] { ] { ] ] { { / { { { ^ ^ ^ ] ^ / J _ _ _ $.!.2.7.c.2.c.c.v.i.i.D.D.D.P.D. +-+.+X.-+-+'+:+]+2+2+2+7+7+x+7+n+r+s+s+C+s+D+D++@X+X+X+@@@@W+x@@@=@/@=@|@7@7@Y^+ + + + W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]Z^G+G+G+G+G+m%E%t%H%m%m%m%m%n%D%H%H%m%m%m%:^]^]^W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]B^+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + W]W]W]W]W]+ + + + + + + + + + + c.c.2.2.{.!.!._ _ _ _ _ ] M 4.4.4.V V C 4.C V 4.>.V >.>.C C >.C C `^ ",
-" /{ ^ { { ^ / ] ^ ^ { ^ { ] { { ^ ] { ^ { / { ^ _ _ _ #.%.~.2.2.2.c.h.h.w.h.v.D.D.D.W.P..+W.-+X.-+'+-+m+<+]+<+6+<+7+7+7+n+x+s+./s+s+C+K+D+X+X++@X+X+@@@@=@=@=@=@=@/@/@+ + + + + W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]j^+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + W]W]+ + + + + + + + + + + + + l.2.{.~.~._ %.^ _ ^ / j#V C 4.>.C C >.4.4.>.C C >.>.V 4.4.C C '@ ",
-" .@{ / ^ { { / { ^ { ^ ] ] ^ { ^ { ^ { / ] { ` J _ _ _ !.$.%.{.2.{.2.c.j.h.v.x.w.x.D.W.W..+.+$+.+'+'+'+]+]+:+2+g+<+7+7+y+7+n+q+s+s+C+D+Q+C+D+D++@X+W+X+x@=@=@=@@@=@|@+ + + + + + W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 7.!.!.~.l l _ ^ _ / K V V V C >.>.C >.V C >.V V V C C V V V a' ",
-" J.f ^ / ^ / ^ ] { ^ / { / ^ ] { ^ ] ] / ^ { ^ ^ { ^ _ %.{.%.{.{.{.C.j.c.h.h.h.D.D.W.D.O.X.W..+.+.+$+-+'+]+]+2+7+e+2+7+7+7+s+q+y+s+s+s+D+D+D+D+D+D+S+X+W+S+x@=@@@=@=@+ + + + + W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {.%.$.%._ _ _ ` ^ / ..V C >.V 4.V V 4.C C C C V C V V C V G# ",
-" +/] { { ^ ] { ^ ] / ] { ^ / ] / ^ ] { { ] ] J _ _ l {.#.$.{.c.2.c.c.h.i.w.v.i.D.D.D.W.W.O..+$+$+1+'+'+:+]+]+<+]+7+e+7+7+7+q+q+q+s+C+C+s+D+D+D+S++@D+W+X+x@=@@@=@@@+ + + + + + W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {.!._ _ _ _ ] { j#V C V 4.V 4.V >.C C >.C >.C V 4.>.@/ ",
-" a { ^ / { { ] ] ^ ^ ] / ] { { { { { ^ / ^ ^ ] ^ _ !.l $.{.2.{.2.2.c.c.c.i.D.w.D.D.D. +X.X. +.+-+-+'+m+:+]+]+2+7+<+e+7+7+7+7+q+s+q+q+C+K+C+K+D+C+D+X+*@S+W+W+X+=@W++ + + + + + + + W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ~._ _ ^ ^ ] / s C V V >.4.>.>.V >.V >.V V V 4.V >.#/ ",
-" F / { ] ] { ^ ] ^ { { ^ / / ] ] / ] ] { ^ J { _ _ $.%.l !.7.{.l.2.c.h.i.h.w.w.i.D.D.P.{+ +W.X.X.$+1+'+<+'+'+]+<+2+]+7+7+7+7+7+y+n+q+s+J+s+K+s+C+D+X+D+S+T@S+S+@@@@x@+ + + + + + + + + + + + W]W]W]W]W]W]W]W]W]W]+ W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]W]+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + %._ ^ _ J ^ y S.V >.>.V V C >.4.C >.C V C V C >.Y ",
-" $/F.{ { { { ] / ] { { { / ] { { / ] ^ { / { J _ _ _ ~.l {.!.2.2.2.c.c.i.i.v.x.w.x.D.D.X.X..+.+X.-+-+-+-+]+<+<+2+]+2+<+7+7+7+7+r+o+q+q+s+C+C+D+D+D+9&D+D++@W+X+S+W+@@+ + + + + + + + + + + + + + + + + + + + + + + + W]W]W]W]W]W]+ W]W]W]W]W]W]W]+ W]W]W]W]W]+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ^ J { { / { G.C >.V 4.>.C C C >.V C C >.V C ,$I+ ",
-" %// ] { / ] { / ] { { { { { ^ { ] { ] ] ^ _ _ _ _ !.~.%.{.l.2.2.,@c.i.i.i.i.D.D.D.D.W.X.X.X.$+.+-+.+-+-+:+<+<+6+2+7+7+7+7+7+q+n+n+r+s+J+q+C+K+D+D+D+C+D++@X+@@@@@@W+@@+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _ ^ J { / { L >.V C C C V >.V C >.V V V V 4.&/ ",
-" `.] / / ] ^ { / { ^ ] { { { / ] ] ] ^ ] ^ ^ J _ _ #.l %.{.{.2.2.2.2.j.h.i.V.x.i.D.D.D.W. +X.X..+$+-+'+m+]+'+]+]+f+<+<+7+2+7+7+x+7+7+s+s+s+s+C+q+K+D+D+D+D+D+D+S+T@+@S++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + _ ^ _ ] ^ ^ s V V C V C V >.>.V C C 4.C 4.4.*/ ",
-" k+^ ] { { { ] { ] { { { { ] { / { { { / { { J _ _ !.!.~.!.!.!.7.2.2.h.v.v.v.K.V.D.D.W.D.O. +.+.+1+$+-+-+-+'+]+<+<+]+e+g+<+7+7+7+n+o+n+s+s+q+q+C+K+s+C+C+D+D+C++@S+S+@@+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + J J ] _ ^ { F.a+C >.C V V V V >.V V V C C C p+ ",
-" 2 ] / { ] / ^ ] ] ] { { { ] { { ^ ^ ^ { ^ ^ _ _ %.!.$.{.2.2.l.2.2.,@h.c.w.h.w.D.w.D.P.X.X..+ +X..+'+'+'+]+]+<+'+<+6+2+7+g+7+7+7+y+7+r+y+s+s+q+s+J+C+D+s+D+D+D+D+D+X+T@+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + j.r.2.c.l.2.!.!._ $.%.$._ _ ^ ] ] ^ ] +.V V C 4.V C C >.C V C C C j+ ",
-" j S ^ ] ^ ^ ] / { ] { { ] { ] ] { / { / ^ / _ _ _ $.{.{.{.{.l.c.c.c.c.h.i.i.w.w.D.D.D.O.O.O.X.W.$+.+$+-+'+-+'+<+]+<+]+g+6+7+7+7+n+n+7+r+o+r+q+s+s+s+q+C+s+C+D+K++@D+D++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .+{+P. +D.D.D.K.D.i.i.c.c.c.r.c.{.{.{.{.%.!._ _ _ _ J { ] { / G.V 4.C C C C 4.C C >.>.C 3=j ",
-" =/{ ^ ^ ^ / ] ^ ^ { { { { / { / ] { / / J _ _ _ {.l !.~.{.2.c.c.h.h.h.i.i.w.D.D.x.D.D.O.W. + +.+.+.+.+'+-+<+'+'+<+<+2+2+g+2+7+7+7+n+7+n+n+n+r+q+q+q+s+J+J+C+D+D+D+C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + W.X.W.P.D.x.w.D.V.h.v.i.c.c.c.2.2.{.7.%.%.%.$._ _ / ^ { ] { { L >.>.C V C C V V V >.C C c@ ",
-" -/( / { { ^ { ^ ] { ] { { ] { { ^ ^ { J { / _ _ %.%.!.g${.{.{.2.c.h.h.v.h.h.i.D.V.D.D.W.W.P..+.+-+.+.+-+'+'+<+]+<+]+]+]+f+<+7+2+7+7+7+y+o+q+q+q+q+s+s+q+C+q+q+C+C+J+C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +X.D.D.D.D.i.v.w.h.j.2.c.c.2.c.7.{.!.~.!._ _ _ _ / { { ] { { T C V C V C >.4.C 4.>.C `+[+ ",
-" u./ / { { ] / { ^ ] / / ^ { ^ ] / ] ` { ^ _ _ _ _ %.!.{.l.{.2.c.h.i.h.i.V.x.h.D.D.D.D.P.W.X.W..+-+$+'+.+-+'+'+'+<+<+6+<+<+<+<+7+7+2+7+n+r+n+o+y+y+y+o+q+r+q+s+s+q+C+C++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +X.D.P.D.w.D.i.w.v.j.i.i.c.2.2.{.7.!.!.{.%._ _ _ ^ ^ / { / / / s C V >.V V 4.>.>.C C V z. ",
-" ;/] ] { ^ { { ] ] { { { { { ] / { / ^ { J _ _ _ ~.!.!.!.!.{.2.c.c.i.h.i.h.i.h.w.D.D.O.D.W..+X.X.X.-+$+-+.+-+m+'+'+'+<+'+]+<+e+<+2+2+7+7+7+7+n+n+y+r+o+s+s+s+s+y+C+s+s+s++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X.X.P.W.{+D.D.w.x.h.h.i.h.h.2.2.2.{.2.!.#.%.l _ _ _ ^ ^ { { { ] ] R.4.C V 4.C 4.C >.4.V `+[ ",
-" >/^ { ^ { / ] ^ { { ] { { { ] { ^ ] _ J _ _ _ ~.%.!.{.%.{.2.c.c.2.c.i.c.v.h.w.w.w.D.P.{+P. +.+.+X.-+.+-+1+-+)+'+'+]+]+b@]+]+2+2+2+f+e+2+7+7+n+n+n+y+7+o+r+s+q+q+n+r+q+s+s++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .+.+P.W.O.D.D.D.D.D.w.i.i.h.c.h.r.c.2.{.7.!.{.!.!._ _ J { =./ { { { ^ ,/^.C C >.C V 4.>.V C !+ ",
-" *+d@] ^ ] ^ ] ] ^ ] { { / ^ ] { ] / { ^ ^ _ _ _ {.%.~.{.!.c.l.2.h.c.h.i.~@v.h.v.x.w.D.D.O.X.W..+.+-+$+.+.+-+'+-+'+'+]+'+:+]+]+2+<+2+f+2+7+2+7+7+7+7+7+y+n+x+7+s+y+y+q+q+y+q+q++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + X.W.X.W.W.D.D.D.w.w.h.w.h.h.,@c.c.2.{.{.7.!.~.{._ l _ _ J { ^ / { { ] y [.C >.C C C C >.C '/>+ ",
-" )/] ^ { ] ] / { ] { { { / / / { ] ] ] ^ J _ l l !.~.{.{.!.2.2.2.i.c.c.h.v.i.i.w.w.w.D.D.W.W. +W. +X..+.+.+-+-+'+-+Z+]+'+'+<+'+<+]+6+<+e+g+e+e+7+g+7+7+7+7+y+7+n+7+n+n+x+s+q+s++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + .+.+W..+ +D.D.W.D.D.D.K.V.D.i.i.c.h.h.c.2.c.2.7.!.~.!.!.!.#._ _ _ _ ^ ^ ] ^ { ] 3 ^.C V >.V >.V >.V !/ ",
-" `.{ ^ { { { ^ { ] ^ ] ] ] { / { ] =.^ _ _ _ l %.%.{.{.{.{.2.c.c.c.i.h.v.i.K.x.h.w.w.D.D.W.W.P. +.+.+$+-+-+-+-+-+-+-+m+'+'+'+<+<+<+<+6+2+7+<+2+e+<+7+7+7+7+7+7+7+7+n+7+y+7+7+q+y+y+x+r++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -+X..+X.X..+X.X.X.W.W.D.w.D.w.i.i.i.h.c.j.c.j.c.l.{.2.{.!.{.%._ _ _ _ =.^ ^ ^ ^ ] { ^ S [.>.V C C 4.V V @+ ",
-" U.] { ^ / { ] { / { / { { { / ] / { ^ J _ _ _ !.!.{.{.{.{.c.c.c.h.c.c.c.i.i.i.V.x.D.D.D.D.{+D..+ +X..+$+-+.+.+-+'+'+]+:+'+'+m+<+]+]+]+2+]+]+g+<+f+e+<+2+f+7+7+e+7+7+7+7+2+7+7+7+7+7+7+7+7+7+7+7+7+7++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + -+.+1+.+.+ +.+W.W.{+O.P.P.D.D.w.x.i.K.h.h.v.i.h.c.c.c.c.7.!.%.{.%.~.!.l _ ^ J { { ] ] { ^ ] K ^.C C C >.>.V ~/ ",
-" N.] ] ] / ^ / { { / { / { { ^ { _ { ^ _ _ _ _ ~.{.!.{.!.l.!.c.c.h.c.i.h.h.h.h.w.w.D.D.D.P.O.D.D.W..+.+-+$+.+-+.+'+-+-+'+m+]+m+]+:+'+'+6+<+]+6+<+<+<+g+2+2+2+<+2+g+2+g+2+2+e+7+7+g+7+2+<+e+7+2+7+6+f+2+2+<+]+<+g+2+<+<+6+]+]+]+<+'+'+]+'+'+'+-+-+'+-+.+X.1+.+.+.+X. +{+{+ +D.D.D.D.x.w.i.x.v.w.h.h.c.c.c.c.2.7.2.{.{.{.~.$.%.$._ J ^ ` { ^ / ] { / ] R.a+C V 4.V >.}. ",
-" {/t { ^ ] { { ^ / ^ / / ] ] { { ^ { _ _ _ _ l %.!.!.!.2.{.{.2.2.2.h.i.h.~@i.h.w.w.D.K.D.D.D..+X.O.D..+.+ + +$+X..+-+$+-+-+-+-+-+'+-+'+<+'+]+'+'+]+6+]+<+<+<+]+6+<+g+<+2+f+<+2+]+g+6+e+g+]+2+6+<+2+6+]+]+2+<+]+:+'+6+]+]+]+'+:+'+-+'+]+'+-+-+1+.+.+.+.+.+-+X..+W.W.D.W.D.D.D.V.D.h.w.h.w.~@h.i.h.c.r.!.2.!.{.2.!.{.{.~.l _ ^ { / { / ] ^ ] { { { m.>.C >.V 4.H.{/ ",
-" ]/t / ] { ] ] ] ] { ^ { / / ] { J ^ _ _ _ l #.%.%.{.2.{.2.c.c.c.c.h.c.i.i.i.i.i.D.v.w.K.D.D.D.X.D.O.W.X..+.+X..+.+.+X.-+-+-+'+'+'+-+'+'+]+:+-+m+'+]+Z+]+'+'+'+]+:+]+]+<+]+]+:+<+'+<+]+b@'+:+]+<+]+'+]+:+:+'+]+]+-+m+]+'+'+'+-+-+-+1+.+-+.+-+X.W. +X.W.D.O.D.P.W.D.D.V.D.x.V.i.i.i.h.c.2.c.c.2.2.7.2.%.!.{.{.l %._ _ ^ { J ] ^ { { ^ { ] ^ M.>.C V >.H.I. ",
-" t.u.^ { / { ^ ] / ] { { ^ { { =.^ ^ J _ _ {.~.!.l !.{.!.{.2.c.2.i.h.h.h.c.i.h.i.h.V.D.D.w.D.W.D.D.P.X.O.X.X.W.X..+.+.+-+.+'+-+'+-+'+-+'+-+-+'+]+'+]+m+'+:+'+:+m+'+'+:+]+'+]+'+-+'+]+]+'+-+'+'+-+]+'+'+'+-+-+-+-+'+-+-+.+.+-+X.$+X..+X. +.+.+X.O.X.W.W.D.D.D.w.x.K.D.v.i.v.i.c.j.h.2.c.7.2.{.{.{.!.{.{._ _ _ ` ^ ^ ^ ] { { { ] { / / L >.V 4.z.A. ",
-" p.{ { ] { { ] ^ { ^ { / { ] { _ _ _ _ _ !._ !.!.!.{.!.7.{.c.c.c.c.h.j.j.i.h.h.w.w.V.V.D.w.D.D.D.D.O..+W.X.W.W..+X.X..+.+X.$+-+-+.+$+|+-+'+.+-+'+'+-+-+'+'+-+'+-+'+-+'+-+'+'+-+'+-+-+'+'+-+|+-+$+-+1+.+.+.+X..+$+.+$+W..+.+D.W.{+P.O.D.D.W.D.D.D.D.w.D.i.w.h.i.i.c.h.c.c.2.l.2.2.{.2.{.$.!.{._ %._ _ ^ { ^ ^ { ] ^ ] ] { ^ y ,#>.C s. ",
-" f.S { { / { ^ { ] ^ ] ] ] { ] J _ _ _ _ $.~._ ~.d+{.!.{.2.2.2.C.c.i.h.c.i.i.h.i.i.h.i.D.D.D.D.D.D.O.W. +O.W.X.X.W.W..+X.$+W.$+.+.+.+$+.+X..+.+'+$+-+.+'+-+-+1+.+'+'+'+.+-+'+-+-+.+.+X.$+X.X..+.+-+.+.+X.W.X..+X..+.+{+X.D.D.D.D.D.D.w.w.h.D.i.h.h.i.h.c.,@c.c.2.c.c.c.7.{.!.!.!.!.l l _ _ _ _ / { ] { ] { ^ { ] ] ^ K [.b+^/ ",
-" e.//] / { ^ ] { ^ { / { ] _ / J { _ _ %._ ~.{.!.~.~.{.{.2.c.c.c.c.c.c.c.c.h.h.h.h.D.w.x.x.D.w.D.D.W.D.D.O.W.W.O.W.X.D. + +X.X..+X.X.X.X.X..+.+X..+-+X.-+X.X.-+-+.+X..+.+X..+.+W.X..+X..+ +X.X.O.X.W.P.W.P.D.D.W.D.D.D.D.x.K.x.D.K.i.x.h.i.c.j.h.h.c.,@c.c.c.l.7.2.{.{.~.$.%.%.%.$.^ _ ^ ^ { { / { { ^ ] ^ { { M.^.e. ",
-" (/_// ] ] ^ { ] ^ ^ { ^ ] ^ J =._ _ l _ _ _ {.{.%.!.{.2.{.2.c.2.,@j.c.c.j.h.i.w.h.i.i.V.w.i.D.D.w.D.D.W.D.D.D.{+P.W.W.P.W.W.W.W.W.X. +X.X.X.{+X..+W.X..+.+W.W..+W..+ +W..+W.P.D.X.{+X..+D.W.D.W.D.W.D.D.D.D.D.x.w.D.D.i.w.h.w.i.i.c.j.c.j.2.h.2.{.{.{.g.!.{.$.#.!._ _ _ _ _ _ ^ { J { ^ ^ ^ ] { / { / S 4&a. ",
-" M#] ^ { / ] / { / / { ] ^ ^ _ _ _ _ $._ ~.!.%.!.{.{.2.!.2.c.2.2.2.c.c.c.h.h.h.i.i.h.i.v.x.v.w.i.D.i.V.D.D.D.D.D.D.O.O.P.W.P.W.W.D.X.W.O.X.W.O.P.X.D.W.D.X.X.O.W.O.{+D.W.W.D.{+D.O.D.D.D.D.D.D.D.D.w.i.D.h.w.i.v.w.i.i.h.h.c.c.c.h.c.{.{.2.7.2.{.!.!.!.l l l _ _ _ J { ^ J ^ ] ^ ] / ] ] ^ { { :/ ",
-" - _+] / / ^ { ^ ^ ] { / { ] ^ _ _ _ _ !.%.!.!.!.!.~.{.!.{.l.{.7.c.r.2.c.c.r.c.v.h.i.i.v.x.w.i.i.i.h.x.i.V.D.x.D.x.D.D.D.D.D.D.D.D. +D.X.O. +O.W.D.D.O.W.D.D.D.D.D.D.D.D.D.D.V.i.D.i.w.v.V.x.D.i.K.v.w.i.i.i.h.h.r.2.2.c.2.2.2.c.{.2.2.{.{.!._ ~.!._ _ _ =.^ _ J { / { { ] / / ^ ] ^ 2$(. ",
-" 0 ).] ] { { ] ] / ^ / ^ / ^ =._ _ _ _ _ l %.%.{.~.{.{.!.{.7.2.c.2.2.h.2.c.c.2.i.h.i.h.i.v.w.i.x.i.w.h.V.w.w.x.w.w.D.w.D.i.D.w.D.D.D.x.D.D.D.D.D.x.V.D.i.D.D.V.i.w.i.h.x.w.h.K.x.h.i.h.v.j.h.i.c.C.j.j.c.c.c.l.c.3.2.7.{.2.7.!.~.!.{.~.~.l _ ^ _ ^ / ^ ^ { { ^ / ] ^ ^ ^ ).0 ",
-" 1 #./ { { { ] / / ^ J =.^ J { _ _ _ _ %.l %.{.!.!.7.2.l.c.{.l.c.2.c.r.c.c.2.j.h.h.c.h.c.h.h.v.h.i.h.h.i.v.h.x.v.x.i.x.v.D.D.w.w.D.x.D.w.K.w.w.D.i.w.i.K.v.v.h.i.v.i.w.h.w.i.h.i.h.i.j.c.c.c.2.c.c.2.2.c.7.{.2.{.~.!.{.!.l _ #._ _ _ _ ^ J =./ / / ] ] { { { g </ ",
-" Y Z ] ^ { { / / { ] ^ / ` _ _ _ %._ %.#._ %.{.{.!.{.7.{.!.2.2.c.2.c.c.c.c.j.r.h.c.j.h.j.i.i.h.c.c.i.i.h.i.h.i.v.h.i.i.x.v.i.i.h.i.w.i.i.h.i.h.i.h.i.h.h.h.i.i.c.h.h.2.i.2.i.c.r.2.7.2.7.2.{.2.l.!.{.{.%.{.%.!.#._ $._ _ ^ _ ^ _ ^ { { ] { { / ^ q]Y ",
-" X O~/ ] ] / ] / ^ / _ ^ _ { _ _ l _ $.!.!.{.#.l {.{.!.2.{.{.!.{.7.2.2.c.c.2.h.c.2.c.,@c.c.c.h.c.j.i.c.c.c.i.h.j.h.c.h.h.c.j.h.c.w.i.h.h.h.c.c.h.i.c.h.2.c.c.i.2.c.{.c.2.2.2.2.{.2.7.!.{.{.{.%.~.!.%.$.!.$._ _ _ ^ ^ =.{ / ] ] ] ] { O~[/ ",
-" G a H { ] ] { ] / { _ ^ _ _ _ _ %._ !.!._ $.%.{.!.{.{.2.{.{.g.7.{.{.2.2.2.2.2.c.2.2.c.c.c.2.c.h.h.c.c.r.C.c.h.h.h.c.C.r.c.h.j.c.2.c.c.2.c.2.2.c.c.{.2.c.2.2.c.{.!.7.{.!.7.!.%.{.!.%.l %._ ~.l $._ _ _ _ / ] ^ ] / ^ ] ( a }/ ",
-" |/1/S { / ] ] { J J ^ _ _ _ _ %.!.%._ !.!.%.l %.!.{.{.!.{.!.{.2.{.2.!.l.2.c.{.2.2.c.c.2.2.c.c.c.2.2.2.c.2.2.2.2.c.c.2.c.2.{.2.c.l.l.{.c.c.7.{.!.{.{.{.%.{.~.~.%.%.$.!.~.$.$._ $._ _ _ { J J J ^ ] { { S 2/3/ ",
-" 4/* t ( { ] ^ { / =./ ^ _ _ _ _ l $.$.$.!.l {.!.!.{.!.!.{.7.{.{.{.{.{.2.{.{.g.{.2.2.{.2.2.{.2.c.{.{.7.2.{.2.2.2.{.2.{.{.!.{.2.7.~.{.g${.{.%.~.%.$.%.!.%._ _ $.~._ _ _ _ J J _ _ _ ^ ^ ^ b t * 5/ ",
-" 6/k 7/{ / ^ =.] J _ ^ / _ _ $._ _ _ _ l _ _ ~.!.!.l !.!.{.~.!.{.{.7.%.{.~.{.~.7.!.g${.!.{.%.~.2.{.{.!.{.!.{.!.!.!.{.{.!.~.!.%.~.$.$.$._ %._ _ _ _ ^ _ _ _ _ _ { ] ^ { #.k 6/ ",
-" i 0 h # ] ` ] ` J ^ J ^ _ _ _ _ _ l $.l _ _ !._ _ l %.~._ #.!.!.l %.{.!.#.~.%.{.!.!.l %.{.~.!.!.~.{.{._ $.%._ %.l {.l %._ l _ _ _ _ _ _ _ J ` _ J b q]h 0 i ",
-" 8/1 2 q]3 =._ ^ _ _ _ ^ _ _ _ _ %._ $.l _ _ #.!.%._ _ $.#.l ~._ !.$.~.$.!.~.!.!.{.%.~.!.!._ _ l _ l _ _ _ _ _ ^ _ ^ / ^ ^ { c.]'1 9/ ",
-" 0/[ ' < %/!.` ^ ^ ^ J ^ _ _ _ _ _ _ _ %.l _ $._ l $._ _ l l l _ _ _ _ _ _ _ _ _ _ ^ _ _ _ ^ ^ ( %.: < ' , > ",
-" 0/a/6/* b/< c/%/x%q]^ J ` ] ] _ ^ _ _ _ _ 3 { ` / ^ {.x%%/_.< b/* #+a/> ",
-" ",
-" ",
-" ",
-" ",
-" ",
-" "};
diff --git a/community/convertlit/PKGBUILD b/community/convertlit/PKGBUILD
deleted file mode 100644
index 3cfb61356..000000000
--- a/community/convertlit/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 59640 2011-11-28 23:08:09Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: gDD (usrgdd | gmail)
-# Contributor: cantabile
-
-pkgname=convertlit
-pkgver=1.8
-pkgrel=5
-pkgdesc="An extractor/converter for .LIT eBooks"
-arch=('i686' 'x86_64')
-url="http://www.convertlit.com/"
-license=('GPL')
-depends=('glibc')
-makedepends=('libtommath')
-source=("http://www.convertlit.com/clit18src.zip")
-md5sums=('d691d4729485fe5d73e3f0937d8fb42e')
-
-build() {
- cd ${srcdir}/lib
- make
-
- cd ../clit18
- sed -i 's|../libtommath-0.30/|/usr/lib/|' Makefile
- make
-}
-
-package() {
- cd ${srcdir}/clit18
-
- install -Dm755 clit "$pkgdir/usr/bin/clit"
-}
diff --git a/community/cross-arm-elf-binutils/PKGBUILD b/community/cross-arm-elf-binutils/PKGBUILD
deleted file mode 100644
index 406f2d7b9..000000000
--- a/community/cross-arm-elf-binutils/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 35548 2010-12-21 16:53:03Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-elf-binutils
-pkgver=2.21
-pkgrel=2
-_xprefix=/usr
-pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://sources.redhat.com/binutils"
-depends=('glibc' 'zlib')
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz)
-md5sums=('f11e10f312a58d82f14bf571dd9ff91c')
-
-build() {
- cd $srcdir/binutils-${pkgver}
-
- [ $NOEXTRACT -eq 1 ] || ./configure --prefix=${_xprefix} \
- --program-prefix=arm-elf- \
- --enable-shared \
- --disable-multilib \
- --with-lib-path=${_xprefix}/lib/binutils/arm-elf \
- --disable-nls \
- --target=arm-elf \
- --host=$CHOST \
- --build=$CHOST \
- --with-sysroot=/usr/$CHOST/arm-elf \
-# --with-build-sysroot=/usr/i686-pc-linux-gnu/arm-elf/
-
-# mkdir -p $pkgdir/${_xprefix}/lib/binutils
-# sed -i 's|know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));|{know (S_GET_VALUE (frag->tc_frag_data.last_map) < S_GET_VALUE (symbolP));}|' gas/config/tc-arm.c
-
- make configure-host
- make tooldir=$pkgdir/${_xprefix}
- make prefix=$pkgdir/${_xprefix} tooldir=$pkgdir/${_xprefix} install
-
- mkdir -p $pkgdir/${_xprefix}/lib/binutils/arm-elf
- cp -v include/libiberty.h $pkgdir/${_xprefix}/lib/binutils/arm-elf
-
- rm -f $pkgdir/${_xprefix}/man/man1/{dlltool,nlmconv,windres}*
-
- rm -f $pkgdir/usr/bin/ar
- rm -f $pkgdir/usr/bin/as
- rm -f $pkgdir/usr/bin/ld
- rm -f $pkgdir/usr/bin/nm
- rm -f $pkgdir/usr/bin/objdump
- rm -f $pkgdir/usr/bin/ranlib
- rm -f $pkgdir/usr/bin/strip
- rm -f $pkgdir/usr/bin/objcopy
- rm -f $pkgdir/usr/lib/libiberty.a
- rm -rf $pkgdir/usr/share
-}
diff --git a/community/cross-arm-elf-gcc-base/PKGBUILD b/community/cross-arm-elf-gcc-base/PKGBUILD
deleted file mode 100644
index a46c4185f..000000000
--- a/community/cross-arm-elf-gcc-base/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# $Id: PKGBUILD 46060 2011-05-03 09:42:29Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-elf-gcc-base
-pkgver=4.6.0
-pkgrel=1
-pkgdesc="The GNU Compiler Collection"
-arch=(i686 x86_64)
-license=('GPL' 'LGPL')
-url="http://gcc.gnu.org"
-depends=('cross-arm-elf-binutils' 'libmpc' 'libelf')
-options=(!libtool !emptydirs zipman docs !strip)
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-core-${pkgver}.tar.bz2)
-md5sums=('b1957f3209080b2f55bc3756d3a62b7c')
-
-build() {
- cd $srcdir/gcc-$pkgver
-
- export CFLAGS="-O2 -pipe"
- export CXXFLAGS="-O2 -pipe"
-
- [ $NOEXTRACT -eq 1 ] || rm -rf build
- mkdir build
- cd build
-
- [ $NOEXTRACT -eq 1 ] || ../configure --prefix=/usr \
- --target=arm-elf \
- --host=$CHOST \
- --build=$CHOST \
- --enable-shared --disable-nls --enable-languages=c --enable-multilib \
- --with-local-prefix=/usr/lib/cross-arm \
- --with-as=/usr/bin/arm-elf-as --with-ld=/usr/bin/arm-elf-ld \
- --enable-softfloat \
- --with-float=soft \
- --with-newlib \
- --with-sysroot=/usr/$CHOST/arm-elf
-
- make all-gcc all-target-libgcc
-}
-
-package() {
- cd $srcdir/gcc-$pkgver/build
-
- export CFLAGS="-O2 -pipe"
- export CXXFLAGS="-O2 -pipe"
-
- make DESTDIR=$pkgdir install-gcc install-target-libgcc
-
- rm -f $pkgdir/usr/share/man/man7/fsf-funding.7*
- rm -f $pkgdir/usr/share/man/man7/gfdl.7*
- rm -f $pkgdir/usr/share/man/man7/gpl.7*
- rm -rf $pkgdir/usr/share/info
-
- cp -r $pkgdir/usr/libexec/* $pkgdir/usr/lib/
- rm -rf $pkgdir/usr/libexec
-
- # strip it manually
- strip $pkgdir/usr/bin/* 2>/dev/null || true
- find $pkgdir/usr/lib -type f -exec arm-elf-strip {} \; 2>/dev/null || true
-}
diff --git a/community/cross-arm-wince-cegcc-binutils/PKGBUILD b/community/cross-arm-wince-cegcc-binutils/PKGBUILD
deleted file mode 100644
index 491004df4..000000000
--- a/community/cross-arm-wince-cegcc-binutils/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 20572 2010-07-09 07:26:42Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-wince-cegcc-binutils
-pkgver=0.59.1
-pkgrel=1
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=(zlib)
-groups=('cegcc')
-source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
- cd $srcdir/cegcc/src/binutils
-
- unset CFLAGS
- unset LDFLAGS
-
- [ $NOEXTRACT -eq 1 ] || ./configure \
- --prefix=${_prefix} \
- --exec-prefix=${_prefix} \
- --bindir=${_prefix}/bin \
- --target=arm-wince-cegcc \
- --disable-nls \
- --includedir=${_prefix}/include || return 1
-
- make || (cd etc && make) && make || return 1
- make DESTDIR=$pkgdir install || return 1
- rm -rf $pkgdir/opt/cegcc/info
-}
diff --git a/community/cross-arm-wince-cegcc-cegccdll-dummy/PKGBUILD b/community/cross-arm-wince-cegcc-cegccdll-dummy/PKGBUILD
deleted file mode 100644
index 278bd0e6f..000000000
--- a/community/cross-arm-wince-cegcc-cegccdll-dummy/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 20575 2010-07-09 07:27:21Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-wince-cegcc-cegccdll-dummy
-pkgver=0.59.1
-pkgrel=1
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=('glibc')
-source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
- cd $srcdir/cegcc/src/
-
- export PATH=$_prefix/bin:$PATH
-
- cd cegcc/fakecegccdll && \
- ./install.sh $pkgdir/$_prefix || return 1
-
- find $pkgdir/ -name '*.a' | while read F; do
- arm-wince-cegcc-ranlib $F
- done
-}
diff --git a/community/cross-arm-wince-cegcc-cegccdll/PKGBUILD b/community/cross-arm-wince-cegcc-cegccdll/PKGBUILD
deleted file mode 100644
index f2a0c0259..000000000
--- a/community/cross-arm-wince-cegcc-cegccdll/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 20609 2010-07-09 08:51:07Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-wince-cegcc-cegccdll
-pkgver=0.59.1
-pkgrel=1
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=('glibc')
-conflicts=(cross-arm-wince-cegcc-cegccdll-dummy)
-groups=('cegcc')
-install=cegccdll.install
-source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
- cd $srcdir/cegcc/src/cegcc/cegccdll
-
- export PATH=$_prefix/bin:$PATH
- export TARGET=arm-wince-cegcc
- unset CFLAGS
- unset CXXFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- make || return 1
- mkdir -p $pkgdir/$_prefix/lib/gcc/arm-wince-cegcc/4.4.0/ && \
- cp cegccdll/libcegcc.dll.a $pkgdir/$_prefix/lib/gcc/arm-wince-cegcc/4.4.0/ && \
- make PREFIX=$pkgdir/$_prefix install || return 1
- find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
-}
diff --git a/community/cross-arm-wince-cegcc-cegccdll/cegccdll.install b/community/cross-arm-wince-cegcc-cegccdll/cegccdll.install
deleted file mode 100644
index cb884b4d7..000000000
--- a/community/cross-arm-wince-cegcc-cegccdll/cegccdll.install
+++ /dev/null
@@ -1,8 +0,0 @@
-post_install() {
- /opt/cegcc/bin/arm-wince-cegcc-ranlib /opt/cegcc/lib/gcc/arm-wince-cegcc/4.4.0/libcegcc.dll.a
-}
-
-post_upgrade() {
- /opt/cegcc/bin/arm-wince-cegcc-ranlib /opt/cegcc/lib/gcc/arm-wince-cegcc/4.4.0/libcegcc.dll.a
-}
-
diff --git a/community/cross-arm-wince-cegcc-cegccthrddll/PKGBUILD b/community/cross-arm-wince-cegcc-cegccthrddll/PKGBUILD
deleted file mode 100644
index bd17767ba..000000000
--- a/community/cross-arm-wince-cegcc-cegccthrddll/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 20612 2010-07-09 08:51:53Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-wince-cegcc-cegccthrddll
-pkgver=0.59.1
-pkgrel=1
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=('glibc')
-groups=('cegcc')
-source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
- cd $srcdir/cegcc/src/cegcc/cegccthrd
-
- export PATH=$_prefix/bin:$PATH
- export TARGET=arm-wince-cegcc
- unset CFLAGS
- unset CXXFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- make || return 1
- make PREFIX=$pkgdir/$_prefix install || return 1
-}
diff --git a/community/cross-arm-wince-cegcc-gcc-base/PKGBUILD b/community/cross-arm-wince-cegcc-gcc-base/PKGBUILD
deleted file mode 100644
index 19dc96ccc..000000000
--- a/community/cross-arm-wince-cegcc-gcc-base/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 50658 2011-06-29 11:37:38Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-wince-cegcc-gcc-base
-pkgver=0.59.1
-pkgrel=3
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=('glibc' 'mpfr' 'cloog')
-makedepends=(cross-arm-wince-cegcc-binutils)
-source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
- cd $srcdir/cegcc/src
-
- mkdir build-gcc-base || true
- cd build-gcc-base
-
- export PATH=$_prefix/bin:$PATH
- export TARGET=arm-wince-cegcc
- unset CFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- ../gcc-4.4.0/configure \
- --with-gcc \
- --with-gnu-ld \
- --with-gnu-as \
- --target=arm-wince-cegcc \
- --build=$CARCH \
- --host=$CARCH \
- --prefix=${_prefix} \
- --disable-threads \
- --disable-nls \
- --disable-shared \
- --enable-languages=c \
- --disable-win32-registry \
- --disable-multilib \
- --disable-interwork \
- --without-headers \
- --with-as=$_prefix/bin/arm-wince-cegcc-as \
- --with-ld=$_prefix/bin/arm-wince-cegcc-ld \
- --with-local-prefix=$_prefix \
- --enable-checking
-
- make all-gcc || (cd gcc && make) && make all-gcc || return 1
- make DESTDIR=$pkgdir install-gcc || return 1
- find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
- cd $pkgdir/${_prefix} && ln -s arm-wince-cegcc arm-cegcc
-}
diff --git a/community/cross-arm-wince-cegcc-gcc/PKGBUILD b/community/cross-arm-wince-cegcc-gcc/PKGBUILD
deleted file mode 100644
index dcd86193c..000000000
--- a/community/cross-arm-wince-cegcc-gcc/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 45499 2011-04-22 14:57:58Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-wince-cegcc-gcc
-pkgver=0.59.1
-pkgrel=3
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=(cross-arm-wince-cegcc-binutils)
-makedepends=(cross-arm-wince-cegcc-newlib cross-arm-wince-cegcc-w32api cross-arm-wince-cegcc-importlibs)
-conflicts=(cross-arm-wince-cegcc-gcc-base)
-groups=('cegcc')
-source=(http://arch.p5n.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
- cd $srcdir/cegcc/src
-
- export PATH=$_prefix/bin:$PATH
- export TARGET=arm-wince-cegcc
- unset CFLAGS
- unset CXXFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- mkdir build-gcc || true
- cd build-gcc
-
- [ -f Makefile ] || ../gcc-4.4.0/configure \
- --prefix=${_prefix} \
- --exec-prefix=${_prefix} \
- --bindir=${_prefix}/bin \
- --target=$TARGET \
- --build=$CARCH \
- --host=$CARCH \
- --disable-nls \
- --includedir=${_prefix}/include \
- --with-gcc \
- --with-ld=/opt/cegcc/bin/arm-wince-cegcc-ld \
- --with-as=/opt/cegcc/bin/arm-wince-cegcc-as \
- --enable-threads=win32 \
- --enable-languages=c,c++ \
- --disable-win32-registry \
- --disable-multilib \
- --disable-interwork \
- --without-newlib \
- --enable-checking \
- --with-headers \
- --disable-libssp
-
- make
- make DESTDIR=$pkgdir install
- rm -f $pkgdir/$_prefix/lib/libiberty.a
- find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
-}
diff --git a/community/cross-arm-wince-cegcc-libstdcppdll/PKGBUILD b/community/cross-arm-wince-cegcc-libstdcppdll/PKGBUILD
deleted file mode 100644
index bbc8c0d6c..000000000
--- a/community/cross-arm-wince-cegcc-libstdcppdll/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 20984 2010-07-13 09:55:52Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-wince-cegcc-libstdcppdll
-pkgver=0.59.1
-pkgrel=1
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=('glibc')
-groups=('cegcc')
-source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
- export PATH=$_prefix/bin:$PATH
- export TARGET=arm-wince-cegcc
- unset CFLAGS
- unset CXXFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- cd $srcdir/cegcc/src/
-
- mkdir build-gcc || true
- cd build-gcc
-
-if [ $NOEXTRACT -ne 1 ]; then
- ../gcc-4.4.0/configure \
- --prefix=${_prefix} \
- --exec-prefix=${_prefix} \
- --bindir=${_prefix}/bin \
- --target=arm-wince-cegcc \
- --build=$CARCH \
- --host=$CARCH \
- --disable-nls \
- --includedir=${_prefix}/include \
- --with-gcc \
- --with-gnu-ld \
- --with-gnu-as \
- --enable-threads=win32 \
- --enable-languages=c,c++ \
- --disable-win32-registry \
- --disable-multilib \
- --disable-interwork \
- --without-newlib \
- --enable-checking \
- --with-headers \
- --disable-libssp
-fi
-
-# make || return 1
-
- #
- # libstdc++
- #
- cd $srcdir/cegcc/src/cegcc/libstdc++
-
- sed -i 's#.*unwind-sjlj_s.o#\t\t../../build-gcc/arm-wince-cegcc/libgcc/unwind-sjlj_s.o#' Makefile
-
- make || return 1
-
- mkdir -p $pkgdir${_prefix}/arm-wince-cegcc/lib && \
- make PREFIX=$pkgdir/${_prefix} install || return 1
-
- rm -f $pkgdir${_prefix}/arm-wince-cegcc/lib/device
- find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
-}
diff --git a/community/cross-arm-wince-cegcc-newlib/PKGBUILD b/community/cross-arm-wince-cegcc-newlib/PKGBUILD
deleted file mode 100644
index 79270520b..000000000
--- a/community/cross-arm-wince-cegcc-newlib/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 20584 2010-07-09 07:29:23Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-wince-cegcc-newlib
-pkgver=0.59.1
-pkgrel=1
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=('GPL')
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=('glibc')
-groups=('cegcc')
-source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
- cd $srcdir/cegcc/src/
-
- mkdir -p build-newlib
- cd build-newlib
-
- export PATH=$_prefix/bin:$PATH
- export TARGET=arm-wince-cegcc
- unset CFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- ../newlib/configure \
- --target=arm-wince-cegcc \
- --prefix=$_prefix
-
- make || (cd etc && make) && make || return 1
- mkdir -p $pkgdir/opt/cegcc/arm-wince-cegcc/lib/
- make DESTDIR=$pkgdir install || return 1
-}
diff --git a/community/cross-arm-wince-cegcc-profile/PKGBUILD b/community/cross-arm-wince-cegcc-profile/PKGBUILD
deleted file mode 100644
index 02d58ef3c..000000000
--- a/community/cross-arm-wince-cegcc-profile/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 20972 2010-07-13 09:53:06Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-wince-cegcc-profile
-pkgver=0.59.1
-pkgrel=1
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=('glibc')
-groups=('cegcc')
-source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
- cd ${startdir}/src/cegcc/src/profile
-
- export PATH=$_prefix/bin:$PATH
- export TARGET=arm-wince-cegcc
- unset CFLAGS
- unset CXXFLAGS
- unset LDFLAGS
- unset MAKEFLAGS
-
- ./configure \
- --build=$CARCH \
- --host=arm-wince-cegcc \
- --target=arm-wince-cegcc \
- --prefix=$_prefix
-
- make || return 1
-
- sed -i "s|prefix = $_prefix|prefix = $startdir/pkg/$_prefix|g" Makefile && \
- make install
-
- find $pkgdir/${_prefix} -type f -name \*.a -exec arm-wince-cegcc-ranlib {} \;
-}
diff --git a/community/cross-arm-wince-cegcc-w32api/PKGBUILD b/community/cross-arm-wince-cegcc-w32api/PKGBUILD
deleted file mode 100644
index 22eb7a4e2..000000000
--- a/community/cross-arm-wince-cegcc-w32api/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 20587 2010-07-09 07:30:01Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=cross-arm-wince-cegcc-w32api
-pkgver=0.59.1
-pkgrel=1
-_prefix=/opt/cegcc
-pkgdesc="CE GCC bundle - cross compilation tools for WinCE"
-arch=(i686 x86_64)
-license=(GPL)
-options=(!libtool)
-url="http://cegcc.sf.net"
-depends=('glibc')
-groups=('cegcc')
-source=(http://arch.pp.ru/~sergej/dl/cegcc-$pkgver.tar.bz2)
-md5sums=('5e3c1098abdf8e5db2a3518ee3578b4b')
-
-build() {
- cd $srcdir/cegcc/src/
-
- export PATH=$_prefix/bin:$PATH
-
- mkdir -p $pkgdir/$_prefix/arm-wince-cegcc/include/w32api/{GL,directx,ddk}
- cp -fp w32api/include/*.h $pkgdir/$_prefix/arm-wince-cegcc/include/w32api || return 1
- cp -fp w32api/include/GL/*.h $pkgdir/$_prefix/arm-wince-cegcc/include/w32api/GL || return 1
- cp -fp w32api/include/directx/*.h $pkgdir/$_prefix/arm-wince-cegcc/include/w32api/directx || return 1
- cp -fp w32api/include/ddk/*.h $pkgdir/$_prefix/arm-wince-cegcc/include/w32api/ddk || return 1
-}
diff --git a/community/dar/ChangeLog b/community/dar/ChangeLog
deleted file mode 100644
index 811f87d4f..000000000
--- a/community/dar/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/dar/PKGBUILD b/community/dar/PKGBUILD
deleted file mode 100644
index be82f3409..000000000
--- a/community/dar/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 55197 2011-09-06 02:04:39Z shusmann $
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Aaron Schaefer <aaron@elasticdog.com>
-
-pkgname=dar
-pkgver=2.4.2
-pkgrel=1
-pkgdesc='A full featured command-line backup tool, short for Disk ARchive'
-arch=('i686' 'x86_64')
-url='http://dar.linux.free.fr/'
-license=('GPL')
-depends=('bzip2' 'lzo2' 'libgcrypt')
-optdepends=('perl: for running some samples')
-makedepends=('doxygen')
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('b23c0509513b895f4ab9ce9191b2f65b')
-options=('!libtool')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- install -d $pkgdir/usr/share/doc/$pkgname
- make DESTDIR="$pkgdir" install
- cd $pkgdir/usr/share/$pkgname
- mv *.html $pkgdir/usr/share/doc/$pkgname
- rm -r man
- for _i in html mini-howto samples
- do
- mv ${_i} $pkgdir/usr/share/doc/$pkgname
- done
-}
diff --git a/community/driftnet/PKGBUILD b/community/driftnet/PKGBUILD
deleted file mode 100644
index 7a128014d..000000000
--- a/community/driftnet/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 55457 2011-09-13 00:28:52Z ebelanger $
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=driftnet
-pkgver=0.1.6
-pkgrel=5
-pkgdesc="Listens to network traffic and picks out images from TCP streams it observes."
-arch=('i686' 'x86_64')
-url=('http://www.ex-parrot.com/~chris/driftnet/')
-license=('GPL')
-depends=('libjpeg' 'libpcap' 'gtk' 'giflib')
-makedepends=('imake')
-source=(http://www.ex-parrot.com/~chris/driftnet/${pkgname}-${pkgver}.tar.gz)
-md5sums=('8e11d77770452f97bb3c23f510489815')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make LDFLAGS=""
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- install -D -m755 driftnet "${pkgdir}/usr/bin/driftnet"
-}
diff --git a/community/duff/ChangeLog b/community/duff/ChangeLog
deleted file mode 100644
index 811f87d4f..000000000
--- a/community/duff/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/duff/PKGBUILD b/community/duff/PKGBUILD
deleted file mode 100644
index c97271ca7..000000000
--- a/community/duff/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 44930 2011-04-13 03:50:28Z shusmann $
-# Contributor: Aaron Schaefer <aaron@elasticdog.com>
-
-pkgname=duff
-pkgver=0.5
-pkgrel=1
-pkgdesc="A command-line utility for quickly finding duplicates in a given set of files"
-arch=('i686' 'x86_64')
-url="http://duff.sourceforge.net/"
-license=('custom')
-depends=('glibc' 'sh')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e42bedb278ab41081df3ebb9ce1cbe1d')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --mandir=/usr/share/man
- make
-}
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
- install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/community/dvdstyler/PKGBUILD b/community/dvdstyler/PKGBUILD
deleted file mode 100644
index f797ba0f4..000000000
--- a/community/dvdstyler/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 58391 2011-11-12 17:16:44Z ibiru $
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=dvdstyler
-pkgver=2.0
-pkgrel=2
-pkgdesc="Cross-platform DVD authoring application"
-arch=('i686' 'x86_64')
-url="http://www.dvdstyler.de/"
-license=('GPL')
-depends=('cdrkit' 'dvdauthor' 'dvd+rw-tools' 'wxsvg' 'xine-ui' 'mjpegtools' 'libgnomeui')
-makedepends=('zip' 'xmlto' 'docbook-xsl')
-optdepends=('dvdisaster: ECC support')
-options=('!makeflags')
-source=(http://downloads.sourceforge.net/dvdstyler/DVDStyler-${pkgver}.tar.bz2)
-sha1sums=('21bb4e25c851e70cdd3ce37f3e319c71e78f74a6')
-
-build() {
- cd "${srcdir}/DVDStyler-${pkgver}"
- sed -i 's/rmdir "$$t"//' docs/Makefile.in
- sed -i 's/vsink_buffer.h/buffersink.h/' src/mediatrc_ffmpeg.cpp
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/DVDStyler-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/community/eiciel/PKGBUILD b/community/eiciel/PKGBUILD
deleted file mode 100644
index d4a03681c..000000000
--- a/community/eiciel/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 58840 2011-11-18 19:58:05Z ebelanger $
-# Contributor: Roman Kyrylych <roman@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=eiciel
-pkgver=0.9.8.1
-pkgrel=1
-pkgdesc="GNOME file ACL editor"
-arch=('i686' 'x86_64')
-url="http://rofi.roger-ferrer.org/eiciel/"
-license=('GPL')
-depends=('acl' 'gtkmm3' 'nautilus' 'desktop-file-utils' 'gnome-vfs')
-options=('!libtool')
-install=eiciel.install
-# the source for 0.9.8.1 is no longer found upstream
-#source=(http://rofi.roger-ferrer.org/eiciel/download/${pkgname}-${pkgver}.tar.bz2)
-source=(https://launchpad.net/ubuntu/+archive/primary/+files/eiciel_0.9.8.1.orig.tar.bz2)
-md5sums=('2c9c459f0604ce03ec49bb425cc42681')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/community/eiciel/eiciel.install b/community/eiciel/eiciel.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/community/eiciel/eiciel.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- update-desktop-database -q
-}
-
-post_remove() {
- update-desktop-database -q
-}
diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD
deleted file mode 100755
index 8553e2ba5..000000000
--- a/community/emesene/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Claudio Riva <firetux83@gmail.com>
-
-pkgname=emesene
-pkgver=2.11.11
-pkgrel=1
-pkgdesc="A pygtk MSN Messenger client"
-url="http://www.emesene.org/"
-license=('custom:PSF' 'GPL' 'LGPL2.1')
-arch=('i686' 'x86_64') # libmimic is hardcoded, so no 'any' package
-depends=('python2' 'pygtk' 'python-dnspython' 'pylint' 'python-notify' 'openssl' \
-'papyon' 'python-imaging' 'dbus-python' 'xdg-utils' 'hicolor-icon-theme' \
-'gstreamer0.10-python' 'gstreamer0.10-good')
-makedepends=('python2-distribute')
-optdepends=('gnome-python-extras: spell-check plugin'
- 'gtkspell: spell-check plugin'
- 'farsight2: webcam support'
- 'pywebkitgtk: for alternative conversation window'
- 'xmpppy: for gtalk and facebook chat support'
- 'pyqt: alternative qt4 interface (emesene -e main:qt4_main')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/emesene/emesene/tarball/v2.11.11"
- 'emesene.run')
-install=emesene.install
-options=('!libtool')
-sha1sums=('bf1c63d47617b746640950bd6aedf0fbe86e8743'
- '2bd13ada86aa0af6307a41047f0d7caf2995660d')
-build() {
- cd ${srcdir}/${pkgname}-${pkgname}-c1bfdeb
-
- # do not import dummy session
- # sed -i -e "/import dummy/d" emesene/emesene.py
-
- # install files
- export PYTHONPATH="${pkgdir}/usr/lib/python2.7/site-packages/"
- install -d ${pkgdir}/usr/lib/python2.7/site-packages/
- python2 setup.py install --prefix=${pkgdir}/usr
-}
-
-package() {
- cd ${pkgdir}
-
- # use /usr/share/emesene instead of /usr/lib/python2.5/site-packages
- mv -f ${pkgdir}/usr/lib/python2.7/site-packages/emesene-${pkgver}-py2.7.egg/share \
- ${pkgdir}/usr
- mv -f ${pkgdir}/usr/lib/python2.7/site-packages/emesene-${pkgver}-py2.7.egg/emesene \
- ${pkgdir}/usr/share
- rm -rf ${pkgdir}/usr/lib
-
- # python -> python2
- find -name *.py -exec sed -i "s|/usr/bin/env python|/usr/bin/env python2|" {} \;
-
- # create executable
- install -Dm755 ${srcdir}/emesene.run ${pkgdir}/usr/bin/emesene
-}
diff --git a/community/emesene/emesene.install b/community/emesene/emesene.install
deleted file mode 100644
index 9ff2df7f8..000000000
--- a/community/emesene/emesene.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-desktop-database -q
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community/emesene/emesene.run b/community/emesene/emesene.run
deleted file mode 100644
index 8fb6efc62..000000000
--- a/community/emesene/emesene.run
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-python2 /usr/share/emesene/emesene "$@"
diff --git a/community/emesene/setup.patch b/community/emesene/setup.patch
deleted file mode 100644
index 858b7f928..000000000
--- a/community/emesene/setup.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- setup.py.orig 2010-05-03 11:02:53.551508139 +0200
-+++ setup.py 2010-05-03 11:03:09.681918067 +0200
-@@ -6,17 +6,6 @@
- import sys
-
- if os.name == 'posix':
-- for arg in sys.argv:
-- if arg == 'install':
-- print 'Hello.\nYou are trying to do a system-wide install of emesene '\
-- 'using this script, which is a very bad thing to do.\n'\
-- 'Seriously, you do NOT want to do this, since it can break '\
-- 'other python apps, and emesene too!\n'\
-- 'Follow my advice: just run the \"emesene\" script that is '\
-- 'in this very same directory and you\'re done. emesene is running '\
-- 'and your system is safe. It\'s a win-win, don\'t you think?\n'\
-- 'Thanks for trying emesene.'
-- quit()
-
- # From apport's setup.py
- mo_files = []
diff --git a/community/eterm/PKGBUILD b/community/eterm/PKGBUILD
deleted file mode 100644
index cfb3d5613..000000000
--- a/community/eterm/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-
-pkgname=eterm
-pkgver=0.9.6
-pkgrel=1
-pkgdesc="A vt102 terminal emulator intended as a replacement for xterm."
-arch=('i686' 'x86_64')
-url="http://www.eterm.org/"
-license=('custom')
-depends=('freetype2>=2.3.5' 'libast>=0.7' 'libxmu' 'libxres')
-options=('!libtool')
-source=(http://www.eterm.org/download/Eterm-${pkgver}.tar.gz)
-md5sums=('90e424584c22d4050496874d14f78bb1')
-
-build() {
- cd ${srcdir}/Eterm-${pkgver}
- CONF=""
- [ "${CARCH}" = "x86_64" ] && CONF="--disable-mmx"
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --enable-trans --enable-utmp \
- --enable-xim --with-theme-update \
- --with-backspace=bs --without-terminfo \
- --enable-multi-charset ${CONF}
- make || return 1
-}
-
-package() {
- cd ${srcdir}/Eterm-${pkgver}
- make DESTDIR=${pkgdir} install
-
- install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
diff --git a/community/extrema/PKGBUILD b/community/extrema/PKGBUILD
deleted file mode 100644
index 233b55fa3..000000000
--- a/community/extrema/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 58786 2011-11-18 14:18:33Z andrea $
-# Maintainer:
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Marcelo Avalos Tejeda <marcelo.avalos@gmail.com>
-
-pkgname=extrema
-pkgver=4.4.5
-pkgrel=2
-pkgdesc='A powerful visualization and data analysis tool'
-arch=('i686' 'x86_64')
-url='http://exsitewebware.com/extrema/index.html'
-license=('GPL')
-depends=('wxgtk')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz"
- 'extrema.desktop'
- 'gcc46.patch')
-md5sums=('8a1e82b34874db2bfa64d9a2956677b1'
- '0f4d310d230e28436dff20e77aed71bb'
- 'be85114cee4c677d33f1522d958e76db')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- patch -p1 -i "${srcdir}"/gcc46.patch
-
- ./configure --prefix=/usr
- make
-
- tar xf extrema_icons.tar.bz2
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- install -D -m644 32x32/apps/extrema.png \
- ${pkgdir}/usr/share/pixmaps/extrema.png
-
- install -D -m644 ${srcdir}/extrema.desktop \
- ${pkgdir}/usr/share/applications/extrema.desktop
-}
diff --git a/community/extrema/extrema.desktop b/community/extrema/extrema.desktop
deleted file mode 100644
index c3bfb9f65..000000000
--- a/community/extrema/extrema.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=eXtrema
-Comment=Visualization and Data Analysis Tool
-Exec=extrema
-Icon=extrema.png
-Terminal=0
-Type=Application
-Categories=Science;Math; \ No newline at end of file
diff --git a/community/extrema/gcc46.patch b/community/extrema/gcc46.patch
deleted file mode 100644
index 45a804292..000000000
--- a/community/extrema/gcc46.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix building with gcc-4.6
-
-https://bugs.gentoo.org/show_bug.cgi?id=363467
-
-Patch written by Kacper Kowalik <xarthisius@gentoo.org>
---- a/src/Graphics/GRA_thiessenTriangulation.h
-+++ b/src/Graphics/GRA_thiessenTriangulation.h
-@@ -19,6 +19,7 @@
- #define GRA_THIESSENTRIANGULATION
-
- #include <vector>
-+#include <cstddef>
-
- class GRA_thiessenTriangulation
- {
diff --git a/community/fail2ban/PKGBUILD b/community/fail2ban/PKGBUILD
deleted file mode 100644
index a776cdd82..000000000
--- a/community/fail2ban/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# $Id: PKGBUILD 26474 2010-09-15 21:57:57Z schuay $
-# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-# Contributor: michalzxc
-# Contributor: nbags <neilbags@gmail.com>
-pkgname=fail2ban
-pkgver=0.8.4
-pkgrel=2
-pkgdesc="Bans IPs after too many failed authentification attempts against common daemons"
-url="http://www.fail2ban.org/"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('python2' 'iptables')
-backup=('etc/fail2ban/fail2ban.conf' 'etc/fail2ban/jail.conf')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2 \
- $pkgname.rc)
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- python2 setup.py install --root "$pkgdir"
- install -D -m755 "$srcdir/$pkgname.rc" "$pkgdir/etc/rc.d/$pkgname"
-}
-md5sums=('df94335a5d12b4750869e5fe350073fa'
- '6d32bf78023d51c3373465389affa5c0')
diff --git a/community/fail2ban/fail2ban.rc b/community/fail2ban/fail2ban.rc
deleted file mode 100644
index f4c28a814..000000000
--- a/community/fail2ban/fail2ban.rc
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-FAIL2BAN="/usr/bin/fail2ban-client"
-
-case "$1" in
- start)
- stat_busy "Starting fail2ban"
- $FAIL2BAN start >/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon fail2ban
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping fail2ban"
- if [ "`$FAIL2BAN stop`" == "Shutdown successful" ]; then
- rm_daemon fail2ban
- stat_done
- else
- stat_fail
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/fgetty/ChangeLog b/community/fgetty/ChangeLog
deleted file mode 100644
index 811f87d4f..000000000
--- a/community/fgetty/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-28 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community/fgetty/PKGBUILD b/community/fgetty/PKGBUILD
deleted file mode 100644
index f179868f2..000000000
--- a/community/fgetty/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 39532 2011-02-11 12:12:01Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alois Belaska <lloyd@centrum.cz>
-
-pkgname=fgetty
-pkgver=0.7
-pkgrel=3
-pkgdesc="A mingetty stripped of the printfs"
-arch=('i686' 'x86_64')
-url='http://www.fefe.de/fgetty/'
-license=('GPL')
-depends=()
-makedepends=('dietlibc')
-options=(zipman)
-source=(http://www.fefe.de/fgetty/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('1ecb286ffe3a87ef160eefc38e9038a5')
-
-build() {
- export PATH=$PATH:/opt/diet/bin
- cd ${srcdir}/${pkgname}-${pkgver}
- make
- make DESTDIR=${pkgdir} install
- mkdir -p $pkgdir/usr/share/
- mv $pkgdir/usr/man $pkgdir/usr/share/
-}
diff --git a/community/fio/PKGBUILD b/community/fio/PKGBUILD
deleted file mode 100644
index ef83cbd82..000000000
--- a/community/fio/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-#Maintainer: Thomas S Hatch <thatch45@gmail.com>
-pkgname=fio
-pkgver=1.50
-pkgrel=2
-pkgdesc="I/O tool meant to be used both for benchmark and stress/hardware verification"
-arch=('x86_64' 'i686')
-url="http://freshmeat.net/projects/fio"
-license=('GPL2')
-makedepends=('gcc')
-depends=('libaio')
-noextract=()
-source=("http://brick.kernel.dk/snaps/fio-${pkgver}.tar.bz2")
-md5sums=('e28fe02e4a5ced7aaa1dddf6f48c1490')
-
-build() {
- cd $srcdir/fio-${pkgver}
- make
-}
-
-package() {
- cd $srcdir/fio-${pkgver}
- make DESTDIR="${pkgdir}" prefix="/usr" mandir="/usr/share/man" install
-}
diff --git a/community/flvstreamer/PKGBUILD b/community/flvstreamer/PKGBUILD
deleted file mode 100644
index 3b3dbe44a..000000000
--- a/community/flvstreamer/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-pkgname=flvstreamer
-pkgver=2.1c1
-pkgrel=2
-pkgdesc="Open source command-line RTMP client"
-url="http://savannah.nongnu.org/projects/flvstreamer"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('glibc')
-source=("http://mirrors.zerg.biz/nongnu/flvstreamer/source/$pkgname-$pkgver.tar.gz")
-md5sums=('4866387328ad89c957af90a2478e5556')
-build() {
- cd $srcdir/$pkgname
- make $pkgname
- make streams
-}
-package() {
- cd $srcdir/$pkgname
- install -Dm755 $pkgname $pkgdir/usr/bin/$pkgname
- install -Dm755 streams $pkgdir/usr/bin/streams
-}
diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD
deleted file mode 100644
index 43596796b..000000000
--- a/community/fotoxx/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 60004 2011-12-03 05:50:16Z ebelanger $
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=fotoxx
-pkgver=11.12.1
-pkgrel=1
-pkgdesc="A program for improving image files made with a digital camera"
-url="http://kornelix.squarespace.com/fotoxx"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils')
-optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning')
-install=fotoxx.install
-source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-sha1sums=('e9f6d58a56020e0548163c4b42687d8a23591c18')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- sed -e 's+xdg-deskto+#xdg-deskto+' -e 's/kornelix-//' -i Makefile
- make PREFIX=/usr
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" PREFIX=/usr install
-}
diff --git a/community/fotoxx/fotoxx.install b/community/fotoxx/fotoxx.install
deleted file mode 100644
index 90156a79c..000000000
--- a/community/fotoxx/fotoxx.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-post_update() {
- update-desktop-database -q
-}
-post_remove() {
- update-desktop-database -q
-}
diff --git a/community/gammu/gammu.changelog b/community/gammu/gammu.changelog
deleted file mode 100644
index a66ae1b50..000000000
--- a/community/gammu/gammu.changelog
+++ /dev/null
@@ -1,72 +0,0 @@
-2010-06-29 Ray Rashif <schiv@archlinux.org>
-
- * Version bump: 1.27.94
-
- * PKGBUILD: new dep - libusb1
- url - upstream now uses wammu site
- new changelog array
- src now from sourceforge
-
- * ChangeLog: changed to gammu.changelog
- only important changes will be logged
-
-2009-09-19 Biru Ionut <ionut@archlinux.ro>
-
- * rebuild postgresql 8.4: 1.26.1-2
-
-2009-09-08 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 1.26.1
-
- * PKGBUILD: moved python from makedepends to depends due to
- gammu substituting python-gammu
-
-2009-04-14 Corrado Primier <bardo@aur.archlinux.org>
-
- * Release bump: 2
-
- * PKGBUILD: forgot to add python-gammu to conflicts and provides
- arrays, also added doxygen to makedepends
-
-2009-02-15 Corrado Primier <bardo@aur.archlinux.org>
-
- * Release bump: 2
-
- * PKGBUILD: substituted bluez-libs dependency with bluez
-
-2008-10-27 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 1.21.0
-
- * PKGBUILD: moved to ${src,pkg}dir syntax, disabled static library
- compilation, added optdepends array, added curl dependency
-
- * gammu.install: removed in favor of optdepends
-
-2008-05-13 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 1.20.0
-
- * gammu.install: removed post_upgrade() function
-
-2008-01-23 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 1.17.0
-
- * gammu.install: added
-
-2007-12-19 Corrado Primier <bardo@aur.archlinux.org>
-
- * Version bump: 1.16.0
-
- * PKGBUILD: fixed CVS Id variable
-
- * ChangeLog: adapted to "official" specifications
-
-2007-11-05 Corrado Primier <bardo@aur.archlinux.org>
-
- * gammu: adopted from [extra]
-
- * Version bump: 1.13.0
-
- * PKGBUILD: a handful of minor changes to build()
diff --git a/community/ghdl/PKGBUILD b/community/ghdl/PKGBUILD
deleted file mode 100644
index 24e3e88be..000000000
--- a/community/ghdl/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Andrej Gelenberg <andrej.gelenberg@udo.edu>
-# Contributor: Matt Portas <matt.r.portas(at)gmail(dot)com>
-
-pkgname=ghdl
-_gccver=4.3.4
-pkgver=0.29
-pkgrel=4
-arch=('i686' 'x86_64')
-pkgdesc='A complete VHDL simulator, using GCC technology.'
-url='http://ghdl.free.fr/'
-license=('GPL')
-depends=('mpfr')
-makedepends=('gcc-ada')
-source=("http://ghdl.free.fr/${pkgname}-${pkgver}.tar.bz2"
- "ftp://gcc.gnu.org/pub/gcc/releases/gcc-${_gccver}/gcc-core-${_gccver}.tar.bz2"
- 'gcc_pure64.patch')
-md5sums=('fd3dc7a71ba521e442bef76f48177767'
- '575b3220bb8e7060939c429fc8608d22'
- '22cec272f9cc2801d3cd348feaca888b')
-
-build() {
- mv ${pkgname}-${pkgver}/vhdl gcc-${_gccver}/gcc
-
- cd gcc-$_gccver
-
- if [ ${CARCH} = 'x86_64' ]; then
- patch -Np1 -i ${srcdir}/gcc_pure64.patch
- fi
-
- ./configure \
- --prefix=/usr \
- --infodir=/usr/share/info \
- --libdir=/usr/lib \
- --libexecdir=/usr/lib \
- --mandir=/usr/share/man \
- --enable-clocale=gnu \
- --enable-languages=vhdl \
- --enable-threads=posix \
- --enable-__cxa_atexit \
- --disable-bootstrap \
- --disable-libstdcxx-pch \
- --disable-multilib
-
- make -j1
-}
-
-package() {
- cd gcc-${_gccver}
-
- make -j1 DESTDIR=${pkgdir} install
-
- # Clean up
- rm ${pkgdir}/usr/bin/{cpp,gcc{,bug},gcov,${CHOST}-gcc{,-${_gccver}}}
- rm ${pkgdir}/usr/share/man/man1/{cpp,gcc,gcov}.1
- rm ${pkgdir}/usr/share/man/man7/{fsf-funding,gfdl,gpl}.7
- rm ${pkgdir}/usr/share/info/{cpp{,internals},gcc{,install,int},libgomp}.info
- rm ${pkgdir}/usr/lib/lib{iberty.a,gcc_s*,gomp*,mudflap*,ssp*}
- rm -r ${pkgdir}/usr/{include,share/locale}
-}
diff --git a/community/ghdl/gcc_pure64.patch b/community/ghdl/gcc_pure64.patch
deleted file mode 100644
index 8c6b08171..000000000
--- a/community/ghdl/gcc_pure64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400
-@@ -49,7 +49,7 @@
- done. */
-
- #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
-
- #undef LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
-
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
-
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/community/gnofract4d/PKGBUILD b/community/gnofract4d/PKGBUILD
deleted file mode 100644
index 4d8b5b0dd..000000000
--- a/community/gnofract4d/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Angelo Theodorou <encelo@users.sourceforge.net>
-
-pkgname=gnofract4d
-pkgver=3.14
-pkgrel=1
-pkgdesc='A fractal browser with PyGTK gui'
-arch=('i686' 'x86_64')
-url='http://gnofract4d.sourceforge.net'
-license=('custom')
-depends=('pygtk' 'libjpeg' 'libpng' 'shared-mime-info')
-options=('!strip')
-install='gnofract4d.install'
-source=("http://downloads.sourceforge.net/sourceforge/gnofract4d/gnofract4d-${pkgver}.tar.gz")
-md5sums=('5c4956ff9aed37b5ad8b984e3673937d')
-
-build() {
- cd gnofract4d-${pkgver}
-
- python2 setup.py build
-}
-
-package() {
- cd gnofract4d-${pkgver}
-
- python2 setup.py install --root=${pkgdir} --optimize=1
-
- install -D -m644 COPYING \
- ${pkgdir}/usr/share/licenses/gnofract4d/COPYING
-}
diff --git a/community/gnofract4d/gnofract4d.install b/community/gnofract4d/gnofract4d.install
deleted file mode 100644
index 1fa01b255..000000000
--- a/community/gnofract4d/gnofract4d.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-
-post_remove() {
- post_install $1
-}
diff --git a/community/gnofract4d/imageIO.cpp.patch b/community/gnofract4d/imageIO.cpp.patch
deleted file mode 100644
index 62c7e1c69..000000000
--- a/community/gnofract4d/imageIO.cpp.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- fract4d/c/imageIO.cpp.orig 2010-03-28 04:47:10.000000000 +0200
-+++ fract4d/c/imageIO.cpp 2010-08-18 23:29:06.000000000 +0200
-@@ -3,6 +3,10 @@
-
- #include "image_public.h"
-
-+#define png_infopp_NULL (png_infopp)NULL
-+#define int_p_NULL (int*)NULL
-+#define png_bytepp_NULL (png_bytepp)NULL
-+
- class image_writer : public ImageWriter
- {
- public:
diff --git a/community/gnome-do/PKGBUILD b/community/gnome-do/PKGBUILD
deleted file mode 100644
index 287930240..000000000
--- a/community/gnome-do/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 59852 2011-12-01 10:45:29Z spupykin $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Doehni <dohny@gmx.de>
-
-pkgname=gnome-do
-pkgver=0.8.5
-pkgrel=2
-pkgdesc="A launcher application for gnome (like Launchy or Katapult)"
-arch=('i686' 'x86_64')
-url="http://do.davebsd.com/"
-license=('GPL3')
-depends=('gconf-sharp' 'libgnome-desktop-sharp' 'gnome-keyring-sharp' 'libgnome-sharp'
- 'mono-addins' 'notify-sharp-svn' 'hicolor-icon-theme')
-makedepends=('intltool' 'ca-certificates' 'rsvg2-sharp' 'wnck-sharp')
-options=('!libtool')
-install=$pkgname.install
-source=("http://edge.launchpad.net/do/trunk/$pkgver/+download/gnome-do-$pkgver.tar.gz")
-md5sums=('71e0e653021f895f151a6f46a97f75ba')
-
-build() {
- export MONO_SHARED_DIR="$srcdir/.wabi"
- mkdir -p "$MONO_SHARED_DIR"
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --disable-schemas-install \
- --with-gconf-schema-file-dir=/usr/share/gconf/schemas
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-}
diff --git a/community/gnome-do/gnome-do.install b/community/gnome-do/gnome-do.install
deleted file mode 100644
index 407103128..000000000
--- a/community/gnome-do/gnome-do.install
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=gnome-do
-
-post_install() {
- usr/sbin/gconfpkg --install $pkgname
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-
- echo "==> To use docky, make sure your compoisiting manager is"
- echo "==> running before launching gnome-do."
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall $pkgname
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community/gpac/libpng14-infopp-null.patch b/community/gpac/libpng14-infopp-null.patch
deleted file mode 100644
index b02456557..000000000
--- a/community/gpac/libpng14-infopp-null.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr gpac.orig/src/media_tools/img.c gpac/src/media_tools/img.c
---- gpac.orig/src/media_tools/img.c 2010-01-24 19:03:28.000000000 +0200
-+++ gpac/src/media_tools/img.c 2010-01-24 19:04:07.000000000 +0200
-@@ -551,7 +551,7 @@ GF_Err gf_img_png_enc(char *data, u32 wi
- /* Allocate/initialize the image information data. REQUIRED */
- info_ptr = png_create_info_struct(png_ptr);
- if (info_ptr == NULL) {
-- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
-+ png_destroy_write_struct(&png_ptr, NULL);
- return GF_IO_ERR;
- }
-
diff --git a/community/gpac/openjpeg14.patch b/community/gpac/openjpeg14.patch
deleted file mode 100644
index 68a625eeb..000000000
--- a/community/gpac/openjpeg14.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-https://bugs.gentoo.org/show_bug.cgi?id=361359
-
-Index: gpac/modules/img_in/jp2_dec.c
-===================================================================
---- gpac.orig/modules/img_in/jp2_dec.c
-+++ gpac/modules/img_in/jp2_dec.c
-@@ -340,9 +340,16 @@ static GF_Err JP2_ProcessData(GF_MediaDe
- return GF_OK;
- }
-
-+char opj_version_buffer[500];
-+
- static const char *JP2_GetCodecName(GF_BaseDecoder *dec)
- {
-+#ifndef OPENJPEG_VERSION
-+ snprintf(opj_version_buffer, sizeof(opj_version_buffer), "OpenJPEG %s", opj_version());
-+ return opj_version_buffer;
-+#else
- return "OpenJPEG "OPENJPEG_VERSION ;
-+#endif
- }
-
-
diff --git a/community/grass/PKGBUILD b/community/grass/PKGBUILD
deleted file mode 100644
index 8dca3a4dc..000000000
--- a/community/grass/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-
-pkgname=grass
-pkgver=6.4.1
-pkgrel=4
-pkgdesc='Geographic Information System (GIS) used for geospatial data management and analysis, image processing, graphics/maps production, spatial modeling, and visualization.'
-arch=('i686' 'x86_64')
-url='http://grass.itc.it/index.php'
-license=('GPL')
-depends=('gdal' 'tk' 'sqlite3' 'python2' 'mesa' 'swig' 'proj' 'libjpeg' 'libpng' 'libtiff' 'cfitsio')
-makedepends=('mysql' 'postgresql' 'r' 'fftw' 'freetype2' 'xorg-server')
-optdepends=('fftw: required for i.fft and i.ifft modules'
- 'postgresql: PostgreSQL database interface'
- 'r: R language interface'
- 'lapack: required for GMATH library'
- 'blas: required for GMATH library'
- 'xorg-server: required for the graphical interface'
- 'wxpython: to enable the GUI')
-options=('!libtool' '!makeflags')
-install='grass.install'
-source=("http://grass.itc.it/grass64/source/grass-${pkgver}.tar.gz"
- "grass.sh"
- "grass.conf")
-md5sums=('d8ca83d416b5b0cf2aa9d36c81a77b23'
- 'a0e0ac6275e09a272f8ec38d3c0b4b3a'
- '6103480c2a1adc19a50b9e925e5e6d4c')
-
-build() {
- cd grass-${pkgver}
-
- # python2 fix
- sed -i 's_python $< $(GISBASE) > $@_python2 $< $(GISBASE) > $@_' gui/wxpython/Makefile
- for file in $(find . -name '*.py' -print); do
- sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' $file
- sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
- done
-
- # the following exports are probably not needed
- export PYTHON=python2
- export DOXNAME=python2
- export GRASS_python=python2
-
- # fix wxpython error
- sed -i 's/python/&2/' ./include/Make/Platform.make.in
-
- # see ${srcdir}/grass-6.4.0/REQUIREMENTS.html for options
- ./configure \
- --prefix=/opt \
- --with-mysql-includes=/usr/include/mysql \
- --with-mysql \
- --with-sqlite \
- --with-postgres \
- --with-fftw \
- --with-gdal=/usr/bin/gdal-config \
- --with-blas \
- --with-lapack \
- --with-proj-libs=/usr/lib \
- --with-proj-includes=/usr/include \
- --with-proj-share=/usr/share/proj \
- --with-fftw-includes=/usr/include \
- --with-fftw-libs=/usr/lib \
- --with-python=/usr/bin/python2-config
-
- #--with-freetype-includes=/usr/include
-
- make
-
- # some more potential problems nvm, works without, but save for future use if problems arrise
- #cd ${pkgdir}/opt/grass-${pkgver}
- #sed -i 's/PYTHON = python/PYTHON = python2/' include/Make/Python.make
- #sed -i 's/GRASS_PYTHON=python/GRASS_PYTHON=python2/' etc/Init.sh
-}
-
-package() {
- cd grass-${pkgver}
-
- make \
- INST_DIR=${pkgdir}/opt/grass-${pkgver} \
- BINDIR=${pkgdir}/usr/bin \
- install
-
- # fix $GISBASE path
- sed -i "s|GISBASE=${pkgdir}/opt/grass-${pkgver}|GISBASE=/opt/grass-${pkgver}|g" \
- ${pkgdir}/usr/bin/grass64
-
- # install profile.d file
- install -D ${srcdir}/grass.sh \
- ${pkgdir}/etc/profile.d/grass.sh
-
- # install some freedesktop.org compatibility
- install -D -m644 gui/icons/grass.desktop \
- ${pkgdir}/usr/share/applications/grass.desktop
-
- sed -i -e 's/grass65/grass64/' -e 's_/usr/share/icons_/usr/share/pixmaps_' \
- ${pkgdir}/usr/share/applications/grass.desktop
-
- install -D -m644 gui/icons/grass-48x48.png \
- ${pkgdir}/usr/share/pixmaps/grass-48x48.png
-
- # create a symlink for version work around
- ln -sf /opt/grass-${pkgver} ${pkgdir}/opt/grass
-
- install -D -m644 ${srcdir}/grass.conf \
- ${pkgdir}/etc/ld.so.conf.d/grass.conf
-
- # install g.html2man which is needed for some extensions
- # FS#25705 - [grass] g.html2man is not installed into package directory
- # https://bugs.archlinux.org/task/25705
- # most likely upstream problem which will be fixed in a version later than 6.4.1
- cp -r ./tools/g.html2man ${pkgdir}/opt/grass-${pkgver}/tools
-}
diff --git a/community/grass/grass.conf b/community/grass/grass.conf
deleted file mode 100644
index bb4964d93..000000000
--- a/community/grass/grass.conf
+++ /dev/null
@@ -1 +0,0 @@
-/opt/grass/lib
diff --git a/community/grass/grass.install b/community/grass/grass.install
deleted file mode 100644
index 07e347eb1..000000000
--- a/community/grass/grass.install
+++ /dev/null
@@ -1,6 +0,0 @@
-## arg 1: the new package version
-post_install() {
- echo 'Please relogin for required variables to be set from /etc/profile.d/grass.sh'
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/grass/grass.sh b/community/grass/grass.sh
deleted file mode 100644
index ccc2fcd7e..000000000
--- a/community/grass/grass.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export GISBASE=/opt/grass
-export PATH=$PATH:$GISBASE/bin
-export MANPATH=$MANPATH:$GISBASE/man
-export GRASS_PYTHON=python2
diff --git a/community/gri/PKGBUILD b/community/gri/PKGBUILD
deleted file mode 100644
index bfbbb3451..000000000
--- a/community/gri/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 59365 2011-11-23 20:42:48Z andrea $
-# Maintainer:
-# Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
-# Contributor: big_gie nbigaouette . at . gmail.com
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=gri
-pkgver=2.12.23
-pkgrel=1
-pkgdesc="A script-based language for scientific graphics programming"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://gri.sourceforge.net/"
-depends=('perl')
-makedepends=('ghostscript' 'gzip' 'imagemagick' 'texlive-bin')
-source=(http://downloads.sourceforge.net/gri/$pkgname-$pkgver.tar.gz)
-install=gri.install
-md5sums=('eabd37f80ac51f7aef83a89234fb6522')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
- rm $pkgdir/usr/share/info/*.gz
-}
diff --git a/community/gri/gri.install b/community/gri/gri.install
deleted file mode 100644
index 578968e39..000000000
--- a/community/gri/gri.install
+++ /dev/null
@@ -1,18 +0,0 @@
-infodir=usr/share/info
-filelist=(gri.info.gz)
-
-post_install() {
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
diff --git a/community/gromacs/PKGBUILD b/community/gromacs/PKGBUILD
deleted file mode 100644
index aa23037a5..000000000
--- a/community/gromacs/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 57441 2011-10-27 20:16:45Z lcarlier $
-# Maintainer: Abhishek Dasgupta <abhidg@gmail.com>
-# Contributor: Ricardo <rikardo.horo@gmail.com>
-
-pkgname=gromacs
-pkgver=4.5.5
-pkgrel=1
-pkgdesc='A fast Molecular Dynamics program based on the GROMOS force field'
-url='http://www.gromacs.org/'
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('fftw' 'lesstif' 'perl' 'libxml2' 'libsm' 'libx11')
-options=('!libtool')
-source=(ftp://ftp.gromacs.org/pub/gromacs/${pkgname}-${pkgver}.tar.gz)
-md5sums=('6a87e7cdfb25d81afa9fea073eb28468')
-sha1sums=('ce4b4f9a0453dd2ffea72f28ea0bc7bb7a72f479')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- [ "$CARCH" == "i686" ] && SSE="--disable-ia32-sse"
- ./configure --prefix=/usr --enable-shared $SSE
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
-# installing completions in correct location
- install -D -m644 scripts/completion.bash "${pkgdir}/etc/bash_completion.d/gromacs"
- install -D -m644 scripts/completion.zsh "${pkgdir}/usr/share/zsh/site-functions/gromacs"
-
-# Cleaning up, kept the csh completion at default location
- rm "${pkgdir}"/usr/bin/{completion.bash,completion.zsh,GMXRC,GMXRC.bash,GMXRC.zsh}
-}
diff --git a/community/gtk-gnutella/PKGBUILD b/community/gtk-gnutella/PKGBUILD
deleted file mode 100644
index 562ebbab1..000000000
--- a/community/gtk-gnutella/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 55800 2011-09-21 05:45:26Z ebelanger $
-# Contributor: Dan McGee <dan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=gtk-gnutella
-pkgver=0.97.1
-pkgrel=1
-pkgdesc="A Gnutella server/client"
-arch=('i686' 'x86_64')
-url="http://gtk-gnutella.sourceforge.net/"
-license=('GPL')
-depends=('gtk2')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('7ded76ca9892b58b0e9314ee563e4bae')
-sha1sums=('14a4b5fd8c35cbed443e9997e55e44aafba05906')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i '/gnutls_transport_set_lowat(ctx->session, 0);/d' src/core/tls_common.c
- ./build.sh --prefix=/usr --gtk2 --disable-dbus
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make install INSTALL_PREFIX="${pkgdir}"
-}
diff --git a/community/gtk-rezlooks-engine/PKGBUILD b/community/gtk-rezlooks-engine/PKGBUILD
deleted file mode 100644
index 66edded76..000000000
--- a/community/gtk-rezlooks-engine/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 55455 2011-09-13 00:08:05Z ebelanger $
-# Contributor: Javier "Phrodo_00" Aravena <phrodo.00@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=gtk-rezlooks-engine
-pkgver=0.6
-pkgrel=10
-pkgdesc="Clean looking gtk theme engine based on the cairo-enabled CVS clearlooks engine code."
-arch=('i686' 'x86_64')
-url="http://www.gnome-look.org/content/show.php?content=39179"
-license=('GPL')
-depends=('gtk2')
-options=('!libtool')
-source=(http://gnome-look.org/CONTENT/content-files/39179-rezlooks-$pkgver.tar.gz)
-md5sums=('87b768eb372dd5065f9e36bf10245ac7')
-
-build() {
- cd "${srcdir}/rezlooks-${pkgver}"
-
- ./configure --prefix=/usr --enable-animation
- make
-}
-
-package() {
- cd "${srcdir}/rezlooks-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
- install -d "${pkgdir}/usr/share/themes"
-}
diff --git a/community/handbrake/PKGBUILD b/community/handbrake/PKGBUILD
deleted file mode 100644
index 3aad96f48..000000000
--- a/community/handbrake/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 41565 2011-03-07 21:41:40Z ibiru $
-# Maintainer: Evangelos Foutras <foutrelis@gmail.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Sebastien Piccand <sebcactus gmail com>
-
-pkgname=('handbrake' 'handbrake-cli')
-pkgver=0.9.5
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://handbrake.fr/"
-license=('GPL')
-makedepends=('intltool' 'python2' 'yasm' 'wget' 'bzip2' 'gcc-libs' 'libnotify'
- 'gstreamer0.10-base' 'gtk2' 'dbus-glib')
-source=(http://downloads.sourceforge.net/project/handbrake/$pkgver/HandBrake-$pkgver.tar.bz2
- dbus-glib.patch libnotify-0.7.patch)
-md5sums=('e17d3663fc36a985fe43e188695e3196'
- 'f8c2a3b258b2c30ef4abb28cee80f8d4'
- 'd56bf38d8e1a1d373e5f3b69522958b1')
-
-build() {
- cd "$srcdir/HandBrake-$pkgver"
-
- patch -Np1 -i $srcdir/dbus-glib.patch
- patch -Np1 -i $srcdir/libnotify-0.7.patch
-
- # Use Python 2
- sed -i 's/python /python2 /' gtk/src/Makefile.am
-
- ./configure --prefix=/usr --force --disable-gtk-update-checks
- cd build
- make
-}
-
-package_handbrake() {
- pkgdesc="Multithreaded video transcoder"
- depends=('bzip2' 'gcc-libs' 'gstreamer0.10-base' 'libnotify'
- 'hicolor-icon-theme')
- install=$pkgname.install
-
- cd "$srcdir/HandBrake-$pkgver/build"
-
- make DESTDIR="$pkgdir" install
- rm "$pkgdir/usr/bin/HandBrakeCLI"
-}
-
-package_handbrake-cli() {
- pkgdesc="Multithreaded video transcoder (CLI)"
- depends=('bzip2' 'gcc-libs' 'zlib')
-
- cd "$srcdir/HandBrake-$pkgver/build"
- install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/handbrake/dbus-glib.patch b/community/handbrake/dbus-glib.patch
deleted file mode 100644
index 602918a65..000000000
--- a/community/handbrake/dbus-glib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur HandBrake-0.9.5.orig/gtk/configure.ac HandBrake-0.9.5/gtk/configure.ac
---- HandBrake-0.9.5.orig/gtk/configure.ac 2011-03-07 13:06:20.333338164 -0800
-+++ HandBrake-0.9.5/gtk/configure.ac 2011-03-07 13:07:46.346670456 -0800
-@@ -94,7 +94,7 @@
- mingw_flag=yes
- ;;
- *)
-- GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify gudev-1.0"
-+ GHB_PACKAGES="gtk+-2.0 >= 2.10 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 gstreamer-video-0.10 gstreamer-pbutils-0.10 gio-2.0 libnotify gudev-1.0 dbus-glib-1"
- mingw_flag=no
- ;;
- esac
diff --git a/community/handbrake/handbrake.install b/community/handbrake/handbrake.install
deleted file mode 100644
index 7aaea8154..000000000
--- a/community/handbrake/handbrake.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community/handbrake/libnotify-0.7.patch b/community/handbrake/libnotify-0.7.patch
deleted file mode 100644
index 0def15254..000000000
--- a/community/handbrake/libnotify-0.7.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur HandBrake-0.9.5.orig/gtk/src/callbacks.c HandBrake-0.9.5/gtk/src/callbacks.c
---- HandBrake-0.9.5.orig/gtk/src/callbacks.c 2011-03-07 13:06:20.333338164 -0800
-+++ HandBrake-0.9.5/gtk/src/callbacks.c 2011-03-07 13:21:32.973338933 -0800
-@@ -39,6 +39,10 @@
- #endif
-
- #include <libnotify/notify.h>
-+#ifndef NOTIFY_CHECK_VERSION
-+#define NOTIFY_CHECK_VERSION(x,y,z) 0
-+#endif
-+
- #include <gdk/gdkx.h>
- #else
- #define WINVER 0x0500
-@@ -4889,9 +4893,13 @@
- notification = notify_notification_new(
- "Encode Complete",
- "Put down that cocktail, Your HandBrake queue is done!",
-- "hb-icon",
-- NULL);
-+ "hb-icon"
-+#if NOTIFY_CHECK_VERSION (0, 7, 0)
-+ );
-+#else
-+ ,NULL);
- notify_notification_attach_to_status_icon(notification, si);
-+#endif
- g_signal_connect(notification, "closed", (GCallback)notify_closed_cb, ud);
- notify_notification_show(notification, NULL);
- #endif
diff --git a/community/jogl/PKGBUILD b/community/jogl/PKGBUILD
deleted file mode 100644
index fbbb8172d..000000000
--- a/community/jogl/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Simon Lipp <sloonz+aur@gmail.com>
-
-pkgname=jogl
-pkgver=1.1.1
-pkgrel=6
-pkgdesc="OpenGL bindings for java"
-arch=('i686' 'x86_64')
-url="http://jogl.dev.java.net/"
-license=('custom')
-depends=('java-runtime' 'libgl')
-
-if [ "$CARCH" = "i686" ]; then
- source=('http://download.java.net/media/jogl/builds/archive/jsr-231-1.1.1/jogl-1.1.1-linux-i586.zip')
- md5sums=('74d131fc1c1130d09109887679dbf044')
-else
- source=('http://download.java.net/media/jogl/builds/archive/jsr-231-1.1.1/jogl-1.1.1-linux-amd64.zip')
- md5sums=('efe0beb352cfb31f3a32d8d7f56fcce3')
-fi
-
-build() {
- install -d $pkgdir/usr/share/java/jogl/ || return 1
- install -d $pkgdir/usr/share/licenses/$pkgname || return 1
- install -d $pkgdir/usr/lib || return 1
- install --mode=644 $srcdir/jogl-*/lib/jogl.jar \
- $pkgdir/usr/share/java/jogl/ || return 1
- install --mode=644 $srcdir/jogl-*/lib/gluegen-rt.jar \
- $pkgdir/usr/share/java/jogl/ || return 1
- install --mode=644 $srcdir/jogl-*/LICENSE-JOGL-*.txt \
- $pkgdir/usr/share/licenses/$pkgname || return 1
- install --mode=644 $srcdir/jogl-*/lib/libgluegen-rt.so \
- $pkgdir/usr/lib/ || return 1
- install --mode=644 $srcdir/jogl-*/lib/libjogl.so \
- $pkgdir/usr/lib/ || return 1
- install --mode=644 $srcdir/jogl-*/lib/libjogl_awt.so \
- $pkgdir/usr/lib/ || return 1
-}
diff --git a/community/kmod/PKGBUILD b/community/kmod/PKGBUILD
deleted file mode 100644
index 94a4def89..000000000
--- a/community/kmod/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Sebastien Luttringer <seblu@aur.archlinux.org>
-
-pkgname=kmod
-pkgver=1
-pkgrel=1
-pkgdesc='A set of tools to handle common tasks with Linux kernel modules'
-arch=('i686' 'x86_64')
-url='http://git.profusion.mobi/cgit.cgi/kmod.git/'
-license=('GPL2')
-options=('!libtool')
-source=("http://packages.profusion.mobi/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('c80f3d430304ad78279353788c18681f')
-
-build() {
- cd $pkgname-$pkgver
- ./configure --prefix=/usr
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/community/kydpdict/ChangeLog b/community/kydpdict/ChangeLog
deleted file mode 100644
index 7ce482c7d..000000000
--- a/community/kydpdict/ChangeLog
+++ /dev/null
@@ -1,9 +0,0 @@
-2008-01-13 Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
- * Fixed man path
-
-2008-01-07 Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
- * Version 0.9.4
- * Added Oxford sounds patch
-
-2007-06-27 tardo <tardo@nagi-fanboi.net>
- * Built for x86_64
diff --git a/community/kydpdict/PKGBUILD b/community/kydpdict/PKGBUILD
deleted file mode 100644
index a11873b14..000000000
--- a/community/kydpdict/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 58593 2011-11-16 14:44:57Z andrea $
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-
-pkgname=kydpdict
-pkgver=0.9.5
-pkgrel=1
-pkgdesc="A front-end to YDP Collins Dictionary"
-arch=('i686' 'x86_64')
-url="http://ytm.bossstation.dnsalias.org/html/kydpdict.html"
-license=('GPL')
-depends=('qt3')
-install=kydpdict.install
-source=(http://ytm.bossstation.dnsalias.org/src/$pkgname-$pkgver.tar.bz2 \
- $pkgname.png $pkgname.desktop)
-md5sums=('bf8aa06d4a3bbe401d7972e01c07609d'
- 'dee4f28a7c681292226d06ab97b39e3e'
- 'e42aed4dde1a7f203586220d04737237')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- . /etc/profile.d/qt3.sh
-
- tar zxf contrib/kydpdict-0.9.3-oxpwnsnd.tar.gz
- patch -Np1 -i kydpdict-0.9.3-oxpwnsnd/kydpdict-0.9.3-pwnoxsnd.patch
-
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
-
- make DESTDIR="$pkgdir" install
-
- install -D -m 644 $srcdir/$pkgname.png $pkgdir/usr/share/pixmaps/$pkgname.png
- install -D -m 644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
- install -D -m 644 contrib/$pkgname.1 $pkgdir/usr/share/man/man1/$pkgname.1
- install -D -m 644 contrib/$pkgname.pl.1 $pkgdir/usr/share/man/pl/man1/$pkgname.1
-
- gcc -O2 -Wall kydpdict-0.9.3-oxpwnsnd/exwaves.c -o $pkgdir/usr/bin/exwaves
-}
diff --git a/community/kydpdict/kydpdict.desktop b/community/kydpdict/kydpdict.desktop
deleted file mode 100644
index 03e3d68ac..000000000
--- a/community/kydpdict/kydpdict.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Kydpdict
-Comment=A front-end to YDP Collins Dictionary
-Exec=kydpdict
-Icon=kydpdict
-Terminal=false
-Type=Application
-Categories=Education;Office;
diff --git a/community/kydpdict/kydpdict.install b/community/kydpdict/kydpdict.install
deleted file mode 100644
index f8ad27310..000000000
--- a/community/kydpdict/kydpdict.install
+++ /dev/null
@@ -1,23 +0,0 @@
-# arg 1: the new package version
-pre_install() {
- /bin/true
-}
-
-# arg 1: the new package version
-post_install() {
- echo
- echo "Oxford sound files support included. Follow these steps to use it:"
- echo "1. Copy wave.wol and wave.000 to /usr/share/kydpdict."
- echo "2. Use exwaves to get sound files in /usr/share/kydpdict/wave."
- echo "3. Configure kydpdict to read sounds from /usr/share/kydpdict/wave."
- echo "4. Set mpg321 as audio player (run 'pacman -S mpg321' if you don't have it)."
- echo "5. Remove wave.wol and wave.000."
- echo
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install
-}
-
diff --git a/community/kydpdict/kydpdict.png b/community/kydpdict/kydpdict.png
deleted file mode 100644
index b15985b80..000000000
--- a/community/kydpdict/kydpdict.png
+++ /dev/null
Binary files differ
diff --git a/community/libast/LICENSE.txt b/community/libast/LICENSE.txt
deleted file mode 100644
index 67c75f783..000000000
--- a/community/libast/LICENSE.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 1997-2004, Michael Jennings
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to
- * deal in the Software without restriction, including without limitation the
- * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies of the Software, its documentation and marketing & publicity
- * materials, and acknowledgment shall be given in the documentation, materials
- * and software packages that this Software was used.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
diff --git a/community/libast/PKGBUILD b/community/libast/PKGBUILD
deleted file mode 100644
index bd2630783..000000000
--- a/community/libast/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 22578 2010-07-23 07:27:13Z lcarlier $
-# Contributor: Andrea Scarpino <bash.lnx@gmail.com>
-# Contributor: Adam 'battlemidget' Stokes <adam.stokes@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=libast
-pkgver=0.7
-pkgrel=3
-pkgdesc="The Library of Assorted Spiffy Things."
-arch=('i686' 'x86_64')
-url="http://eterm.sourceforge.net"
-license=('BSD')
-depends=('imlib2' 'pcre' 'libsm')
-options=('!libtool')
-source=(http://www.eterm.org/download/${pkgname}-${pkgver}.tar.gz LICENSE.txt)
-md5sums=('a9ec3b2da317f35869316e6d9571d296'
- '97071898559acc4f900ceb6cb9579492')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- ./configure --prefix=/usr --with-x
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- make prefix=${pkgdir}/usr install
- install -Dm644 ${srcdir}/LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/community/libcgi/PKGBUILD b/community/libcgi/PKGBUILD
deleted file mode 100644
index 1cbb0ed35..000000000
--- a/community/libcgi/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 21582 2010-07-16 19:26:13Z tdziedzic $
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-
-pkgname=libcgi
-pkgver=1.0
-pkgrel=5
-pkgdesc='A powerful and easy to use library for writing CGI applications in C'
-arch=('i686' 'x86_64')
-url='http://libcgi.sourceforge.net/'
-license=('GPL')
-depends=('glibc')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('110af367081d33c7ed6527a1a60fc274')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- sed -i "s/\(hextable\['e'\] = \)13/\114/" src/cgi.c
-
- #Arch64 Fix
- if [ "$CARCH" = "x86_64" ]; then
- export CFLAGS="$CFLAGS -fPIC"
- export CXXFLAGS="$CFLAGS"
- fi
-
- ./configure \
- --prefix=/usr
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- mkdir -p ${pkgdir}/usr/{lib,include}
-
- make prefix=${pkgdir}/usr install
-}
diff --git a/community/libxnvctrl/PKGBUILD b/community/libxnvctrl/PKGBUILD
deleted file mode 100644
index 0f1a0a2b5..000000000
--- a/community/libxnvctrl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 21605 2010-07-16 19:59:46Z tdziedzic $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Roman Kyrylych <roman@archlinux.org>
-
-pkgname=libxnvctrl
-pkgver=1.16
-pkgrel=2
-pkgdesc='NVCtrl library'
-arch=('i686' 'x86_64')
-url='http://www.nvidia.com/'
-license=('GPL')
-makedepends=('libx11' 'xextproto' 'libxext')
-source=("ftp://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-173.14.05.tar.gz")
-md5sums=('de4794122256d1d2a771c49ce434087a')
-
-build() {
- cd nvidia-settings-1.0/src/libXNVCtrl
-
- [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
-
- make clean
-
- make
-}
-
-package() {
- cd nvidia-settings-1.0/src/libXNVCtrl
-
- install -Dm644 libXNVCtrl.a ${pkgdir}/usr/lib/libXNVCtrl.a
- install -Dm644 NVCtrl.h ${pkgdir}/usr/include/NVCtrl/NVCtrl.h
- install -Dm644 NVCtrlLib.h ${pkgdir}/usr/include/NVCtrl/NVCtrlLib.h
- install -Dm644 nv_control.h ${pkgdir}/usr/include/NVCtrl/nv_control.h
-}
diff --git a/community/linphone/disable-v4l1.patch b/community/linphone/disable-v4l1.patch
deleted file mode 100644
index 9f6cb84d4..000000000
--- a/community/linphone/disable-v4l1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
---- linphone-3.4.3/mediastreamer2/src/Makefile.am 2011-02-09 08:43:11.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am 2011-04-01 14:54:04.000000000 +0000
-@@ -117,7 +117,7 @@
- endif
-
- if BUILD_V4L
--libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
-+libmediastreamer_la_SOURCES+=msv4l2.c
- endif
-
- if BUILD_WIN32
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
---- linphone-3.4.3/mediastreamer2/src/Makefile.in 2011-03-28 18:34:07.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in 2011-04-01 14:55:00.000000000 +0000
-@@ -54,7 +54,7 @@
- @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
- @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
- @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
-@@ -135,7 +135,7 @@
- audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
- msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
- msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
-- aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
-+ aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
- drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
- sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
- h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
-@@ -156,7 +156,7 @@
- @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo
- @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@ drawdib-display.lo
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
-@@ -600,7 +600,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
diff --git a/community/mhwaveedit/PKGBUILD b/community/mhwaveedit/PKGBUILD
deleted file mode 100644
index ce2e82aea..000000000
--- a/community/mhwaveedit/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Loui Chang <louipc.ist@gmail.com>
-# Contributor: Robert Emil Berge <robert@rebi.no>
-
-pkgname=mhwaveedit
-pkgver=1.4.21
-pkgrel=1
-pkgdesc="A graphical program for editing, playing and recording sound files"
-arch=('i686' 'x86_64')
-url="http://gna.org/projects/mhwaveedit"
-license=('GPL')
-depends=('libsamplerate' 'libpulse' 'gtk2' 'jack')
-source=(http://download.gna.org/$pkgname/$pkgname-$pkgver.tar.bz2)
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --without-check-casts --without-arts --without-esound \
- --without-portaudio --without-sun --without-sdl --prefix=/usr
- make
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir install
-}
-md5sums=('02d4dddcb19731ff1fca961ed7d507dc')
diff --git a/community/microblog-purple/PKGBUILD b/community/microblog-purple/PKGBUILD
deleted file mode 100644
index 4e933b3d7..000000000
--- a/community/microblog-purple/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# $Id: PKGBUILD 18639 2010-06-10 11:06:23Z ibiru $
-# Maintainer: Biru Ionut <biru.ionut at gmail.com>
-pkgname=microblog-purple
-pkgver=0.3.0
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc='Libpurple plug-in supporting microblog services like Twitter'
-url='http://code.google.com/p/microblog-purple/'
-license=('GPL3')
-depends=('pidgin')
-source=(http://microblog-purple.googlecode.com/files/mbpurple-$pkgver.tar.gz)
-md5sums=('75def8fb2acf17f9fc25f27d7583810d')
-
-build(){
- cd ${srcdir}/mbpurple-${pkgver}
-
- make || return 1
- make DESTDIR=${pkgdir} install || return 1
-
-}
diff --git a/community/mms_client/PKGBUILD b/community/mms_client/PKGBUILD
deleted file mode 100644
index 14854aea0..000000000
--- a/community/mms_client/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 55506 2011-09-13 21:16:22Z ebelanger $
-# Contributor: William Rea <sillywilly@gmail.com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=mms_client
-pkgver=0.0.3
-pkgrel=5
-pkgdesc="mms protocol download utility"
-arch=('i686' 'x86_64')
-url="http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/"
-license=('GPL')
-depends=('glibc')
-#source=(http://ole.tange.dk/projekter/kontroversielt/www.geocities.com/majormms/mms_client-0.0.3.tar.gz
-source=(http://web.archive.org/web/20071011022352/http://geocities.com/majormms/mms_client-0.0.3.tar.gz
- mmsclient-0.0.3-fbsd.patch \
- mmsclient-0.0.3-r1.patch)
-md5sums=('c91171a0bbbfb94290d362e907432787'
- '8b1f4c95b4b13abd91d2c7c4ba51ea23'
- 'b85485058a26b3a0881639bc02de71cb')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p0 -i ../mmsclient-0.0.3-fbsd.patch
- patch -p1 -i ../mmsclient-0.0.3-r1.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mms_client/mmsclient-0.0.3-fbsd.patch b/community/mms_client/mmsclient-0.0.3-fbsd.patch
deleted file mode 100644
index 68904d616..000000000
--- a/community/mms_client/mmsclient-0.0.3-fbsd.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- client.c.orig Sat Dec 29 09:40:48 2001
-+++ client.c Mon Mar 4 21:42:05 2002
-@@ -277,12 +277,12 @@
- int packet_len, command;
- char data[BUF_SIZE];
-
-- if (!get_data (s, &packet_len, 4)) {
-+ if (!get_data (s, (char *)&packet_len, 4)) {
- printf ("packet_len read failed\n");
- return 0;
- }
-
-- packet_len = get_32 (&packet_len, 0) + 4;
-+ packet_len = get_32 ((unsigned char *)&packet_len, 0) + 4;
-
- printf ("command packet detected, len=%d\n",
- packet_len);
-@@ -308,7 +308,7 @@
- int interp_header (uint8_t *header, int header_len) {
-
- int i;
-- int packet_length;
-+ int packet_length = 0;
-
- /*
- * parse header
-@@ -416,12 +416,12 @@
-
- int packet_len, command;
-
-- if (!get_data (s, &packet_len, 4)) {
-+ if (!get_data (s, (char *)&packet_len, 4)) {
- printf ("packet_len read failed\n");
- return 0;
- }
-
-- packet_len = get_32 (&packet_len, 0) + 4;
-+ packet_len = get_32 ((unsigned char *)&packet_len, 0) + 4;
-
- printf ("command packet detected, len=%d\n",
- packet_len);
diff --git a/community/mms_client/mmsclient-0.0.3-r1.patch b/community/mms_client/mmsclient-0.0.3-r1.patch
deleted file mode 100644
index 44577643b..000000000
--- a/community/mms_client/mmsclient-0.0.3-r1.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff -u mms_client-0.0.3/Makefile.in mms_client-0.0.4/Makefile.in
---- mms_client-0.0.3/Makefile.in 2002-01-21 18:51:31.000000000 -0800
-+++ mms_client-0.0.4/Makefile.in 2004-04-17 15:57:10.241509408 -0700
-@@ -85,7 +85,7 @@
- mmsclient_DEPENDENCIES =
- mmsclient_LDFLAGS =
- CFLAGS = @CFLAGS@
--COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) "-DVERSION=\"$(VERSION)\""
- CCLD = $(CC)
- LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
- HEADERS = $(noinst_HEADERS)
-diff -u mms_client-0.0.3/README mms_client-0.0.4/README
---- mms_client-0.0.3/README 2001-10-09 16:09:36.000000000 -0700
-+++ mms_client-0.0.4/README 2004-04-17 17:16:29.204037136 -0700
-@@ -0,0 +1,2 @@
-+mmsclient downloads MMS (Microsoft Media Server) streams, and
-+saves them to disk.
-diff -u mms_client-0.0.3/client.c mms_client-0.0.4/client.c
---- mms_client-0.0.3/client.c 2001-12-28 19:40:48.000000000 -0800
-+++ mms_client-0.0.4/client.c 2004-04-17 17:02:06.409201888 -0700
-@@ -5,6 +5,9 @@
- * mms://193.159.244.12/n24_wmt_mid
- */
-
-+#define HELPINFO "Usage: mmsclient mms://<url>\n -v --version\n\tPrint version information\n -h --help\n\tPrint this page\nhttp://www.geocities.com/majormms/\n"
-+
-+
- #include <unistd.h>
- #include <stdio.h>
- #include <assert.h>
-@@ -475,23 +478,44 @@
- char *path, *url, *file, *cp;
-
- if (argc != 2) {
-- printf ("usage: %s url\n", argv[0]);
-+ printf ("Usage: %s URL\n", argv[0]);
- exit(1);
- }
--
-+
-+ /* check for non-url arguments (version or help ...) */
-+ if (strncmp(argv[1], "mms://", 6) == 0 && argv[1][6] == 0){ /* Just typed "mms://" with no URL */
-+ printf("Error: No URL\n");
-+ exit(1);
-+ }
-+ if (strncmp(argv[1], "mms://", 6) != 0){ /* haven't typed a url */
-+
-+ if (strncmp(argv[1], "--version", 9) == 0 || strncmp(argv[1], "-v", 9) == 0){
-+ printf("%s\n", VERSION);
-+ }else if (strncmp(argv[1], "--help", 9) == 0 || strncmp(argv[1], "-h", 9) == 0){
-+ printf("%s\n", HELPINFO);
-+ }else{
-+ printf("Error: unrecognized command %s\n", argv[1]);
-+ }
-+ exit(1);
-+ }
-+
- /* parse url */
-
- url = argv[1];
- strncpy (host, &url[6], 255);
- cp = strchr(host,'/');
-- *cp= 0;
-+ if(cp == 0){ /* If they just typed a top level domain name */
-+ printf("Error: Incomplete URL '%s'\n", &url[6]);
-+ exit(1);
-+ }
-+ *cp= 0; /* Make the '/' a null */
-
- printf ("host : >%s<\n", host);
-
- path = strchr(&url[6], '/') +1;
-
- printf ("path : >%s<\n", path);
--
-+
- file = strrchr (url, '/');
-
- printf ("file : >%s<\n", file);
-diff -u mms_client-0.0.3/configure mms_client-0.0.4/configure
---- mms_client-0.0.3/configure 2002-01-21 18:50:51.000000000 -0800
-+++ mms_client-0.0.4/configure 2004-04-17 16:47:01.126825728 -0700
-@@ -694,7 +694,7 @@
-
- PACKAGE="mms_client"
-
--VERSION=0.0.3
-+VERSION=0.0.4
-
- if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
- { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff --git a/community/mplayer2/PKGBUILD b/community/mplayer2/PKGBUILD
deleted file mode 100644
index 74f14d424..000000000
--- a/community/mplayer2/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 58413 2011-11-12 17:18:14Z ibiru $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Bartek Piotrowski <barthalion@gmail.com>
-
-pkgname=mplayer2
-pkgver=2.0.20111101
-pkgrel=1
-pkgdesc="A movie player"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.mplayer2.org/"
-depends=('libgl' 'libvdpau' 'ffmpeg' 'libdvdcss' 'libdvdread' 'libdvdnav' 'libxvmc' 'libass' 'fontconfig' 'freetype2'
- 'ttf-dejavu' 'sdl' 'aalib' 'libcaca' 'faad2' 'libpulse' 'jack' 'ncurses' 'libxxf86vm' 'cdparanoia' 'libmad'
- 'a52dec' 'libdca' 'libxxf86dga' 'libxss' 'mpg123' 'ladspa')
-makedepends=('live-media' 'mesa' 'unzip' 'yasm' 'git')
-backup=('etc/mplayer/codecs.conf' 'etc/mplayer/input.conf')
-provides=('mplayer')
-conflicts=('mplayer')
-#source=(http://ftp.mplayer2.org/pub/release/${pkgname}-${pkgver/_/-}.tar.xz
-source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('78c78605733ca792bb12a52a751a508bfc0f213d')
-options=('!emptydirs')
-
-# source PKGBUILD && mksource
-mksource() {
- _gitroot="git://git.mplayer2.org/mplayer2.git"
- _gitname="${pkgname}-${pkgver}"
-
- if [[ -d "$_gitname" ]]; then
- cd "$_gitname" && git pull origin
- else
- git clone "$_gitroot" "$_gitname"
- fi
-
- tar -cJvf ${_gitname}.tar.xz ${_gitname}
- rm -fr ${_gitname}
-}
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --enable-runtime-cpudetection \
- --disable-arts \
- --disable-speex \
- --disable-openal \
- --disable-libdv \
- --disable-musepack \
- --disable-esd \
- --disable-mga \
- --language=all \
- --enable-translation \
- --confdir=/etc/mplayer
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
- install -Dm644 etc/{codecs.conf,input.conf,example.conf} "${pkgdir}"/etc/mplayer/
- install -dm755 "${pkgdir}"/usr/share/mplayer/
- ln -s /usr/share/fonts/TTF/DejaVuSans.ttf "${pkgdir}"/usr/share/mplayer/subfont.ttf
-
- install -dm755 "${pkgdir}"/usr/share/applications/
- install -m 644 etc/mplayer.desktop "${pkgdir}"/usr/share/applications/
-}
diff --git a/community/multiget/PKGBUILD b/community/multiget/PKGBUILD
deleted file mode 100644
index d2d16bb51..000000000
--- a/community/multiget/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 59362 2011-11-23 20:36:41Z andrea $
-# Maintainer:
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Allan McRae <mcrae_allan@hotmail.com>
-
-pkgname=multiget
-pkgver=3
-pkgrel=1
-pkgdesc="Easy to use GUI file downloader - svn version"
-url="http://multiget.sourceforge.net"
-license=('GPL')
-depends=('wxgtk' 'libglade')
-makedepends=('intltool' 'svn')
-arch=('i686' 'x86_64')
-_svntrunk=https://multiget.svn.sourceforge.net/svnroot/multiget
-_svnmod=multiget
-
-build() {
-cd "$srcdir"
-
- if [ -d $_svnmod/.svn ]; then
- (cd $_svnmod && svn up -r $pkgver)
- else
- svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- fi
- [ -d "$srcdir/$_svnmod-build" ] && rm -rf "$srcdir/$_svnmod-build"
- cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
- cd "$srcdir/$_svnmod-build"
-
- ./autogen.sh --prefix=/usr --docdir=/usr/share/doc/${_svnmod}
- make
-}
-
-package() {
- cd ${srcdir}/$_svnmod-build
- make DESTDIR=${pkgdir} install
-
- install -Dm644 ${srcdir}/${_svnmod}-build/data/multiget.desktop \
- ${pkgdir}/usr/share/applications/multiget.desktop
- install -Dm644 ${srcdir}/${_svnmod}-build/newicons/48/logo_48.xpm \
- ${pkgdir}/usr/share/pixmaps/multiget.xpm
- mv $pkgdir/usr/doc/${_svnmod} $pkgdir/usr/share/doc
- rmdir $pkgdir/usr/doc
-}
diff --git a/community/multiget/multiget.desktop b/community/multiget/multiget.desktop
deleted file mode 100644
index dd2caf52d..000000000
--- a/community/multiget/multiget.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=MultiGet
-Exec=multiget
-Terminal=false
-Type=Application
-Icon=multiget
-StartupNotify=true
-Categories=Network;
diff --git a/community/multimux/PKGBUILD b/community/multimux/PKGBUILD
deleted file mode 100644
index 356757a89..000000000
--- a/community/multimux/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# Contributor: Jaroslaw Swierczynski <swiergot@juvepoland.com>
-# Contributor: Shadowhand <woody.gilk@gmail.com>
-
-pkgname=multimux
-pkgver=0.2.5.2
-pkgrel=1
-pkgdesc='Combines up to 8 audio mono wave channels into one big multi channel wave file'
-url='http://panteltje.com/panteltje/dvd/'
-license=('GPL')
-arch=('i686' 'x86_64')
-source=("http://panteltje.com/panteltje/dvd/${pkgname}-${pkgver}.tgz")
-md5sums=('a16531945db4eec67563fa8bfa143193')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- install -d ${pkgdir}/usr/bin
-
- sed -i "s|/usr/local/bin|${pkgdir}/usr/bin|g" Makefile
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make install
-}
diff --git a/community/musescore/PKGBUILD b/community/musescore/PKGBUILD
deleted file mode 100644
index 8365828b8..000000000
--- a/community/musescore/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 58526 2011-11-13 15:57:02Z andrea $
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de
-# Contributor: Cristian Maureira <saint [at] archlinux.cl>
-# Contributor: Dr.Egg <rwhite @ archlinux . us>
-
-pkgname=musescore
-pkgver=1.1
-pkgrel=2
-pkgdesc="A music score editor written in Qt"
-arch=('i686' 'x86_64')
-url="http://www.musescore.org/en/"
-license=('GPL')
-depends=('qt' 'libsndfile' 'qtscriptgenerator')
-makedepends=('cmake' 'doxygen')
-optdepends=('portaudio' 'jack')
-install=musescore.install
-source=("http://downloads.sourceforge.net/mscore/mscore-${pkgver}.tar.bz2"
- 'paths.patch')
-md5sums=('68b43af92093a16f7f074c0eb560a867'
- 'e5011154d217f633f21b4bb70e589510')
-
-build() {
- cd $srcdir/mscore-${pkgver}
- export QT_PLUGINS_DIR=/usr/lib/qt/plugins
- [ -d build ] && make clean
- patch -p1 < $srcdir/paths.patch
- sed -i 's+${Mscore_INSTALL_NAME}man+doc/mscore+' \
- "$srcdir"/mscore-$pkgver/mscore/manual/CMakeLists.txt
- sed -i 's+BUILD_SCRIPTGEN TRUE+BUILD_SCRIPTGEN FALSE+' \
- "$srcdir"/mscore-$pkgver/mscore/CMakeLists.txt
- sed -i 's+static_cast<const+static_cast<+' \
- $srcdir/mscore-$pkgver/mscore/mscore/exportxml.cpp
- make PREFIX=/usr release
-}
-package() {
- cd $srcdir/mscore-${pkgver}
- make DESTDIR="$pkgdir" install
-}
diff --git a/community/musescore/musescore.install b/community/musescore/musescore.install
deleted file mode 100644
index d6abb5470..000000000
--- a/community/musescore/musescore.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/community/musescore/paths.patch b/community/musescore/paths.patch
deleted file mode 100644
index 98bf4b3d5..000000000
--- a/community/musescore/paths.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Naur musescore-svn.orig//mscore/mscore/mscore.cpp musescore-svn.new//mscore/mscore/mscore.cpp
---- musescore-svn.orig//mscore/mscore/mscore.cpp 2010-06-16 23:10:27.000000000 +0200
-+++ musescore-svn.new//mscore/mscore/mscore.cpp 2010-06-16 23:13:59.000000000 +0200
-@@ -897,15 +897,15 @@
- if (debugMode)
- printf("open handbook for language <%s>\n", qPrintable(lang));
-
-- QFileInfo mscoreHelp(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
-+ QFileInfo mscoreHelp(mscoreGlobalShare + QString("../doc/musescore/MuseScore-") + lang + QString(".pdf"));
- if (!mscoreHelp.isReadable()) {
- if (debugMode) {
- printf("cannot open doc <%s>\n", qPrintable(mscoreHelp.filePath()));
- }
- lang = lang.left(2);
-- mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-") + lang + QString(".pdf"));
-+ mscoreHelp.setFile(mscoreGlobalShare + QString("../doc/mscore/MuseScore-") + lang + QString(".pdf"));
- if(!mscoreHelp.isReadable()){
-- mscoreHelp.setFile(mscoreGlobalShare + QString("man/MuseScore-en.pdf"));
-+ mscoreHelp.setFile(mscoreGlobalShare + QString("../doc/mscore/MuseScore-en.pdf"));
- if (!mscoreHelp.isReadable()) {
- QString info(tr("MuseScore handbook not found at: \n"));
- info += mscoreHelp.filePath();
diff --git a/community/mysql-ruby/PKGBUILD b/community/mysql-ruby/PKGBUILD
deleted file mode 100644
index 134963291..000000000
--- a/community/mysql-ruby/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 42318 2011-03-16 11:01:28Z jelle $
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-# Contributor: Markku <rasat@user-contributions.org>
-
-pkgname=mysql-ruby
-pkgver=2.8.2
-pkgrel=2
-pkgdesc='This is the MySQL API module for Ruby.'
-arch=('i686' 'x86_64')
-license=('GPL')
-url='http://tmtm.org/downloads/mysql/ruby'
-depends=('ruby' 'libmysqlclient')
-source=("http://tmtm.org/downloads/mysql/ruby/${pkgname}-${pkgver}.tar.gz")
-md5sums=('eb998b89b7e391cffe0a1f84bd426f9b')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- ruby extconf.rb
-
- ruby extconf.rb --with-mysql-config
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-}
diff --git a/community/mysql-workbench/ArchLinux.xml b/community/mysql-workbench/ArchLinux.xml
deleted file mode 100644
index 821490739..000000000
--- a/community/mysql-workbench/ArchLinux.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-
-<data>
- <value type="dict">
- <value type="string" key="sys.config.path">/etc/mysql/my.cnf</value>
- <value type="string" key="sys.config.section">mysqld</value>
-
- <value type="string" key="sys.mysqld.start">/etc/rc.d/mysqld start</value>
- <value type="string" key="sys.mysqld.stop">/etc/rc.d/mysqld stop</value>
- <value type="string" key="sys.mysqld.status">ps -C mysqld -o pid=</value>
- <value type="int" key="sys.usesudo">1</value>
- <value type="int" key="sys.usesudostatus">0</value>
- <value type="string" key="sys.sudo">/usr/bin/sudo -p EnterPasswordHere /bin/sh -c</value>
-
- <value type="string" key="sys.system">Linux</value>
- <value type="string" key="serverVersion">5.5</value>
- </value>
-</data>
diff --git a/community/mysql-workbench/PKGBUILD b/community/mysql-workbench/PKGBUILD
deleted file mode 100644
index 9de54538e..000000000
--- a/community/mysql-workbench/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# $Id: PKGBUILD 60120 2011-12-05 17:20:12Z ibiru $
-# Maintainer:
-# Contributor : Ionut Biru <ibiru@archlinux.org>
-# Contributor: totoloco <totoloco at gmail _dot_com>
-
-pkgname=mysql-workbench
-epoch=1
-pkgver=5.2.36
-pkgrel=1
-pkgdesc="A cross-platform, visual database design tool developed by MySQL"
-arch=('i686' 'x86_64')
-url="http://wb.mysql.com/"
-license=('GPL2')
-depends=('libzip' 'libmysqlclient' 'lua' 'gtkmm' 'libgl'
- 'libsigc++' 'python-paramiko' 'python-pexpect' 'libgnome-keyring')
-makedepends=('boost' 'curl' 'mesa' 'python-sphinx')
-options=('!libtool')
-source=(ftp://ftp.gwdg.de/pub/misc/mysql/Downloads/MySQLGUITools/${pkgname}-gpl-${pkgver}-src.tar.gz
- ArchLinux.xml arch.patch python27.patch gcc46.patch)
-md5sums=('7408d80ddb647a7d5a8749b0ecad9620'
- 'c2f986cd5737413d020c55db32713c48'
- '23430d24400fd65c9fd872bd8e2411e5'
- 'a3efb373bd85d876530a29bf1780fb6b'
- '43917ebc79794ba15a64f7ba820fa20b')
-
-build() {
- cd "${srcdir}/${pkgname}-gpl-${pkgver}-src"
-
- cp "${srcdir}/ArchLinux.xml" res/mysql.profiles
- patch -Np1 -i ${srcdir}/arch.patch
-
- patch -Np1 -i ${srcdir}/python27.patch
- patch -Np1 -i ${srcdir}/gcc46.patch
-
- ./autogen.sh --prefix=/usr --with-bundled-ctemplate \
- --disable-debug --disable-static
- make
-
- pushd ext/mysql-utilities
- python2 setup.py build
- popd
-
- pushd ext/connector-python
- python2 setup.py build
- popd
-}
-
-package() {
- cd "${srcdir}/${pkgname}-gpl-${pkgver}-src"
-
- make DESTDIR="${pkgdir}" install
-
- pushd ext/mysql-utilities
- python2 setup.py install --skip-profile --root $pkgdir --prefix=/usr --optimize=1
- popd
-
- pushd ext/connector-python
- python2 setup.py install --root $pkgdir --prefix=/usr --optimize=1
-
- sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- -e "s|#![ ]*/bin/env python$|#!/usr/bin/env python2|" \
- $(find ${pkgdir} -name '*.py')
-}
diff --git a/community/mysql-workbench/arch.patch b/community/mysql-workbench/arch.patch
deleted file mode 100644
index 9f244e5f0..000000000
--- a/community/mysql-workbench/arch.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -Nur mysql-workbench-gpl-5.2.25/res/mysql.profiles/Makefile.am mysql-workbench-gpl-5.2.25a/res/mysql.profiles/Makefile.am
---- mysql-workbench-gpl-5.2.25/res/mysql.profiles/Makefile.am 2010-06-30 11:14:27.000000000 -0500
-+++ mysql-workbench-gpl-5.2.25a/res/mysql.profiles/Makefile.am 2010-07-04 21:36:34.425999721 -0500
-@@ -2,6 +2,7 @@
- workbenchdir=$(pkgdatadir)/mysql.profiles
-
- workbench_DATA=\
-+ArchLinux.xml\
- Fedora_Linux_(MySQL_Package).xml\
- Fedora_Linux_(Vendor_Package).xml\
- FreeBSD_(MySQL_Package).xml\
-diff -Nur mysql-workbench-gpl-5.2.25/res/mysql.profiles/Makefile.in mysql-workbench-gpl-5.2.25a/res/mysql.profiles/Makefile.in
---- mysql-workbench-gpl-5.2.25/res/mysql.profiles/Makefile.in 2010-06-30 11:14:38.000000000 -0500
-+++ mysql-workbench-gpl-5.2.25a/res/mysql.profiles/Makefile.in 2010-07-04 21:36:59.396862401 -0500
-@@ -213,6 +213,7 @@
- top_srcdir = @top_srcdir@
- workbenchdir = $(pkgdatadir)/mysql.profiles
- workbench_DATA = \
-+ArchLinux.xml\
- Fedora_Linux_(MySQL_Package).xml\
- Fedora_Linux_(Vendor_Package).xml\
- FreeBSD_(MySQL_Package).xml\
diff --git a/community/mysql-workbench/gcc46.patch b/community/mysql-workbench/gcc46.patch
deleted file mode 100644
index 6a0d2cd97..000000000
--- a/community/mysql-workbench/gcc46.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur mysql-workbench-gpl-5.2.34-src.orig/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in mysql-workbench-gpl-5.2.34-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in
---- mysql-workbench-gpl-5.2.34-src.orig/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-26 09:33:54.128803186 +0000
-+++ mysql-workbench-gpl-5.2.34-src/ext/ctemplate/ctemplate-src/src/ctemplate/template_dictionary.h.in 2011-05-26 09:34:45.312611839 +0000
-@@ -54,6 +54,7 @@
- #include <map>
- #include <string>
- #include <vector>
-+#include <cstddef>
- #include <ctemplate/template_dictionary_interface.h>
- #include <ctemplate/template_string.h>
- #include <ctemplate/template_modifiers.h>
diff --git a/community/mysql-workbench/python27.patch b/community/mysql-workbench/python27.patch
deleted file mode 100644
index 4f70afe57..000000000
--- a/community/mysql-workbench/python27.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nur mysql-workbench-gpl-5.2.36-src.old/configure.in mysql-workbench-gpl-5.2.36-src/configure.in
---- mysql-workbench-gpl-5.2.36-src.old/configure.in 2011-12-05 15:04:56.894410445 +0000
-+++ mysql-workbench-gpl-5.2.36-src/configure.in 2011-12-05 15:05:45.818268997 +0000
-@@ -245,13 +245,13 @@
- AC_CHECK_PROG(PYTHON27, python2.7, [yes])
- # Python headers
- AC_MSG_CHECKING(for Python libraries)
--PYTHON_LIBS=[$(python -c "from distutils import sysconfig
-+PYTHON_LIBS=[$(python2 -c "from distutils import sysconfig
- import os
- cfg=sysconfig.get_config_vars()
- lib = os.path.join(cfg['LIBDIR'], cfg['LDLIBRARY'])
- if os.path.exists(lib):
- print \"-L\" + cfg['LIBDIR'] + \" -l\" + cfg['LDLIBRARY'].lstrip(\"lib\").rstrip(\".so\")")]
--PYTHON_CFLAGS=[$(python -c "from distutils import sysconfig
-+PYTHON_CFLAGS=[$(python2 -c "from distutils import sysconfig
- print sysconfig.get_python_inc()")]
- PYTHON_CFLAGS="-I$PYTHON_CFLAGS"
- if test "$PYTHON_LIBS" = ""; then
diff --git a/community/nas/PKGBUILD b/community/nas/PKGBUILD
deleted file mode 100644
index 62c62ddf0..000000000
--- a/community/nas/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 53530 2011-08-05 06:06:18Z bfanella $
-# Maintainer: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=nas
-pkgver=1.9.3
-pkgrel=1
-pkgdesc='Network Audio System is a network transparent, client/server audio transport system'
-arch=('i686' 'x86_64')
-url='http://radscan.com/nas.html'
-license=('custom')
-depends=('libxaw')
-makedepends=('imake')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.src.tar.gz"
- 'license.txt')
-md5sums=('ecd01a3b4e17a9d464efa83a03618025'
- 'f11eb8c3fb83946e66e60f7532e8d5da')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- xmkmf
- make World
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR=${pkgdir} USRLIBDIR=/usr/lib install
- chmod 644 ${pkgdir}/usr/include/audio/*
- install -D -m644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}/license
-}
diff --git a/community/nas/license.txt b/community/nas/license.txt
deleted file mode 100644
index 6cfa36e6b..000000000
--- a/community/nas/license.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-
- Copyright 1995 Network Computing Devices, Inc.
-
- Permission to use, copy, modify, distribute, and sell this software and
- its documentation for any purpose is hereby granted without fee, provided
- that the above copyright notice appear in all copies and that both that
- copyright notice and this permission notice appear in supporting
- documentation, and that the name Network Computing Devices, Inc. not be
- used in advertising or publicity pertaining to distribution of this
- software without specific, written prior permission.
-
- THIS SOFTWARE IS PROVIDED `AS-IS'. NETWORK COMPUTING DEVICES, INC.,
- DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT
- LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- PARTICULAR PURPOSE, OR NONINFRINGEMENT. IN NO EVENT SHALL NETWORK
- COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING
- SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE, DATA,
- OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND REGARDLESS OF
- WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE, ARISING OUT OF OR IN
- CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-Translation: You can do whatever you want with this software!
diff --git a/community/nginx/changelog b/community/nginx/changelog
deleted file mode 100644
index 9f2ffcfc8..000000000
--- a/community/nginx/changelog
+++ /dev/null
@@ -1,4 +0,0 @@
-2011-08-29 Sergej Pupykin <sergej@p5n.pp.ru>
-
- * 1.0.6-1 :
- move /srv/http to /usr/share/nginx/http
diff --git a/community/nsd/nsd.install b/community/nsd/nsd.install
deleted file mode 100644
index 274ce0beb..000000000
--- a/community/nsd/nsd.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install () {
- getent group nsd &>/dev/null || groupadd -r nsd >/dev/null
- getent passwd nsd &>/dev/null || useradd -r -g nsd -d /dev/null -s /bin/false -c nsd nsd >/dev/null
- chown nsd:nsd /var/db/nsd
- chmod 700 /var/db/nsd
- install -o nsd -d /var/run/nsd
- cat <<EOF
-==> First write a /etc/nsd/nsd.conf (see /etc/nsd/nsd.conf.sample)
-==> Next, start with: /etc/rc.d/nsd rebuild; /etc/rc.d/nsd start
-EOF
-}
-
-pre_remove() {
- /etc/rc.d/nsd stop
-}
-
-post_remove() {
- getent passwd nsd &>/dev/null && userdel nsd >/dev/null
- getent group nsd &>/dev/null && groupdel nsd >/dev/null
-}
diff --git a/community/ocaml-extlib/PKGBUILD b/community/ocaml-extlib/PKGBUILD
deleted file mode 100644
index 42af092f3..000000000
--- a/community/ocaml-extlib/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# Maintainer: Thomas S Hatch <thatch45 at gmail dot com>
-# Contributor: Massimiliano Brocchini <brocchini@netseven.it>
-
-pkgname=ocaml-extlib
-pkgver=1.5.1
-pkgrel=4
-pkgdesc="Extends the OCaml standard library"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/ocaml-extlib/"
-license=('LGPL')
-depends=('ocaml')
-makedepends=('ocaml-findlib')
-source=(http://ocaml-extlib.googlecode.com/files/extlib-${pkgver}.tar.gz)
-md5sums=('8dc2944cbf63141347956bd353893d75')
-
-_OCAMLFIND_DESTDIR="${pkgdir}/usr/lib/ocaml"
-_DOCDIR="${pkgdir}/usr/share/doc/ocaml-extlib"
-
-build() {
- cd ${srcdir}/extlib-${pkgver}
- make all
- make opt
- sed -i 's/cp odoc_style.css/#cp odoc_style.css/g' Makefile
- sed -i 's/ocamldoc -sort -html/ocamldoc -sort -keep-code -html -colorize-code/g' Makefile
- make doc
-}
-
-package () {
- cd ${srcdir}/extlib-${pkgver}
- mkdir -p $_OCAMLFIND_DESTDIR/extlib
- mkdir -p $_DOCDIR
- install -m 0644 *.{a,cmxa,cma,cmi,cmo,mli,cmx,ml} $_OCAMLFIND_DESTDIR/extlib
- install -m 0644 META.txt $_OCAMLFIND_DESTDIR/extlib/META
- cp -r doc/* $_DOCDIR/
-}
diff --git a/community/ocaml-ounit/PKGBUILD b/community/ocaml-ounit/PKGBUILD
deleted file mode 100644
index 1ac2c7445..000000000
--- a/community/ocaml-ounit/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Thomas S Hatch <thatch45 at gmail dot com>
-# Contributor: Sebastian Wiesner <lunaryorn googlemail com>
-# Contributor: Benjamin Andresen <benny(at)klapmuetz(dot)org>
-# Sylvester Johansson <syljo361(at)gmail(dot)org>
-pkgname=ocaml-ounit
-pkgver=1.1.0
-pkgrel=4
-arch=('i686' 'x86_64')
-license=('MIT')
-pkgdesc="Unit testing framework for OCaml"
-url="http://ounit.forge.ocamlcore.org/index.php"
-depends=('ocaml')
-makedepends=('ocaml-findlib')
-options=('!strip')
-source=("https://forge.ocamlcore.org/frs/download.php/495/ounit-${pkgver}.tar.gz")
-md5sums=('bf82bd7f8853cd9a1aff7be716192643')
-
-_OCAMLFIND_DESTDIR="${pkgdir}/usr/lib/ocaml"
-
-build() {
- cd "${srcdir}/ounit-${pkgver}"
- ocaml setup.ml -configure --destdir "${pkgdir}"
- ocaml setup.ml -build
-}
-
-package() {
- cd "${srcdir}/ounit-${pkgver}"
- mkdir -p $_OCAMLFIND_DESTDIR
- env OCAMLFIND_DESTDIR=$_OCAMLFIND_DESTDIR \
- ocaml setup.ml -install
- install -Dm 644 LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE.txt
-}
diff --git a/community/paraview/fixkernelversioncheck.diff b/community/paraview/fixkernelversioncheck.diff
deleted file mode 100644
index 165f07366..000000000
--- a/community/paraview/fixkernelversioncheck.diff
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Utilities/vtkhdf5/ConfigureChecks.cmake
-+++ b/Utilities/vtkhdf5/ConfigureChecks.cmake
-@@ -75,14 +75,14 @@ IF (HDF5_WANT_DCONV_EXCEPTION)
- ENDIF (HDF5_WANT_DCONV_EXCEPTION)
-
- SET (LINUX_LFS 0)
--IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+IF (CMAKE_SYSTEM MATCHES "Linux")
- # Linux Specific flags
- ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE)
- OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON)
- IF (HDF5_ENABLE_LARGE_FILE)
- SET (LARGEFILE 1)
- ENDIF (HDF5_ENABLE_LARGE_FILE)
--ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.")
-+ENDIF (CMAKE_SYSTEM MATCHES "Linux")
- SET (HDF5_EXTRA_FLAGS)
- IF (LINUX_LFS)
- SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE)
diff --git a/community/pcb/PKGBUILD b/community/pcb/PKGBUILD
deleted file mode 100644
index cb0b68aeb..000000000
--- a/community/pcb/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id$
-
-# Contributor: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Jared Casper <jaredcasper@gmail.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=pcb
-pkgver=20110918
-pkgrel=2
-pkgdesc='Interactive printed circuit board editor'
-url='http://pcb.gpleda.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('gtkglext' 'gd' 'hicolor-icon-theme')
-optdepends=('tk: additional tools'
- 'tcl: additional tools'
- 'perl: additional tools')
-makedepends=('intltool' 'tk')
-source=("http://downloads.sourceforge.net/pcb/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('53ca27797d4db65a068b56f157e3ea6c5c29051f')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure \
- --prefix=/usr \
- --enable-dbus \
- --disable-update-mime-database \
- --disable-update-desktop-database
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make -j1 prefix="${pkgdir}"/usr install
-
- rm "${pkgdir}"/usr/share/info/dir
- rm "${pkgdir}"/usr/include/gts.h
- rm "${pkgdir}"/usr/lib/libgts.a
- rmdir "${pkgdir}"/usr/include
- rmdir "${pkgdir}"/usr/lib
-}
diff --git a/community/pcb/install b/community/pcb/install
deleted file mode 100644
index 62ce80440..000000000
--- a/community/pcb/install
+++ /dev/null
@@ -1,37 +0,0 @@
-infodir=/usr/share/info
-filelist=(pcb.info pcb.info-1 pcb.info-2)
-
-post_install() {
- if [ -x /usr/bin/update-mime-database ]; then
- echo Updating mime database...
- /usr/bin/update-mime-database /usr/share/mime
- fi
- if [ -x /usr/bin/update-desktop-database ]; then
- echo Updating desktop database..
- /usr/bin/update-desktop-database /usr/share/applications
- fi
- if [ -x /usr/bin/install-info ]; then
- echo Updating info directory...
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
- fi
- /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- if [ -x /usr/bin/install-info ]; then
- echo Updating info directory...
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
- fi
-}
-
-post_remove() {
- /usr/bin/gtk-update-icon-cache -f -t /usr/share/icons/hicolor
-}
diff --git a/community/pdftrans/PKGBUILD b/community/pdftrans/PKGBUILD
deleted file mode 100644
index 59a1970a2..000000000
--- a/community/pdftrans/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-
-pkgname=pdftrans
-pkgver=1.2
-pkgrel=7
-arch=('i686' 'x86_64')
-pkgdesc="A utility to add metadata, protect, and encrypt PDF documents"
-url="http://maddingue.free.fr/softwares/pdftrans.html.en"
-license=('GPL')
-depends=('java-runtime' 'itext' 'bcprov')
-source=(http://maddingue.free.fr/softwares/download/PDFTrans/$pkgname-$pkgver.zip \
- $pkgname.sh)
-md5sums=('1d3677f7101ba5e27492b02843017d26' '1be06ba6669dfd895aadbd308f37715a')
-
-build() {
- install -D $pkgname.sh $pkgdir/usr/bin/$pkgname
-
- cd $pkgname
-
- # fix http://bugs.archlinux.org/task/19295 FS#19295 - [pdftrans] needs updating to follow itext java class renaming
- sed 's/lowagie/itextpdf/' -i src/PDFTrans.java
- javac -classpath /usr/share/java/itext/itext.jar -d classes src/PDFTrans.java
-
- install -D -m644 classes/PDFTrans.class $pkgdir/usr/share/java/$pkgname/PDFTrans.class
- install -D -m644 doc/pdftrans.1 $pkgdir/usr/share/man/man1/pdftrans.1
-}
diff --git a/community/pdftrans/pdftrans.sh b/community/pdftrans/pdftrans.sh
deleted file mode 100755
index bf6c88161..000000000
--- a/community/pdftrans/pdftrans.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-PROG_NAME=pdftrans
-PROG_MAIN=PDFTrans
-
-CP=/usr/share/java/$PROG_NAME
-
-for jar in /usr/share/java/$PROG_NAME/*.jar; do
- CP=$CP:$jar
-done
-
-CP=$CP:/usr/share/java/itext/itext.jar
-CP=$CP:/usr/share/java/bcprov.jar
-
-java -cp $CP $PROG_MAIN "$@"
diff --git a/community/perl-list-moreutils/PKGBUILD b/community/perl-list-moreutils/PKGBUILD
deleted file mode 100644
index 454cfa2ee..000000000
--- a/community/perl-list-moreutils/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer : Justin "juster" Davis <jrcd83@gmail.com>
-# Generator : pbjam 0.01
-
-pkgname=perl-list-moreutils
-pkgver=0.33
-pkgrel=1
-pkgdesc="Provide the stuff missing in List::Util"
-arch=(i686 x86_64)
-license=(PerlArtistic GPL)
-options=(!emptydirs)
-depends=('perl>=5.5.30')
-url=http://search.cpan.org/dist/List-MoreUtils
-source=("http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/List-MoreUtils-${pkgver}.tar.gz")
-md5sums=(8a33c84028cc2ff3e92c92434b326c0f)
-sha512sums=(e758b995438c5c5322317aab3602e89b9f683c42d403a0ac97ccd8cc20d0db1a75caefc22f34ad088314867c0bdd9c2b8264e8f2f6a43eab1421aa8c482233b5)
-_distdir="${srcdir}/List-MoreUtils-${pkgver}"
-
-build() {
- ( export PERL_MM_USE_DEFAULT=1 PERL5LIB="" \
- PERL_AUTOINSTALL=--skipdeps \
- PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'" \
- PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
- MODULEBUILDRC=/dev/null
-
- cd "$_distdir"
- /usr/bin/perl Makefile.PL
- make
- )
-}
-
-check() {
- ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
- cd "$_distdir"
- make test
- )
-}
-
-package() {
- cd "$_distdir"
- make DESTDIR="$pkgdir" install
- find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
-}
-
-# Local Variables:
-# mode: shell-script
-# sh-basic-offset: 2
-# End:
-# vim:set ts=2 sw=2 et:
diff --git a/community/python-daap/PKGBUILD b/community/python-daap/PKGBUILD
deleted file mode 100644
index d48f8da4d..000000000
--- a/community/python-daap/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Contributor: Tom Shaft Jr. <d6@demetrius6.org>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-pkgname=python-daap
-pkgver=0.7.1
-pkgrel=3
-pkgdesc="Python libraries for accessing DAAP music shares"
-arch=('i686' 'x86_64')
-url="http://jerakeen.org/code/pythondaap/"
-depends=('python2')
-license=('GPL')
-source=(http://jerakeen.org/files/PythonDaap-$pkgver.tar.gz)
-md5sums=('b3db3d60b0ee83f5f23101d2c3bb99e0')
-
-build() {
- cd $srcdir/PythonDaap-$pkgver
- python2 setup.py install --prefix=$pkgdir/usr
-}
diff --git a/community/python2-cheetah/PKGBUILD b/community/python2-cheetah/PKGBUILD
deleted file mode 100755
index 15d970e37..000000000
--- a/community/python2-cheetah/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 60201 2011-12-07 14:41:34Z arodseth $
-# Contributor: James Rayner <james@archlinux.org>
-# Contributor: Todd Maynard <arch@toddmaynard.com>
-
-pkgname=python2-cheetah
-pkgver=2.4.4
-pkgrel=3
-pkgdesc="A Python-powered template engine and code generator"
-arch=('i686' 'x86_64')
-url="http://www.cheetahtemplate.org/"
-license=('custom')
-depends=('python2' 'python-markdown')
-makedepends=('python2-distribute')
-optdepends=('python2-pygments: for the CodeHighlighter filter')
-provides=('cheetah' 'python-cheetah')
-conflicts=('cheetah' 'python-cheetah')
-source=(http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${pkgver}.tar.gz)
-md5sums=('853917116e731afbc8c8a43c37e6ddba')
-
-build() {
- cd "${srcdir}/Cheetah-${pkgver}"
- python2 setup.py build
-}
-
-package() {
- cd "${srcdir}/Cheetah-${pkgver}"
- python2 setup.py install --root="${pkgdir}"
- install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- find $pkgdir/usr/lib/python2.7/site-packages/Cheetah/ -name '*.py' | \
- xargs sed -i "s|#!/usr/bin/env python|#!/usr/bin/env python2|"
-}
diff --git a/community/qdevelop/PKGBUILD b/community/qdevelop/PKGBUILD
deleted file mode 100644
index 2a8ba9b2d..000000000
--- a/community/qdevelop/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# $Id: PKGBUILD 59469 2011-11-25 21:18:16Z andrea $
-# Maintainer:
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Xavion <Xavion (dot) 0 (at) Gmail (dot) com>
-# Contributor: Shaika-Dzari < shaikadzari at gmail dot com>
-
-pkgname=qdevelop
-pkgver=0.28
-pkgrel=1
-pkgdesc='A free and cross-platform IDE for Qt4'
-arch=('i686' 'x86_64')
-url="http://biord-software.org/${pkgname}"
-license=('GPL2')
-depends=('qt')
-optdepends=('ctags: for code completion and class browser'
- 'gdb: for debugging functionalities')
-source=("http://biord-software.org/downloads/$pkgname-v$pkgver.tar.gz"
- 'qt47.patch')
-md5sums=('24e64bd80dd7407a885acd639b59a740'
- 'dc14b87a849b71ae3ac476e49c7d87e9')
-
-build() {
- cd ${srcdir}/${pkgname}-v${pkgver}
-
- patch -p1 -i "${srcdir}"/qt47.patch
-
- lrelease QDevelop.pro
- qmake
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-v${pkgver}
-
- make INSTALL_ROOT="$pkgdir" install
-
- # Desktop
- install -Dm644 ${pkgname}.desktop ${pkgdir}/usr/share/applications/${pkgname}.desktop
- install -Dm644 resources/images/logo.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
-}
diff --git a/community/qdevelop/qt47.patch b/community/qdevelop/qt47.patch
deleted file mode 100644
index a1607779b..000000000
--- a/community/qdevelop/qt47.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix FTBFS with Qt 4.7.
-
---- qdevelop-0.28.orig/src/build.h
-+++ qdevelop-0.28/src/build.h
-@@ -56,7 +56,7 @@ private:
- int m_warnings;
- QString m_forceMode;
- signals:
-- void message(QString, QString=0);
-+ void message(QString, QString=QString());
- protected slots:
- void slotBuildMessages();
- void slotStopBuild();
---- qdevelop-0.28.orig/src/textEdit.h
-+++ qdevelop-0.28/src/textEdit.h
-@@ -142,7 +142,7 @@ public:
- void setMouseHidden( bool hidden );
- public slots:
- void gotoLine( int line, bool moveTop );
-- void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=0, QTextDocument::FindFlags options=0, bool fromButton=false);
-+ void slotFind(Ui::FindWidget uiFind, Ui::ReplaceWidget uiReplace, QString ttf=QString(), QTextDocument::FindFlags options=0, bool fromButton=false);
- void slotIndent(bool indent=true);
- void slotUnindent();
- void comment(ActionComment action);
diff --git a/community/qlandkartegt/fix-glu-header.patch b/community/qlandkartegt/fix-glu-header.patch
deleted file mode 100644
index 214ad395d..000000000
--- a/community/qlandkartegt/fix-glu-header.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- QLandkarteGT/trunk/src/CMap3D.cpp 2011/08/23 16:34:50 2943
-+++ QLandkarteGT/trunk/src/CMap3D.cpp 2011/09/03 07:58:02 2961
-@@ -31,8 +31,8 @@
- #include "CWptDB.h"
- #include "WptIcons.h"
-
--#include <GL/glu.h>
- #include <QtGui>
-+#include <QtOpenGL>
- #include <math.h>
-
- #ifndef GL_CLAMP_TO_EDGE
diff --git a/community/qps/version-patch.diff b/community/qps/version-patch.diff
deleted file mode 100644
index bfddd2a0a..000000000
--- a/community/qps/version-patch.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- proc_linux.cpp 2011-07-17 08:03:52.000000000 -0400
-+++ proc_linux.cpp.new 2011-08-09 11:09:47.278589772 -0400
-@@ -1962,7 +1962,10 @@
- int result;
-
- result = sscanf(p, "%d.%d.%d", &major, &minor, &patch);
-- if(result < 3) {
-+ if(result == 2) {
-+ patch = 0;
-+ }
-+ else if(result < 3) {
- fprintf(stderr, "Qps: can't determine version, read %s \n", p);
- fprintf(stderr, "please report this bug.\n");
- exit(1);
diff --git a/community/qtoctave/PKGBUILD b/community/qtoctave/PKGBUILD
deleted file mode 100755
index aa57b3b79..000000000
--- a/community/qtoctave/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=qtoctave
-pkgver=0.10.1
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="qt frontend for octave"
-url="https://forja.rediris.es/projects/csl-qtoctave/"
-license=('GPL2')
-depends=('qt' 'octave' 'hicolor-icon-theme')
-makedepends=('cmake')
-source=(http://forja.rediris.es/frs/download.php/2054/${pkgname}-${pkgver}.tar.gz \
- qtoctave-gcc44.patch)
-md5sums=('f23afd8eb850b950f51b65f256a83835'
- 'ca88a01563e2ad4ad3ae4912289b501d')
-install=qtoctave.install
-options=('!libtool' '!emptydirs')
-
-build() {
- cd ${srcdir}/${pkgname}-$pkgver
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_BUILD_TYPE=RELEASE .
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-$pkgver
- make DESTDIR=${pkgdir} install
-}
diff --git a/community/qtoctave/qtoctave-gcc44.patch b/community/qtoctave/qtoctave-gcc44.patch
deleted file mode 100644
index d13869111..000000000
--- a/community/qtoctave/qtoctave-gcc44.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/search_dialog.h.bak 2009-09-09 20:49:14.484802974 +0200
-+++ src/search_dialog.h 2009-09-09 20:49:24.222481579 +0200
-@@ -26,6 +26,7 @@
- #include <QGroupBox>
- #include <QPushButton>
- #include "config.h"
-+#include <stdio.h>
-
- class SearchDialog: public QDialog
- {
diff --git a/community/qtoctave/qtoctave.install b/community/qtoctave/qtoctave.install
deleted file mode 100644
index 28fdb48fb..000000000
--- a/community/qtoctave/qtoctave.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
diff --git a/community/qtractor/qtractor.changelog b/community/qtractor/qtractor.changelog
deleted file mode 100644
index c0c8a8e0c..000000000
--- a/community/qtractor/qtractor.changelog
+++ /dev/null
@@ -1,14 +0,0 @@
-17 Jan 2010 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 0.4.4-1
- upstream update
- new deps:
- For LV2 support
- --| slv2
- ----| lv2core
-
-26 Dec 2009 (GMT+8) Ray Rashif <schiv@archlinux.org>
-
- * 0.4.3-1
- initial commit
- only important changes will be logged
diff --git a/community/rep-gtk/PKGBUILD b/community/rep-gtk/PKGBUILD
deleted file mode 100644
index 09b8dafd2..000000000
--- a/community/rep-gtk/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 55391 2011-09-11 18:32:16Z shusmann $
-# Maintainer: stefan-husmann@t-online.de
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=rep-gtk
-pkgver=0.90.7
-pkgrel=1
-pkgdesc="Binding of the GTK and GDK libraries for the librep Lisp environment"
-arch=('i686' 'x86_64')
-url="http://sawfish.wikia.com/wiki/Rep-GTK"
-license=('GPL')
-depends=('librep' 'gtk2')
-source=(http://download.tuxfamily.org/librep/rep-gtk/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('30736e88533e176f88677723f12095be983e1926')
-options=('!libtool')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/community/sauerbraten/PKGBUILD b/community/sauerbraten/PKGBUILD
deleted file mode 100644
index 2a845e88d..000000000
--- a/community/sauerbraten/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 27049 2010-09-16 22:45:06Z lcarlier $
-# Maintainer: Laurent Carlier <lordheavym@gmail.com>
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com>
-# Contributor: Christoph Siegenthaler <csi@gmx.ch>
-# Contributor: Jesse Young <jesse@eon.jlyo.org>
-
-pkgbase=sauerbraten
-pkgname=('sauerbraten' 'sauerbraten-data')
-pkgver=2010_07_28_justice_edition
-pkgrel=2
-pkgdesc="Improved version of the Cube engine"
-arch=('i686' 'x86_64')
-url="http://www.sauerbraten.org/"
-license=('ZLIB')
-depends=('sdl_mixer' 'sdl_image' 'libgl')
-makedepends=('mesa')
-install=sauerbraten.install
-source=(http://downloads.sourceforge.net/$pkgname/${pkgname}_${pkgver}_linux.tar.bz2
- sauerbraten-client
- sauerbraten-server
- sauerbraten.confd
- sauerbraten.rcd
- sauerbraten.desktop
- sauerbraten.png
- sauerbraten.install
- license.txt)
-md5sums=('0947cb37b628873063270be1fcce27f6'
- 'ac66ef9e80d6fc1b4b047df1c36c07c0'
- '4a42c314d01ccdc4c76fad38d18c7434'
- '8e26aeba1ef178c24e22723d3c48d7e1'
- 'e0a2e0679c34b39623964ee68e6fae1e'
- '5b528424ed46e05124420975d99370e5'
- '3e602f421f7342cf8c3ed16314523d6f'
- '2f7b423f49491359ff776a91414db4d8'
- 'cf46cd0148f03b7477f7c54aec865abe')
-
-build() {
- cd ${srcdir}/$pkgname/src
-
- make
-
- # remove cvs directories
- find ${srcdir}/$pkgname -type d -name CVS -exec rm -rf '{}' \; 2> /dev/null
-}
-
-package_sauerbraten() {
- depends=('sdl_mixer' 'sdl_image' 'libgl' 'sauerbraten-data')
-
- cd ${srcdir}/$pkgname/src
-
- make DESTDIR="${pkgdir}" install
-
- cd ..
- install -D bin_unix/native_client ${pkgdir}/opt/sauerbraten/bin/linux_client
- install -D bin_unix/native_server ${pkgdir}/opt/sauerbraten/bin/linux_server
-
- install -Dm755 ${srcdir}/sauerbraten-client ${pkgdir}/usr/bin/sauerbraten-client
- install -Dm755 ${srcdir}/sauerbraten-server ${pkgdir}/usr/sbin/sauerbraten-server
- install -Dm644 ${srcdir}/sauerbraten.confd ${pkgdir}/etc/conf.d/sauerbraten
- install -Dm755 ${srcdir}/sauerbraten.rcd ${pkgdir}/etc/rc.d/sauerbraten
- install -Dm644 ${srcdir}/sauerbraten.desktop ${pkgdir}/usr/share/applications/sauerbraten.desktop
- install -Dm644 ${srcdir}/sauerbraten.png ${pkgdir}/usr/share/pixmaps/sauerbraten.png
- install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/sauerbraten/license.txt
-}
-
-package_sauerbraten-data() {
- pkgdesc="Improved version of the Cube engine - datas files"
- arch=('any')
- depends=()
-
- cd ${srcdir}/sauerbraten
-
- install -d ${pkgdir}/opt/sauerbraten
- cp -r data ${pkgdir}/opt/sauerbraten
- cp -r packages ${pkgdir}/opt/sauerbraten
-
- # make namcap happy
- chmod -R go+rx ${pkgdir}/opt/sauerbraten/packages/argh
-
- install -Dm644 ${srcdir}/license.txt ${pkgdir}/usr/share/licenses/${pkgname}-data/license.txt
-}
diff --git a/community/sauerbraten/license.txt b/community/sauerbraten/license.txt
deleted file mode 100644
index f38792c76..000000000
--- a/community/sauerbraten/license.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-LICENSE
-=======
-
-Sauerbraten game engine source code, any release.
-
-Copyright (C) 2001-2006 Wouter van Oortmerssen.
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-1. The origin of this software must not be misrepresented; you must not
- claim that you wrote the original software. If you use this software
- in a product, an acknowledgment in the product documentation would be
- appreciated but is not required.
-2. Altered source versions must be plainly marked as such, and must not be
- misrepresented as being the original software.
-3. This notice may not be removed or altered from any source distribution.
-
-
-LICENSE NOTES
-=============
-The license covers the source code found in the "src" directory of this
-archive, the included enet network library which sauerbraten uses is covered by
-an MIT-style license, which is however compatible with the above license for all
-practical purposes.
-
-Game media included in the game (maps, textures, sounds, models etc.)
-are NOT covered by this license, and may have individual copyrights and
-distribution restrictions (see individual readmes).
diff --git a/community/sauerbraten/sauerbraten-client b/community/sauerbraten/sauerbraten-client
deleted file mode 100755
index 8a9b354f3..000000000
--- a/community/sauerbraten/sauerbraten-client
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-WIDTH=1024
-HEIGHT=768
-[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten
-
-cd /opt/sauerbraten
-if [ -f /usr/bin/aoss ]; then
- aoss bin/linux_client -w$WIDTH -h$HEIGHT -q${HOME}/.config/sauerbraten -r
-else
- bin/linux_client -w$WIDTH -h$HEIGHT -q${HOME}/.config/sauerbraten -r
-fi
-
-
diff --git a/community/sauerbraten/sauerbraten-server b/community/sauerbraten/sauerbraten-server
deleted file mode 100755
index b4c79cb7f..000000000
--- a/community/sauerbraten/sauerbraten-server
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-SAUER_USER=nobody
-LOGDIR=/var/log/sauerbraten
-[ -f /etc/conf.d/sauerbraten ] && . /etc/conf.d/sauerbraten
-
-cd /opt/sauerbraten
-
-if [ "$(id -u)" == "0" ]; then
- if [ ! -d "$LOGDIR" ]; then
- mkdir -p "$LOGDIR"
- chown "$SAUER_USER:log" "$LOGDIR"
- fi
-
- sudo -Hu "$SAUER_USER" \
- nohup /opt/sauerbraten/bin/linux_server \
- >> "$LOGDIR/main.log" \
- 2>> "$LOGDIR/error.log" \
- < /dev/null &
-else
- bin/linux_server
-fi
diff --git a/community/sauerbraten/sauerbraten.confd b/community/sauerbraten/sauerbraten.confd
deleted file mode 100644
index 93cd32de7..000000000
--- a/community/sauerbraten/sauerbraten.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-# Client options
-WIDTH=1024
-HEIGHT=768
-
-# Server options
-SAUER_USER=sauerbraten
-LOGDIR=/var/log/sauerbraten
diff --git a/community/sauerbraten/sauerbraten.desktop b/community/sauerbraten/sauerbraten.desktop
deleted file mode 100644
index a038acfcc..000000000
--- a/community/sauerbraten/sauerbraten.desktop
+++ /dev/null
@@ -1,13 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Exec=sauerbraten-client %u
-Icon=/usr/share/pixmaps/sauerbraten.png
-Type=Application
-Categories=Application;Game;ActionGame;
-Name=Sauerbraten
-GenericName=Cube 2
-Comment=multi/single-player first person shooter
-Comment[fr]=Jeu de tir subjectif multi/simple joueur
-Terminal=false
-StartupNotify=false
diff --git a/community/sauerbraten/sauerbraten.install b/community/sauerbraten/sauerbraten.install
deleted file mode 100644
index 2ee7689ab..000000000
--- a/community/sauerbraten/sauerbraten.install
+++ /dev/null
@@ -1,22 +0,0 @@
-# arg 1: the new package version
-post_install() {
- getent group sauerbraten >/dev/null 2>&1 || groupadd -r sauerbraten
- if getent passwd sauerbraten > /dev/null 2>&1; then
- usr/sbin/usermod -d /var/spool/sauerbraten -c 'Sauerbraten' -s /sbin/nologin sauerbraten > /dev/null 2>&1
- else
- usr/sbin/useradd -c 'Sauerbraten' -r -g sauerbraten -d /opt/sauerbraten -s /sbin/nologin sauerbraten
- fi
- passwd -l sauerbraten > /dev/null
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-# arg 1: the old package version
-pre_remove() {
- getent passwd sauerbraten >/dev/null 2>&1 && userdel sauerbraten
-}
-
diff --git a/community/sauerbraten/sauerbraten.png b/community/sauerbraten/sauerbraten.png
deleted file mode 100644
index 5ec7606bc..000000000
--- a/community/sauerbraten/sauerbraten.png
+++ /dev/null
Binary files differ
diff --git a/community/sauerbraten/sauerbraten.rcd b/community/sauerbraten/sauerbraten.rcd
deleted file mode 100644
index fb95aae16..000000000
--- a/community/sauerbraten/sauerbraten.rcd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
- start)
- stat_busy "Starting sauerbraten-server"
- [ ! -f /var/run/daemons/sauerbraten ] && /usr/sbin/sauerbraten-server
- if [ $? -gt 0 ]; then
- stat_fail
- else
- pgrep -of "/opt/sauerbraten/bin/linux_server" > /var/run/sauerbraten.pid
- add_daemon sauerbraten
- stat_done
- fi
- ;;
-
- stop)
- stat_busy "Stopping sauerbraten-server"
- [ -f /var/run/sauerbraten.pid ] && kill `cat /var/run/sauerbraten.pid`
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon sauerbraten
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/community/sawfish/PKGBUILD b/community/sawfish/PKGBUILD
deleted file mode 100644
index 495031682..000000000
--- a/community/sawfish/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-# $Id: PKGBUILD 55392 2011-09-11 18:41:44Z shusmann $
-# Maintainer: stefan-husmann@t-online.de
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=sawfish
-pkgver=1.8.2
-pkgrel=1
-pkgdesc="An extensible window manager using a Lisp-based scripting language"
-arch=('i686' 'x86_64')
-url="http://sawfish.wikia.com/wiki/Main_Page"
-license=('GPL')
-depends=('libsm' 'rep-gtk' 'hicolor-icon-theme')
-install=${pkgname}.install
-source=(http://download.tuxfamily.org/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('d4716516fb0020bb728291c6defa1f421a33e5dc')
-options=('!libtool')
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --libexecdir=/usr/lib
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- rm -r $pkgdir/usr/share/gnome/wm-properties
- rm -r $pkgdir/usr/share/kde4
- rmdir $pkgdir/usr/share/gnome
-}
diff --git a/community/sawfish/sawfish.install b/community/sawfish/sawfish.install
deleted file mode 100644
index 3b43a7466..000000000
--- a/community/sawfish/sawfish.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=/usr/share/info
-file=sawfish.info
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-} \ No newline at end of file
diff --git a/community/scilab/PKGBUILD b/community/scilab/PKGBUILD
deleted file mode 100644
index a1996a774..000000000
--- a/community/scilab/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Simon Lipp <sloonz+aur@gmail.com>
-# Paulo Matias
-
-pkgname=scilab
-pkgver=5.3.1
-pkgrel=4
-pkgdesc='Scilab is a scientific software package for numerical computations.'
-arch=('i686' 'x86_64')
-url='http://www.scilab.org/'
-license=('custom:CeCILL')
-depends=('libxml2' 'pcre' 'lapack' 'java-batik' 'java-flexdock>=0.5.2'
- 'jogl' 'jeuclid-core' 'fftw' 'libmatio' 'bash' 'tk' 'jrosetta'
- 'ocaml' 'javahelp2' 'jgraphx=1_4_1_0' 'jlatexmath>=0.9.4'
- 'jlatexmath-fop>=0.9.4' 'junit' 'java-skinlf' 'xalan-java'
- 'java-commons-logging' 'hdf5')
-makedepends=('apache-ant' 'antlr2' 'gcc-fortran' 'java-avalon-framework' 'xorg-fonts-type1')
-[[ $CARCH == x86_64 ]] && \
- source=("http://www.scilab.org/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" \
- "http://www.scilab.org/download/5.3.1/prerequirements-scilab-5.3.1-x86_64-src.tar.gz" \
- 'scilab.desktop' 'classpath.xml' 'configure-hdf5-vercheck.patch')
-
-[[ $CARCH == i686 ]] && \
- source=("http://www.scilab.org/download/${pkgver}/${pkgname}-${pkgver}-src.tar.gz" \
- "http://www.scilab.org/download/5.3.1/prerequirements-scilab-5.3.1-src.tar.gz" \
- 'scilab.desktop' 'classpath.xml' 'configure-hdf5-vercheck.patch')
-
-[[ $CARCH == x86_64 ]] && md5sums=('0002653e670efabb8faf9e6403367134'
- '7c9bda373d8dfd75a4f8227a08ced588'
- 'ad6286f324891fe8b86c60e4012a36b7'
- 'efe6e8d06968ba5e1a3e5ab540a79667'
- '7bf1a2149521db9e1c9a2ed684f9ce52')
-[[ $CARCH == i686 ]] && md5sums=('0002653e670efabb8faf9e6403367134'
- '7545859e4078d3b77436b7f322967f26'
- 'ad6286f324891fe8b86c60e4012a36b7'
- 'efe6e8d06968ba5e1a3e5ab540a79667'
- '7bf1a2149521db9e1c9a2ed684f9ce52')
-
-options=('!libtool' '!emptydirs')
-
-build() {
- # we do not want things we already have in Arch Linux
- cd ${pkgname}-${pkgver}/thirdparty
- rm avalon* batik* commons-* flexdock* gluegen-rt* jeuclid* jgraphx* \
- jhall* jlatexmath* jogl* jrosetta* junit* looks-2.1.1.jar xalan* \
- xml* skinlf*
- # fix undefined references (scilab needs to fix its cyclic dependencies)
- LDFLAGS=${LDFLAGS/ -Wl,--as-needed}
- # begin configuring and building
- cd ..
-
- # dirty hack to remove non-working hdf5 version check from configure
- patch -Np0 -i ${srcdir}/configure-hdf5-vercheck.patch
-
- ./configure \
- --prefix=/usr \
- --enable-build-localization \
- --without-pvm \
- --with-matio \
- --without-umfpack \
- --with-fftw \
- --with-hdf5 \
- --with-gfortran # Needed for 64 bits, don't hurt for 32 bits
- make all doc
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make DESTDIR="${pkgdir}" install install-html
-
- install -d ${pkgdir}/usr/share/licenses/${pkgname}
- install -Dm644 ${srcdir}/scilab-${pkgver}/COPYING \
- ${pkgdir}/usr/share/licenses/${pkgname}
- install -Dm644 ${srcdir}/${pkgname}.desktop \
- ${pkgdir}/usr/share/applications/${pkgname}.desktop
- sed -i 's#/jni##' ${pkgdir}/usr/share/scilab/etc/librarypath.xml
- install -Dm644 $srcdir/classpath.xml $pkgdir/usr/share/scilab/etc/classpath.xml
- for i in jhdf5.jar fop.jar saxon.jar
- do
- install -Dm644 $srcdir/$pkgname-$pkgver/thirdparty/$i \
- $pkgdir/usr/share/java/scilab/$i
- done
- install -Dm644 $srcdir/$pkgname-$pkgver/bin/libjhdf5.so \
- $pkgdir/usr/lib/libjhdf5.so
-}
diff --git a/community/scilab/classpath.xml b/community/scilab/classpath.xml
deleted file mode 100644
index 1bd503350..000000000
--- a/community/scilab/classpath.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE classpaths SYSTEM "../modules/jvm/xml/classpath.dtd">
-<!-- classpath.xml -->
-<!--
- default CLASSPATH for Scilab
-
- @author Allan CORNET
- @author Sylvestre LEDRU
- @date INRIA 2007/2008
- ===================
- Don't touch if you do not know what you are doing
--->
-<!-- =================== -->
-<!--
-Scilab Java dependencies can be load in different ways.
-It can be:
-* startup - Load immediatly the dep when Scilab starts (default behaviour)
-* background - After Scilab engine is loaded, load the dep in the background
-* onUse - Load the deps only when needed (once)
-
-Some deps can be also disabled only for a specific mode.
-The option is "disableUnderMode" and can be:
-* STD - Normal mode
-* NW - No Window mode (ie command line but with graphics
-* API - Scilab as an API
--->
-
-<classpaths>
-
-<!-- Mandatory on startup -->
-<path value="/usr/share/java/flexdock/flexdock.jar"/>
-<path value="/usr/share/java/jrosetta/jrosetta-API.jar" disableUnderMode="NW"/>
-<path value="/usr/share/java/jrosetta/jrosetta-engine.jar"/>
-<path value="/usr/share/java/skinlf/skinlf.jar"/>
-<path value="/usr/share/java/jgoodies-looks/looks-2.3.1.jar"/>
-<path value="/usr/share/java/commons-logging/commons-logging.jar"/>
-<path value="/usr/share/java/javahelp/jhall.jar"/>
-
-<!-- Load when needed -->
-
-<path value="/usr/share/java/jgraphx.jar" load="onUse">
- <load on="XCos"/>
-</path>
-
-<path value="/usr/share/java/jogl/jogl.jar" load="onUse">
- <load on="graphics"/>
- <load on="graphic_export"/>
- <load on="XCos"/>
-</path>
-
-<path value="/usr/share/java/jogl/gluegen-rt.jar" load="onUse">
- <load on="graphics"/>
- <load on="graphic_export"/>
- <load on="XCos"/>
-</path>
-
-<!-- XCOS -->
-<path value="/usr/share/java/scilab/jhdf5.jar" load="onUse">
- <load on="XCos"/>
- <load on="HDF5"/>
-</path>
-
-<!-- Temp. loaded at startup -->
-<path value="$SCILAB/modules/types/jar/org.scilab.modules.types.jar"/>
-<path value="$SCILAB/modules/output_stream/jar/org.scilab.modules.output_stream.jar" load="startup"/>
-<path value="$SCILAB/modules/hdf5/jar/org.scilab.modules.hdf5.jar" load="startup"/>
-
-<path value="$SCILAB/modules/xcos/jar/org.scilab.modules.xcos.jar" load="onUse">
- <load on="XCos"/>
-</path>
-<!-- END -->
-
-<!-- Documentation (not mandatory) -->
-<path value="/usr/share/java/jeuclid//jeuclid-core.jar" load="onUse">
- <load on="documentationGeneration"/>
- <load on="graphics_mathml_textrendering"/>
- <load on="xcos_mathml_rendering"/>
-</path>
-
-<path value="/usr/share/java/jlatexmath-fop.jar" load="onUse">
- <load on="documentationGeneration"/>
- <load on="pdf_ps_eps_graphic_export"/>
-</path>
-<path value="/usr/share/java/scilab/fop.jar" load="onUse">
- <load on="documentationGeneration"/>
- <load on="pdf_ps_eps_graphic_export"/>
-</path>
-<path value="/usr/share/java/scilab/saxon.jar" load="onUse">
- <load on="documentationGeneration"/>
-</path>
-<path value="/usr/share/java/batik//batik-all.jar" load="onUse">
- <load on="documentationGeneration"/>
- <load on="graphics_mathml_textrendering"/>
- <load on="pdf_ps_eps_graphic_export"/>
- <load on="XCos"/>
-</path>
-<path value="/usr/share/java/batik//xml-apis-ext.jar" load="onUse">
- <load on="documentationGeneration"/>
- <load on="pdf_ps_eps_graphic_export"/>
- <load on="XCos"/>
-</path>
-
-<!-- PDF doc generation -->
-<path value="/usr/share/java/commons-io//commons-io.jar" load="onUse">
- <load on="documentationGeneration"/>
- <load on="graphics_mathml_textrendering"/>
- <load on="pdf_ps_eps_graphic_export"/>
- <load on="xcos"/>
-</path>
-
-<!-- PDF doc generation (dep of jeuclid) -->
-<path value="/usr/share/java/xmlgraphics-commons//xmlgraphics-commons.jar" load="onUse">
- <load on="documentationGeneration"/>
- <load on="graphics_mathml_textrendering"/>
- <load on="pdf_ps_eps_graphic_export"/>
- <load on="XCos"/>
-</path>
-<path value="/usr/share/java/avalon-framework//avalon-framework.jar" load="onUse">
- <load on="documentationGeneration"/>
- <load on="pdf_ps_eps_graphic_export"/>
-</path>
-
-<path value="/usr/share/java//jlatexmath.jar" load="onUse">
- <load on="documentationGeneration"/>
- <load on="graphics_latex_textrendering"/>
- <load on="pdf_ps_eps_graphic_export"/>
- <load on="XCos"/>
-</path>
-
-<!-- helptools module doc generation -->
-<path value="$SCILAB/modules/helptools/jar/org.scilab.modules.helptools.jar" load="onUse">
- <load on="documentationGeneration"/>
- <load on="copyAsHTMLinScinotes"/>
-</path>
-
-<!-- Mandatory on startup -->
-<path value="$SCILAB/modules/jvm/jar/org.scilab.modules.jvm.jar"/>
-<path value="$SCILAB/modules/commons/jar/org.scilab.modules.commons.jar"/>
-
-<!-- Console GUI dep -->
-<path value="$SCILAB/modules/shell/jar/org.scilab.modules.shell.jar" disableUnderMode="NW"/>
-<path value="$SCILAB/modules/history_manager/jar/org.scilab.modules.history_manager.jar" disableUnderMode="NW"/>
-<path value="$SCILAB/modules/completion/jar/org.scilab.modules.completion.jar" disableUnderMode="NW"/>
-
-<path value="$SCILAB/modules/console/jar/org.scilab.modules.console.jar"/>
-
-<path value="$SCILAB/modules/localization/jar/org.scilab.modules.localization.jar"/>
-<path value="$SCILAB/modules/action_binding/jar/org.scilab.modules.action_binding.jar"/>
-
-<path value="$SCILAB/modules/gui/jar/org.scilab.modules.gui.jar"/>
-<path value="$SCILAB/modules/gui/etc"/> <!-- Scilab Flexdock theme -->
-<path value="$SCILAB/modules/gui/images/icons/"/> <!-- Scilab Flexdock icons -->
-
-<path value="$SCILAB/modules/renderer/jar/org.scilab.modules.renderer.jar"/>
-
-<path value="$SCILAB/modules/graphic_export/jar/org.scilab.modules.graphic_export.jar"/>
-
-<path value="$SCILAB/modules/core/jar/org.scilab.modules.core.jar"/>
-
-<!-- scinotes module -->
-<path value="$SCILAB/modules/scinotes/jar/org.scilab.modules.scinotes.jar" load="onUse">
- <load on="SciNotes"/>
-</path>
-
-<!-- TO DO Load only when we need -->
-<path value="$SCILAB/modules/ui_data/jar/org.scilab.modules.ui_data.jar"/>
-
-<!-- TO DO Load only when we need -->
-<path value="$SCILAB/modules/graph/jar/org.scilab.modules.graph.jar"/>
-
-<path value="$SCILAB/modules/history_browser/jar/org.scilab.modules.history_browser.jar" disableUnderMode="NW"/>
-
-</classpaths>
diff --git a/community/scilab/configure-hdf5-vercheck.patch b/community/scilab/configure-hdf5-vercheck.patch
deleted file mode 100644
index 0f1d875f3..000000000
--- a/community/scilab/configure-hdf5-vercheck.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- configure.bak 2011-07-10 11:28:35.833136771 +0200
-+++ configure 2011-07-10 11:28:45.023136232 +0200
-@@ -19495,21 +19495,6 @@
- // #line 19495 "configure"
- import ncsa.hdf.hdf5lib.H5;
-
--public class conftest {
-- public static void main(String[] argv) {
-- String minVersion="1.8.4";
-- int[] vers = new int[3];
-- try { H5.H5get_libversion(vers); }
-- catch (Throwable ex) {System.exit(-1);}
-- String ver = vers[0] + "."+ vers[1] +"."+vers[2];
--
-- System.out.println(ver);
-- if (minVersion.compareTo(ver) > 0) {
-- System.exit(-1);
-- }
--
-- }
--}
- EOF
-
- CLASSPATH=$ac_java_classpath
diff --git a/community/scilab/java.patch b/community/scilab/java.patch
deleted file mode 100644
index d7cd42a75..000000000
--- a/community/scilab/java.patch
+++ /dev/null
@@ -1,217 +0,0 @@
-diff -aur scilab-5.1.1.orig/configure scilab-5.1.1.new/configure
---- scilab-5.1.1.orig/configure 2009-04-14 18:28:53.000000000 +0200
-+++ scilab-5.1.1.new/configure 2009-04-14 19:57:36.000000000 +0200
-@@ -29,9 +29,6 @@
-
- fi
-
--
--
--
- # PATH needs CR
- # Avoid depending upon Character Ranges.
- as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-@@ -12848,7 +12845,7 @@
- $as_echo_n "checking flexdock... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/flexdock.jar" "$jardir/libflexdock.jar" "$jardir/libflexdock-java.jar" "$jardir/flexdock*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -12921,9 +12918,9 @@
- $as_echo_n "checking looks... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/jgoodies-looks /usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
-- for jar in "$jardir/looks.jar" "$jardir/liblooks.jar" "$jardir/liblooks-java.jar" "$jardir/looks*.jar"; do
-+ for jar in "$jardir/jgoodies-looks.jar" "$jardir/liblooks.jar" "$jardir/liblooks-java.jar" "$jardir/looks*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
- # echo "protected $jar"
- # jar_resolved=`ls $jar 2>/dev/null`
-@@ -13070,7 +13067,7 @@
- $as_echo_n "checking skinlf... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/skinlf.jar" "$jardir/libskinlf.jar" "$jardir/libskinlf-java.jar" "$jardir/skinlf*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -13143,7 +13140,7 @@
- $as_echo_n "checking jogl... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/jogl.jar" "$jardir/libjogl.jar" "$jardir/libjogl-java.jar" "$jardir/jogl*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -13216,7 +13213,7 @@
- $as_echo_n "checking jhall... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/jhall.jar" "$jardir/libjhall.jar" "$jardir/libjhall-java.jar" "$jardir/jhall*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -13363,7 +13360,7 @@
- $as_echo_n "checking gluegen-rt... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/gluegen-rt.jar" "$jardir/libgluegen-rt.jar" "$jardir/libgluegen-rt-java.jar" "$jardir/gluegen-rt*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -13436,7 +13433,7 @@
- $as_echo_n "checking jrosetta-API... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/jrosetta-API.jar" "$jardir/libjrosetta-API.jar" "$jardir/libjrosetta-API-java.jar" "$jardir/jrosetta-API*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -13509,7 +13506,7 @@
- $as_echo_n "checking jrosetta-engine... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/jrosetta-engine.jar" "$jardir/libjrosetta-engine.jar" "$jardir/libjrosetta-engine-java.jar" "$jardir/jrosetta-engine*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -13582,7 +13579,7 @@
- $as_echo_n "checking commons-logging... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/commons-logging.jar" "$jardir/libcommons-logging.jar" "$jardir/libcommons-logging-java.jar" "$jardir/commons-logging*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -27293,7 +27290,7 @@
- $as_echo_n "checking batik-all... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/batik /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/batik-all.jar" "$jardir/libbatik-all.jar" "$jardir/libbatik-all-java.jar" "$jardir/batik-all*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -27366,7 +27363,7 @@
- $as_echo_n "checking batik... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/batik.jar" "$jardir/libbatik.jar" "$jardir/libbatik-java.jar" "$jardir/batik*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -27441,7 +27438,7 @@
- $as_echo_n "checking saxon... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/saxon.jar" "$jardir/libsaxon.jar" "$jardir/libsaxon-java.jar" "$jardir/saxon*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -27514,7 +27511,7 @@
- $as_echo_n "checking fop... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/fop.jar" "$jardir/libfop.jar" "$jardir/libfop-java.jar" "$jardir/fop*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -27587,7 +27584,7 @@
- $as_echo_n "checking jeuclid-core... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/jeuclid/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/jeuclid-core.jar" "$jardir/libjeuclid-core.jar" "$jardir/libjeuclid-core-java.jar" "$jardir/jeuclid-core*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -27660,7 +27657,7 @@
- $as_echo_n "checking commons-io... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/commons-io.jar" "$jardir/libcommons-io.jar" "$jardir/libcommons-io-java.jar" "$jardir/commons-io*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -27733,7 +27730,7 @@
- $as_echo_n "checking xmlgraphics-commons... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/xmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons.jar" "$jardir/libxmlgraphics-commons-java.jar" "$jardir/xmlgraphics-commons*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -27806,7 +27803,7 @@
- $as_echo_n "checking xml-apis-ext... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/) "
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/xml-apis-ext.jar" "$jardir/libxml-apis-ext.jar" "$jardir/libxml-apis-ext-java.jar" "$jardir/xml-apis-ext*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-@@ -27880,7 +27877,7 @@
- $as_echo_n "checking avalon-framework... " >&6; }
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/avalon-framework.jar" "$jardir/libavalon-framework.jar" "$jardir/libavalon-framework-java.jar" "$jardir/avalon-framework*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-Nur in scilab-5.1.1.new: configure.orig.
-Nur in scilab-5.1.1.new: configure.rej.
-diff -aur scilab-5.1.1.orig/m4/java.m4 scilab-5.1.1.new/m4/java.m4
---- scilab-5.1.1.orig/m4/java.m4 2009-04-14 18:28:53.000000000 +0200
-+++ scilab-5.1.1.new/m4/java.m4 2009-04-14 18:29:57.000000000 +0200
-@@ -745,7 +745,7 @@
- AC_MSG_CHECKING($1)
- found_jar=no
- saved_ac_java_classpath=$ac_java_classpath
-- DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java"
-+ DEFAULT_JAR_DIR="/usr/share/java/ /usr/lib/java/ /usr/share/java /usr/share/java/jar /opt/java/lib /usr/local/java /usr/local/java/jar /usr/local/share/java /usr/local/share/java/jar /usr/local/lib/java $(ls -d /usr/share/java/*/)"
- for jardir in "`pwd`/thirdparty" "`pwd`/jar" $DEFAULT_JAR_DIR "$_user_libdir"; do
- for jar in "$jardir/$1.jar" "$jardir/lib$1.jar" "$jardir/lib$1-java.jar" "$jardir/$1*.jar"; do
- # jar=`echo $jar|sed -e 's/ /\\ /'`
-Nur in scilab-5.1.1.new/m4: java.m4.orig.
-diff -aur scilab-5.1.1.orig/modules/core/src/c/TerminateCore.c scilab-5.1.1.new/modules/core/src/c/TerminateCore.c
---- scilab-5.1.1.orig/modules/core/src/c/TerminateCore.c 2009-04-14 18:28:54.000000000 +0200
-+++ scilab-5.1.1.new/modules/core/src/c/TerminateCore.c 2009-04-14 19:01:51.000000000 +0200
-@@ -9,8 +9,6 @@
- * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
- *
- */
--#include <libxml/parser.h>
--
- #include "TerminateCore.h"
- /*--------------------------------------------------------------------------*/
- #include "realmain.h" /* Get_no_startup_flag */
-@@ -56,11 +54,6 @@
- /* Close all scilab's files */
- TerminateScilabFilesList();
-
-- /*
-- * Cleanup function for the XML library.
-- */
-- xmlCleanupParser();
--
- /** clean tmpfiles **/
- C2F(tmpdirc)();
-
diff --git a/community/scilab/scilab.desktop b/community/scilab/scilab.desktop
deleted file mode 100644
index 0a363808b..000000000
--- a/community/scilab/scilab.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Scilab
-Comment=A scientific software package for numerical computations
-Icon=scilab
-Exec=scilab
-Encoding=UTF-8
-Terminal=false
-Type=Application
-Categories=Application;Science;Math
diff --git a/community/superswitcher/PKGBUILD b/community/superswitcher/PKGBUILD
deleted file mode 100644
index e085e303c..000000000
--- a/community/superswitcher/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 21339 2010-07-16 01:26:50Z tdziedzic $
-# Maintainer: Roman Kyrylych <roman@archlinux.org>
-# Contributor: Achraf cherti <achrafcherti@gmail.com>
-
-pkgname=superswitcher
-pkgver=0.6
-pkgrel=3
-pkgdesc='Powerful window and workspace switching using the Super key'
-arch=('i686' 'x86_64')
-url='http://code.google.com/p/superswitcher/'
-license=('GPL')
-depends=('gconf' 'libwnck' 'dbus-glib')
-makedepends=('intltool')
-source=("http://superswitcher.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e8620c8502dccc3f3d3d84e0eb359142')
-options=('!emptydirs')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- sed -i 's/$(addsuffix .in, $(INTLTOOL_BUILT))/`addsuffix .in, $INTLTOOL_BUILT`/' Makefile.am
- sed -i -e 's/\(^GNOME_COMPILE_WARNINGS(yes)\)/#\1/' configure.in
- sed -i -e 's/\(AM_CFLAGS = @WARN_CFLAGS@\)/#\1/' src/Makefile.am
-
- aclocal
-
- autoconf
-
- automake \
- --add-missing
-
- ./configure \
- --prefix=/usr
-
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make prefix=${pkgdir}/usr install
-}
diff --git a/community/tagtool/PKGBUILD b/community/tagtool/PKGBUILD
deleted file mode 100644
index d5fd741c6..000000000
--- a/community/tagtool/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# Maintainer: Stefan Husmann <stefan-husmannt-online.de>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: tardo <tardo@nagi-fanboi.net>
-# Contributor: Filip Wojciechowski <filip at loka dot pl>
-
-pkgname=tagtool
-pkgver=0.12.3
-pkgrel=6
-pkgdesc="Tool to edit tags in MP3 and Ogg Vorbis files"
-arch=('i686' 'x86_64')
-url="http://downloads.sourceforge.net/sourceforge/$pkgname"
-license=('GPL')
-depends=('hicolor-icon-theme' 'libglade' 'id3lib' 'libvorbis' 'gconf')
-makedepends=('intltool')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('447b3a505fee68a82f25dcda9377b676')
-install=tagtool.install
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --datadir=/usr/share
- make
-}
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${pkgdir} install
- install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
- gconf-merge-schema \
- "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" --domain \
- tagtool ${pkgdir}/etc/gconf/schemas/*.schemas
- rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
-}
diff --git a/community/tagtool/tagtool.install b/community/tagtool/tagtool.install
deleted file mode 100644
index d2af92647..000000000
--- a/community/tagtool/tagtool.install
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=tagtool
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- usr/sbin/gconfpkg --uninstall ${pkgname}
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-} \ No newline at end of file
diff --git a/community/tora/PKGBUILD b/community/tora/PKGBUILD
deleted file mode 100644
index 49b8e64fa..000000000
--- a/community/tora/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 58339 2011-11-12 08:18:18Z andrea $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Contributor: Douglas Soares de Andrade <dsandrade@gmail.com>
-
-pkgname=tora
-pkgver=2.1.3
-pkgrel=3
-pkgdesc="Toolkit for databases with support for MySQL and PostgreSQL"
-arch=('i686' 'x86_64')
-url="http://tora.sourceforge.net"
-license=('GPL')
-depends=('qscintilla')
-makedepends=('cmake')
-options=('!libtool' '!emptydirs')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('ea4a75a9daeaf58492413e3f7fe40293')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/community/tora/tora.install b/community/tora/tora.install
deleted file mode 100644
index 161b21e2b..000000000
--- a/community/tora/tora.install
+++ /dev/null
@@ -1,19 +0,0 @@
-# Thanks to: Serge Gielkens (Teld) for this bugfix
-infodir=usr/share/info
-filelist=(tora.info)
-
-post_install() {
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
diff --git a/community/unrtf/ChangeLog b/community/unrtf/ChangeLog
deleted file mode 100644
index 002e15b32..000000000
--- a/community/unrtf/ChangeLog
+++ /dev/null
@@ -1,8 +0,0 @@
-2010-01-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release 0.21.1
-
-2009-05-31 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * FS#14043 fixed
-
-2009-03-25 Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
- * Update to major release 0.21.0
diff --git a/community/wml/PKGBUILD b/community/wml/PKGBUILD
deleted file mode 100644
index 33c34b025..000000000
--- a/community/wml/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 50698 2011-06-29 15:35:12Z stephane $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=wml
-pkgver=2.0.11
-pkgrel=7
-pkgdesc="The Website Meta Language"
-arch=('i686' 'x86_64')
-url="http://thewml.org/"
-license=('GPL')
-depends=('perl' 'libpng' 'gdbm' 'db' 'ncurses')
-makedepends=('lynx')
-source=("http://thewml.org/distrib/${pkgname}-${pkgver}.tar.gz")
-md5sums=('a26feebf4e59e9a6940f54c69dde05b5')
-build() {
- cd ${pkgname}-${pkgver}
-
- # missing Perl modules fix
- sed -i 's/PREFIX=$(libdir)\/perl/DESTDIR=\.\.\/\.\.\/\.\.\/\.\.\/pkg\/ PREFIX=$(libdir)\/perl/' wml_common/Makefile.in
- sed -i 's/$(MAKE) pure_perl_install $(MM_INSTALL_OPTS)/$(MAKE) pure_perl_install/' wml_common/Makefile.in
-
- unset LDFLAGS
- ./configure \
- --prefix=/usr
-
- # compile fixhack
- sed -i 's#/usr/lib/perl5/core_perl/auto/DynaLoader/DynaLoader.a##' wml_backend/p3_eperl/Makefile
- sed -i 's/extern struct option options\[\]\;//' ${srcdir}/${pkgname}-${pkgver}/wml_backend/p3_eperl/eperl_proto.h
- sed -i 's|strip $dsttmp|#strip $dsttmp|' etc/shtool
- mkdir -p ${pkgdir}/usr/bin ${pkgdir}/usr/lib/wml/exec ${pkgdir}/usr/man/man{1,3,7} ${pkgdir}/usr/man/cat{1,7}
-
-# make clean
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
-
- make prefix=${pkgdir}/usr install
-
- [ -d ${pkgdir}/usr/man ] && mkdir -p ${pkgdir}/usr/share && mv ${pkgdir}/usr/man ${pkgdir}/usr/share
-}
diff --git a/community/wxsvg/PKGBUILD b/community/wxsvg/PKGBUILD
deleted file mode 100644
index 16e881116..000000000
--- a/community/wxsvg/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 58427 2011-11-12 17:19:10Z ibiru $
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=wxsvg
-pkgver=1.1.2
-pkgrel=2
-pkgdesc="C++ library to create, manipulate and render SVG files"
-arch=('i686' 'x86_64')
-url="http://wxsvg.sourceforge.net/"
-license=('custom:wxWindows')
-depends=('wxgtk' 'libart-lgpl' 'ffmpeg')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/wxsvg/wxsvg/${pkgver}/wxsvg-${pkgver}.tar.bz2")
-md5sums=('d88b0a68334df157fa560413681c3264')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -D -m644 COPYING "${pkgdir}/usr/share/licenses/wxsvg/COPYING"
-}
diff --git a/community/xskat/PKGBUILD b/community/xskat/PKGBUILD
deleted file mode 100644
index af88fc66e..000000000
--- a/community/xskat/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 36462 2009-04-23 02:18:44Z eric $
-# Contributor: arjan <arjan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=xskat
-pkgver=4.0
-pkgrel=4
-pkgdesc="The card game Skat as defined by the official Skat Order"
-arch=('i686' 'x86_64')
-url="http://www.xskat.de/xskat.html"
-license=('custom')
-depends=('libx11')
-makedepends=('imake')
-source=(http://www.xskat.de/$pkgname-$pkgver.tar.gz xskat.desktop xskat.png)
-md5sums=('6744cea48a890771736b75083e7ea2b5'
- 'd188d7db99e76e38ce4567bff0def99e'
- '79770f35f6d811c73919d521ec5fa7b0')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
- make
-}
-package() {
- cd $srcdir/$pkgname-$pkgver
- make DESTDIR=$pkgdir MANPATH=/usr/share/man install install.man
- install -Dm644 $srcdir/$pkgname-$pkgver/README \
- $pkgdir/usr/share/licenses/$pkgname/LICENSE
- install -Dm644 $srcdir/$pkgname.desktop \
- $pkgdir/usr/share/applications/$pkgname.desktop
- install -Dm644 $srcdir/$pkgname.png \
- $pkgdir/usr/share/icons/$pkgname.png
-}
diff --git a/community/xskat/xskat.desktop b/community/xskat/xskat.desktop
deleted file mode 100644
index 7805aebb0..000000000
--- a/community/xskat/xskat.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Type=Application
-Version=1.0
-Encoding=UTF-8
-Name=xskat
-GenericName=german card game Skat
-GenericName[en]=german card game Skat
-Exec=xskat
-Terminal=false
-StartupNotify=false
-Categories=Game;Cardgame
-Icon=/usr/share/xskat/icons/xskat
diff --git a/community/xskat/xskat.png b/community/xskat/xskat.png
deleted file mode 100644
index d73085179..000000000
--- a/community/xskat/xskat.png
+++ /dev/null
Binary files differ
diff --git a/core/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch b/core/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch
deleted file mode 100644
index f35226122..000000000
--- a/core/cryptsetup/cryptsetup-fix-crypt_get_volume_key_size-for-plain-device.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-Index: ChangeLog
-===================================================================
---- ChangeLog (Revision 664)
-+++ ChangeLog (Revision 665)
-@@ -1,3 +1,6 @@
-+2011-10-27 Milan Broz <mbroz@redhat.com>
-+ * Fix crypt_get_volume_key_size() for plain device.
-+
- 2011-10-25 Milan Broz <mbroz@redhat.com>
- * Print informative message in isLuks only in verbose mode.
- * Version 1.4.0.
-Index: tests/api-test.c
-===================================================================
---- tests/api-test.c (Revision 664)
-+++ tests/api-test.c (Revision 665)
-@@ -660,6 +660,11 @@
-
- FAIL_(crypt_init_by_name_and_header(&cd, CDEVICE_1, H_DEVICE),"can't init plain device by header device");
- OK_(crypt_init_by_name(&cd, CDEVICE_1));
-+ OK_(strcmp(cipher_mode,crypt_get_cipher_mode(cd)));
-+ OK_(strcmp(cipher,crypt_get_cipher(cd)));
-+ EQ_((int)key_size, crypt_get_volume_key_size(cd));
-+ EQ_(params.skip, crypt_get_iv_offset(cd));
-+ EQ_(params.offset, crypt_get_data_offset(cd));
- OK_(crypt_deactivate(cd, CDEVICE_1));
- crypt_free(cd);
-
-Index: lib/setup.c
-===================================================================
---- lib/setup.c (Revision 664)
-+++ lib/setup.c (Revision 665)
-@@ -56,6 +56,7 @@
- char *plain_cipher;
- char *plain_cipher_mode;
- char *plain_uuid;
-+ unsigned int plain_key_size;
-
- /* used in CRYPT_LOOPAES */
- struct crypt_params_loopaes loopaes_hdr;
-@@ -677,6 +678,7 @@
- (*cd)->plain_hdr.hash = NULL; /* no way to get this */
- (*cd)->plain_hdr.offset = dmd.offset;
- (*cd)->plain_hdr.skip = dmd.iv_offset;
-+ (*cd)->plain_key_size = dmd.vk->keylength;
-
- r = crypt_parse_name_and_mode(dmd.cipher, cipher, NULL, cipher_mode);
- if (!r) {
-@@ -754,6 +756,7 @@
- return -EINVAL;
- }
-
-+ cd->plain_key_size = volume_key_size;
- cd->volume_key = crypt_alloc_volume_key(volume_key_size, NULL);
- if (!cd->volume_key)
- return -ENOMEM;
-@@ -1516,7 +1519,7 @@
- }
-
- r = process_key(cd, cd->plain_hdr.hash,
-- cd->volume_key->keylength,
-+ cd->plain_key_size,
- passphrase, passphrase_size, &vk);
- if (r < 0)
- goto out;
-@@ -1586,7 +1589,7 @@
- goto out;
-
- r = process_key(cd, cd->plain_hdr.hash,
-- cd->volume_key->keylength,
-+ cd->plain_key_size,
- passphrase_read, passphrase_size_read, &vk);
- if (r < 0)
- goto out;
-@@ -1658,8 +1661,7 @@
- if (!name)
- return -EINVAL;
-
-- if (!volume_key || !volume_key_size || !cd->volume_key ||
-- volume_key_size != cd->volume_key->keylength) {
-+ if (!volume_key || !volume_key_size || volume_key_size != cd->plain_key_size) {
- log_err(cd, _("Incorrect volume key specified for plain device.\n"));
- return -EINVAL;
- }
-@@ -1976,8 +1978,8 @@
-
- int crypt_get_volume_key_size(struct crypt_device *cd)
- {
-- if (isPLAIN(cd->type) && cd->volume_key)
-- return cd->volume_key->keylength;
-+ if (isPLAIN(cd->type))
-+ return cd->plain_key_size;
-
- if (isLUKS(cd->type))
- return cd->hdr.keyBytes;
diff --git a/core/gcc/gcc-pr49720.patch b/core/gcc/gcc-pr49720.patch
deleted file mode 100644
index 8f50c4120..000000000
--- a/core/gcc/gcc-pr49720.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- trunk/gcc/simplify-rtx.c 2011/10/28 05:55:10 180603
-+++ trunk/gcc/simplify-rtx.c 2011/10/28 06:35:31 180604
-@@ -4352,10 +4352,20 @@
- {
- rtx x = XEXP (op0, 0);
- rtx c = XEXP (op0, 1);
-+ enum rtx_code invcode = op0code == PLUS ? MINUS : PLUS;
-+ rtx tem = simplify_gen_binary (invcode, cmp_mode, op1, c);
-
-- c = simplify_gen_binary (op0code == PLUS ? MINUS : PLUS,
-- cmp_mode, op1, c);
-- return simplify_gen_relational (code, mode, cmp_mode, x, c);
-+ /* Detect an infinite recursive condition, where we oscillate at this
-+ simplification case between:
-+ A + B == C <---> C - B == A,
-+ where A, B, and C are all constants with non-simplifiable expressions,
-+ usually SYMBOL_REFs. */
-+ if (GET_CODE (tem) == invcode
-+ && CONSTANT_P (x)
-+ && rtx_equal_p (c, XEXP (tem, 1)))
-+ return NULL_RTX;
-+
-+ return simplify_gen_relational (code, mode, cmp_mode, x, tem);
- }
-
- /* (ne:SI (zero_extract:SI FOO (const_int 1) BAR) (const_int 0))) is
diff --git a/core/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/core/glibc/glibc-2.12.1-static-shared-getpagesize.patch
deleted file mode 100644
index e84754279..000000000
--- a/core/glibc/glibc-2.12.1-static-shared-getpagesize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
-@@ -28,7 +28,7 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
-+#if 0 && defined __ASSUME_AT_PAGESIZE
- assert (GLRO(dl_pagesize) != 0);
- return GLRO(dl_pagesize);
- #else
diff --git a/core/glibc/glibc-2.13-futex.patch b/core/glibc/glibc-2.13-futex.patch
deleted file mode 100644
index 9b9c3ac45..000000000
--- a/core/glibc/glibc-2.13-futex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
-
- 7: movq %rdx, %rax
-
--#ifndef __ASSUME_PRIVATE_FUTEX
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- addq $16, %rsp
- cfi_adjust_cfa_offset(-16)
- popq %r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
diff --git a/core/glibc/glibc-2.14.1-tzfile-overflow.patch b/core/glibc/glibc-2.14.1-tzfile-overflow.patch
deleted file mode 100644
index 9e21cbfd3..000000000
--- a/core/glibc/glibc-2.14.1-tzfile-overflow.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/time/tzfile.c b/time/tzfile.c
-index 144e20b..402389c 100644
---- a/time/tzfile.c
-+++ b/time/tzfile.c
-@@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
- goto read_again;
- }
-
-+ if (__builtin_expect (num_transitions
-+ > ((SIZE_MAX - (__alignof__ (struct ttinfo) - 1))
-+ / (sizeof (time_t) + 1)), 0))
-+ goto lose;
- total_size = num_transitions * (sizeof (time_t) + 1);
- total_size = ((total_size + __alignof__ (struct ttinfo) - 1)
- & ~(__alignof__ (struct ttinfo) - 1));
- types_idx = total_size;
-- total_size += num_types * sizeof (struct ttinfo) + chars;
-+ if (__builtin_expect (num_types
-+ > (SIZE_MAX - total_size) / sizeof (struct ttinfo), 0))
-+ goto lose;
-+ total_size += num_types * sizeof (struct ttinfo);
-+ if (__builtin_expect (chars > SIZE_MAX - total_size, 0))
-+ goto lose;
-+ total_size += chars;
-+ if (__builtin_expect (__alignof__ (struct leap) - 1
-+ > SIZE_MAX - total_size, 0))
-+ goto lose;
- total_size = ((total_size + __alignof__ (struct leap) - 1)
- & ~(__alignof__ (struct leap) - 1));
- leaps_idx = total_size;
-+ if (__builtin_expect (num_leaps
-+ > (SIZE_MAX - total_size) / sizeof (struct leap), 0))
-+ goto lose;
- total_size += num_leaps * sizeof (struct leap);
-- tzspec_len = (sizeof (time_t) == 8 && trans_width == 8
-- ? st.st_size - (ftello (f)
-- + num_transitions * (8 + 1)
-- + num_types * 6
-- + chars
-- + num_leaps * 12
-- + num_isstd
-- + num_isgmt) - 1 : 0);
-+ tzspec_len = 0;
-+ if (sizeof (time_t) == 8 && trans_width == 8)
-+ {
-+ off_t rem = st.st_size - ftello (f);
-+ if (__builtin_expect (rem < 0
-+ || (size_t) rem < (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars), 0))
-+ goto lose;
-+ tzspec_len = (size_t) rem - (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars);
-+ if (__builtin_expect (num_leaps > SIZE_MAX / 12
-+ || tzspec_len < num_leaps * 12, 0))
-+ goto lose;
-+ tzspec_len -= num_leaps * 12;
-+ if (__builtin_expect (tzspec_len < num_isstd, 0))
-+ goto lose;
-+ tzspec_len -= num_isstd;
-+ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
-+ goto lose;
-+ tzspec_len -= num_isgmt + 1;
-+ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))
-+ goto lose;
-+ }
-+ if (__builtin_expect (SIZE_MAX - total_size - tzspec_len < extra, 0))
-+ goto lose;
-
- /* Allocate enough memory including the extra block requested by the
- caller. */
diff --git a/core/krb5/krb5-1.9.1-2011-006.patch b/core/krb5/krb5-1.9.1-2011-006.patch
deleted file mode 100644
index 05a22caf5..000000000
--- a/core/krb5/krb5-1.9.1-2011-006.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/src/plugins/kdb/db2/lockout.c b/src/plugins/kdb/db2/lockout.c
-index b473611..50c60b7 100644
---- a/src/plugins/kdb/db2/lockout.c
-+++ b/src/plugins/kdb/db2/lockout.c
-@@ -169,6 +169,9 @@ krb5_db2_lockout_audit(krb5_context context,
- return 0;
- }
-
-+ if (entry == NULL)
-+ return 0;
-+
- if (!db_ctx->disable_lockout) {
- code = lookup_lockout_policy(context, entry, &max_fail,
- &failcnt_interval, &lockout_duration);
-@@ -176,6 +179,15 @@ krb5_db2_lockout_audit(krb5_context context,
- return code;
- }
-
-+ /*
-+ * Don't continue to modify the DB for an already locked account.
-+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+ * this check is unneeded, but in rare cases, we can fail with an
-+ * integrity error or preauth failure before a policy check.)
-+ */
-+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+ return 0;
-+
- /* Only mark the authentication as successful if the entry
- * required preauthentication, otherwise we have no idea. */
- if (status == 0 && (entry->attributes & KRB5_KDB_REQUIRES_PRE_AUTH)) {
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-index 552e39a..c2f44ab 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c
-@@ -105,6 +105,7 @@ krb5_ldap_get_principal(krb5_context context, krb5_const_principal searchfor,
- CHECK_LDAP_HANDLE(ldap_context);
-
- if (is_principal_in_realm(ldap_context, searchfor) != 0) {
-+ st = KRB5_KDB_NOENTRY;
- krb5_set_error_message (context, st, "Principal does not belong to realm");
- goto cleanup;
- }
-diff --git a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-index a218dc7..fd164dd 100644
---- a/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-+++ b/src/plugins/kdb/ldap/libkdb_ldap/lockout.c
-@@ -165,6 +165,9 @@ krb5_ldap_lockout_audit(krb5_context context,
- return 0;
- }
-
-+ if (entry == NULL)
-+ return 0;
-+
- if (!ldap_context->disable_lockout) {
- code = lookup_lockout_policy(context, entry, &max_fail,
- &failcnt_interval,
-@@ -173,9 +176,16 @@ krb5_ldap_lockout_audit(krb5_context context,
- return code;
- }
-
-- entry->mask = 0;
-+ /*
-+ * Don't continue to modify the DB for an already locked account.
-+ * (In most cases, status will be KRB5KDC_ERR_CLIENT_REVOKED, and
-+ * this check is unneeded, but in rare cases, we can fail with an
-+ * integrity error or preauth failure before a policy check.)
-+ */
-+ if (locked_check_p(context, stamp, max_fail, lockout_duration, entry))
-+ return 0;
-
-- assert (!locked_check_p(context, stamp, max_fail, lockout_duration, entry));
-+ entry->mask = 0;
-
- /* Only mark the authentication as successful if the entry
- * required preauthentication, otherwise we have no idea. */
diff --git a/core/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch b/core/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch
deleted file mode 100644
index 1fce472b7..000000000
--- a/core/libpcap/Add-support-for-libnl-2.x-adapted-from-a-newer-versi.patch
+++ /dev/null
@@ -1,344 +0,0 @@
-From bc937fc4ff6715e9bee939041fa02be0755d7d58 Mon Sep 17 00:00:00 2001
-From: Guy Harris <guy@alum.mit.edu>
-Date: Sat, 13 Nov 2010 17:42:47 -0800
-Subject: [PATCH] Add support for libnl 2.x, adapted from a newer version of the iw command.
-
----
- config.h.in | 3 ++
- configure | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
- configure.in | 40 ++++++++++++++++++----
- pcap-linux.c | 58 ++++++++++++++++++++++++-------
- 4 files changed, 184 insertions(+), 25 deletions(-)
-
-diff --git a/config.h.in b/config.h.in
-index f988e8f..3b9ce3c 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -52,6 +52,9 @@
- /* if libnl exists */
- #undef HAVE_LIBNL
-
-+/* if libnl exists and is version 2.x */
-+#undef HAVE_LIBNL_2_x
-+
- /* Define to 1 if you have the <limits.h> header file. */
- #undef HAVE_LIMITS_H
-
-diff --git a/configure b/configure
-index c99c1ab..7338dee 100755
---- a/configure
-+++ b/configure
-@@ -7340,7 +7340,93 @@ fi
-
-
- if test x$with_libnl != xno ; then
-- { echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5
-+ #
-+ # Try libnl 2.x first.
-+ #
-+ { echo "$as_me:$LINENO: checking for nl_socket_alloc in -lnl" >&5
-+echo $ECHO_N "checking for nl_socket_alloc in -lnl... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_nl_nl_socket_alloc+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lnl $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char nl_socket_alloc ();
-+int
-+main ()
-+{
-+return nl_socket_alloc ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_lib_nl_nl_socket_alloc=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_lib_nl_nl_socket_alloc=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_socket_alloc" >&5
-+echo "${ECHO_T}$ac_cv_lib_nl_nl_socket_alloc" >&6; }
-+if test $ac_cv_lib_nl_nl_socket_alloc = yes; then
-+
-+ #
-+ # Yes, we have libnl 2.x.
-+ #
-+ LIBS="-lnl-genl -lnl $LIBS"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBNL 1
-+_ACEOF
-+
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_LIBNL_2_x 1
-+_ACEOF
-+
-+
-+else
-+
-+ #
-+ # No, we don't; do we have libnl 1.x?
-+ #
-+ { echo "$as_me:$LINENO: checking for nl_handle_alloc in -lnl" >&5
- echo $ECHO_N "checking for nl_handle_alloc in -lnl... $ECHO_C" >&6; }
- if test "${ac_cv_lib_nl_nl_handle_alloc+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-@@ -7402,18 +7488,30 @@ fi
- { echo "$as_me:$LINENO: result: $ac_cv_lib_nl_nl_handle_alloc" >&5
- echo "${ECHO_T}$ac_cv_lib_nl_nl_handle_alloc" >&6; }
- if test $ac_cv_lib_nl_nl_handle_alloc = yes; then
-- LIBS="-lnl $LIBS"
-+
-+ #
-+ # Yes.
-+ #
-+ LIBS="-lnl $LIBS"
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_LIBNL 1
- _ACEOF
-
-+
- else
-- if test x$with_libnl = xyes ; then
-- { { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5
-+
-+ #
-+ # No, we don't have libnl at all.
-+ #
-+ if test x$with_libnl = xyes ; then
-+ { { echo "$as_me:$LINENO: error: libnl support requested but libnl not found" >&5
- echo "$as_me: error: libnl support requested but libnl not found" >&2;}
- { (exit 1); exit 1; }; }
-- fi
-+ fi
-+
-+fi
-+
-
- fi
-
-diff --git a/configure.in b/configure.in
-index 16eadf9..ef801ed 100644
---- a/configure.in
-+++ b/configure.in
-@@ -445,13 +445,39 @@ linux)
- with_libnl=$withval,,)
-
- if test x$with_libnl != xno ; then
-- AC_CHECK_LIB(nl, nl_handle_alloc,
-- LIBS="-lnl $LIBS"
-- AC_DEFINE(HAVE_LIBNL,1,[if libnl exists]),
-- if test x$with_libnl = xyes ; then
-- AC_MSG_ERROR([libnl support requested but libnl not found])
-- fi
-- )
-+ #
-+ # Try libnl 2.x first.
-+ #
-+ AC_CHECK_LIB(nl, nl_socket_alloc,
-+ [
-+ #
-+ # Yes, we have libnl 2.x.
-+ #
-+ LIBS="-lnl-genl -lnl $LIBS"
-+ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
-+ AC_DEFINE(HAVE_LIBNL_2_x,1,[if libnl exists and is version 2.x])
-+ ],
-+ [
-+ #
-+ # No, we don't; do we have libnl 1.x?
-+ #
-+ AC_CHECK_LIB(nl, nl_handle_alloc,
-+ [
-+ #
-+ # Yes.
-+ #
-+ LIBS="-lnl $LIBS"
-+ AC_DEFINE(HAVE_LIBNL,1,[if libnl exists])
-+ ],
-+ [
-+ #
-+ # No, we don't have libnl at all.
-+ #
-+ if test x$with_libnl = xyes ; then
-+ AC_MSG_ERROR([libnl support requested but libnl not found])
-+ fi
-+ ])
-+ ])
- fi
-
- AC_LBL_TPACKET_STATS
-diff --git a/pcap-linux.c b/pcap-linux.c
-index f8b3f10..deabbc4 100644
---- a/pcap-linux.c
-+++ b/pcap-linux.c
-@@ -527,8 +527,37 @@ get_mac80211_phydev(pcap_t *handle, const char *device, char *phydev_path,
- return 1;
- }
-
-+#ifndef HAVE_LIBNL_2_x
-+/* libnl 2.x compatibility code */
-+
-+#define nl_sock nl_handle
-+
-+static inline struct nl_handle *
-+nl_socket_alloc(void)
-+{
-+ return nl_handle_alloc();
-+}
-+
-+static inline void
-+nl_socket_free(struct nl_handle *h)
-+{
-+ nl_handle_destroy(h);
-+}
-+
-+static inline int
-+__genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache)
-+{
-+ struct nl_cache *tmp = genl_ctrl_alloc_cache(h);
-+ if (!tmp)
-+ return -ENOMEM;
-+ *cache = tmp;
-+ return 0;
-+}
-+#define genl_ctrl_alloc_cache __genl_ctrl_alloc_cache
-+#endif /* !HAVE_LIBNL_2_x */
-+
- struct nl80211_state {
-- struct nl_handle *nl_handle;
-+ struct nl_sock *nl_sock;
- struct nl_cache *nl_cache;
- struct genl_family *nl80211;
- };
-@@ -536,23 +565,26 @@ struct nl80211_state {
- static int
- nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device)
- {
-- state->nl_handle = nl_handle_alloc();
-- if (!state->nl_handle) {
-+ int err;
-+
-+ state->nl_sock = nl_socket_alloc();
-+ if (!state->nl_sock) {
- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
- "%s: failed to allocate netlink handle", device);
- return PCAP_ERROR;
- }
-
-- if (genl_connect(state->nl_handle)) {
-+ if (genl_connect(state->nl_sock)) {
- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
- "%s: failed to connect to generic netlink", device);
- goto out_handle_destroy;
- }
-
-- state->nl_cache = genl_ctrl_alloc_cache(state->nl_handle);
-- if (!state->nl_cache) {
-+ err = genl_ctrl_alloc_cache(state->nl_sock, &state->nl_cache);
-+ if (err < 0) {
- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-- "%s: failed to allocate generic netlink cache", device);
-+ "%s: failed to allocate generic netlink cache: %s",
-+ device, strerror(-err));
- goto out_handle_destroy;
- }
-
-@@ -568,7 +600,7 @@ nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device)
- out_cache_free:
- nl_cache_free(state->nl_cache);
- out_handle_destroy:
-- nl_handle_destroy(state->nl_handle);
-+ nl_socket_free(state->nl_sock);
- return PCAP_ERROR;
- }
-
-@@ -577,7 +609,7 @@ nl80211_cleanup(struct nl80211_state *state)
- {
- genl_family_put(state->nl80211);
- nl_cache_free(state->nl_cache);
-- nl_handle_destroy(state->nl_handle);
-+ nl_socket_free(state->nl_sock);
- }
-
- static int
-@@ -605,7 +637,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- NLA_PUT_STRING(msg, NL80211_ATTR_IFNAME, mondevice);
- NLA_PUT_U32(msg, NL80211_ATTR_IFTYPE, NL80211_IFTYPE_MONITOR);
-
-- err = nl_send_auto_complete(state->nl_handle, msg);
-+ err = nl_send_auto_complete(state->nl_sock, msg);
- if (err < 0) {
- if (err == -ENFILE) {
- /*
-@@ -626,7 +658,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- return PCAP_ERROR;
- }
- }
-- err = nl_wait_for_ack(state->nl_handle);
-+ err = nl_wait_for_ack(state->nl_sock);
- if (err < 0) {
- if (err == -ENFILE) {
- /*
-@@ -685,7 +717,7 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- 0, NL80211_CMD_DEL_INTERFACE, 0);
- NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, ifindex);
-
-- err = nl_send_auto_complete(state->nl_handle, msg);
-+ err = nl_send_auto_complete(state->nl_sock, msg);
- if (err < 0) {
- if (err == -ENFILE) {
- /*
-@@ -706,7 +738,7 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- return PCAP_ERROR;
- }
- }
-- err = nl_wait_for_ack(state->nl_handle);
-+ err = nl_wait_for_ack(state->nl_sock);
- if (err < 0) {
- if (err == -ENFILE) {
- /*
---
-1.7.3.5
-
diff --git a/core/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch b/core/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch
deleted file mode 100644
index 219494200..000000000
--- a/core/libpcap/Libnl-2.x-returns-its-own-error-codes-not-errnos-han.patch
+++ /dev/null
@@ -1,159 +0,0 @@
-From 9545ff8e2670db02652f9cf781aafdd6bac58ac4 Mon Sep 17 00:00:00 2001
-From: Guy Harris <guy@alum.mit.edu>
-Date: Sun, 14 Nov 2010 13:48:19 -0800
-Subject: [PATCH] Libnl 2.x returns its own error codes, not errnos; handle that.
-
-While we're at it, don't special-case ENFILE for "delete monitor device"
-operations; that's not like "add monitor device", where we want to drive
-on if a device with that name already exists.
----
- pcap-linux.c | 76 ++++++++++++++++++++++++++--------------------------------
- 1 files changed, 34 insertions(+), 42 deletions(-)
-
-diff --git a/pcap-linux.c b/pcap-linux.c
-index deabbc4..5d291e9 100644
---- a/pcap-linux.c
-+++ b/pcap-linux.c
-@@ -527,7 +527,9 @@ get_mac80211_phydev(pcap_t *handle, const char *device, char *phydev_path,
- return 1;
- }
-
--#ifndef HAVE_LIBNL_2_x
-+#ifdef HAVE_LIBNL_2_x
-+#define get_nl_errmsg nl_geterror
-+#else
- /* libnl 2.x compatibility code */
-
- #define nl_sock nl_handle
-@@ -544,6 +546,8 @@ nl_socket_free(struct nl_handle *h)
- nl_handle_destroy(h);
- }
-
-+#define get_nl_errmsg strerror
-+
- static inline int
- __genl_ctrl_alloc_cache(struct nl_handle *h, struct nl_cache **cache)
- {
-@@ -584,7 +588,7 @@ nl80211_init(pcap_t *handle, struct nl80211_state *state, const char *device)
- if (err < 0) {
- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
- "%s: failed to allocate generic netlink cache: %s",
-- device, strerror(-err));
-+ device, get_nl_errmsg(-err));
- goto out_handle_destroy;
- }
-
-@@ -639,10 +643,17 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
-
- err = nl_send_auto_complete(state->nl_sock, msg);
- if (err < 0) {
-+#ifdef HAVE_LIBNL_2_x
-+ if (err == -NLE_FAILURE) {
-+#else
- if (err == -ENFILE) {
-+#endif
- /*
- * Device not available; our caller should just
-- * keep trying.
-+ * keep trying. (libnl 2.x maps ENFILE to
-+ * NLE_FAILURE; it can also map other errors
-+ * to that, but there's not much we can do
-+ * about that.)
- */
- nlmsg_free(msg);
- return 0;
-@@ -653,17 +664,24 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- */
- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
- "%s: nl_send_auto_complete failed adding %s interface: %s",
-- device, mondevice, strerror(-err));
-+ device, mondevice, get_nl_errmsg(-err));
- nlmsg_free(msg);
- return PCAP_ERROR;
- }
- }
- err = nl_wait_for_ack(state->nl_sock);
- if (err < 0) {
-+#ifdef HAVE_LIBNL_2_x
-+ if (err == -NLE_FAILURE) {
-+#else
- if (err == -ENFILE) {
-+#endif
- /*
- * Device not available; our caller should just
-- * keep trying.
-+ * keep trying. (libnl 2.x maps ENFILE to
-+ * NLE_FAILURE; it can also map other errors
-+ * to that, but there's not much we can do
-+ * about that.)
- */
- nlmsg_free(msg);
- return 0;
-@@ -674,7 +692,7 @@ add_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
- */
- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
- "%s: nl_wait_for_ack failed adding %s interface: %s",
-- device, mondevice, strerror(-err));
-+ device, mondevice, get_nl_errmsg(-err));
- nlmsg_free(msg);
- return PCAP_ERROR;
- }
-@@ -719,45 +737,19 @@ del_mon_if(pcap_t *handle, int sock_fd, struct nl80211_state *state,
-
- err = nl_send_auto_complete(state->nl_sock, msg);
- if (err < 0) {
-- if (err == -ENFILE) {
-- /*
-- * Device not available; our caller should just
-- * keep trying.
-- */
-- nlmsg_free(msg);
-- return 0;
-- } else {
-- /*
-- * Real failure, not just "that device is not
-- * available.
-- */
-- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-- "%s: nl_send_auto_complete failed deleting %s interface: %s",
-- device, mondevice, strerror(-err));
-- nlmsg_free(msg);
-- return PCAP_ERROR;
-- }
-+ snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-+ "%s: nl_send_auto_complete failed deleting %s interface: %s",
-+ device, mondevice, get_nl_errmsg(-err));
-+ nlmsg_free(msg);
-+ return PCAP_ERROR;
- }
- err = nl_wait_for_ack(state->nl_sock);
- if (err < 0) {
-- if (err == -ENFILE) {
-- /*
-- * Device not available; our caller should just
-- * keep trying.
-- */
-- nlmsg_free(msg);
-- return 0;
-- } else {
-- /*
-- * Real failure, not just "that device is not
-- * available.
-- */
-- snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-- "%s: nl_wait_for_ack failed adding %s interface: %s",
-- device, mondevice, strerror(-err));
-- nlmsg_free(msg);
-- return PCAP_ERROR;
-- }
-+ snprintf(handle->errbuf, PCAP_ERRBUF_SIZE,
-+ "%s: nl_wait_for_ack failed adding %s interface: %s",
-+ device, mondevice, get_nl_errmsg(-err));
-+ nlmsg_free(msg);
-+ return PCAP_ERROR;
- }
-
- /*
---
-1.7.3.5
-
diff --git a/core/syslog-ng/PKGBUILD b/core/syslog-ng/PKGBUILD
deleted file mode 100644
index ef636e51e..000000000
--- a/core/syslog-ng/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 143678 2011-11-28 11:05:29Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=syslog-ng
-pkgver=3.3.3
-pkgrel=1
-pkgdesc="Next-generation syslogd with advanced networking and filtering capabilities"
-arch=('i686' 'x86_64')
-license=('GPL2')
-groups=('base')
-url="http://www.balabit.com/network-security/syslog-ng/"
-depends=('glib2' 'eventlog' 'openssl' 'libcap' 'awk')
-makedepends=('flex' 'pkg-config')
-optdepends=('logrotate: for rotating log files')
-provides=('logger')
-options=('!libtool')
-backup=('etc/syslog-ng/modules.conf' 'etc/syslog-ng/scl.conf' \
- 'etc/syslog-ng/syslog-ng.conf' 'etc/logrotate.d/syslog-ng')
-source=("http://www.balabit.com/downloads/files/syslog-ng/sources/$pkgver/source/${pkgname}_$pkgver.tar.gz"
- syslog-ng.conf
- syslog-ng.logrotate
- syslog-ng.rc)
-sha1sums=('e2ec8ba4bde24809630a7675bf5d97f00be467f8'
- '98074e0facfc6ef036202662cc86d04b38a2c142'
- '949128fe3d7f77a7aab99048061f885bc758000c'
- 'a6ad26912b5bcbe1b47b003309945d733613b98f')
-
-build() {
- cd "$pkgname-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --sysconfdir=/etc/syslog-ng \
- --libexecdir=/usr/lib \
- --localstatedir=/var/lib/syslog-ng \
- --with-pidfile-dir=/run \
- --disable-spoof-source \
- --enable-systemd \
- --with-systemdsystemunitdir=/lib/systemd/system
-
- make
-}
-
-package() {
- make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install
-
- install -dm755 "$pkgdir/var/lib/syslog-ng" "$pkgdir/etc/syslog-ng/patterndb.d"
- install -Dm644 "$srcdir/syslog-ng.conf" "$pkgdir/etc/syslog-ng/syslog-ng.conf"
- install -Dm644 "$srcdir/syslog-ng.logrotate" "$pkgdir/etc/logrotate.d/syslog-ng"
- install -Dm755 "$srcdir/syslog-ng.rc" "$pkgdir/etc/rc.d/syslog-ng"
-}
diff --git a/core/syslog-ng/syslog-ng.conf b/core/syslog-ng/syslog-ng.conf
deleted file mode 100644
index 8f86eac2f..000000000
--- a/core/syslog-ng/syslog-ng.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-@version: 3.3
-#
-# /etc/syslog-ng/syslog-ng.conf
-#
-
-options {
- stats_freq (0);
- flush_lines (0);
- time_reopen (10);
- log_fifo_size (10000);
- chain_hostnames (off);
- use_dns (no);
- use_fqdn (no);
- create_dirs (no);
- keep_hostname (yes);
- perm(0640);
- group("log");
-};
-
-source src {
- unix-dgram("/dev/log");
- internal();
- file("/proc/kmsg");
-};
-
-destination d_authlog { file("/var/log/auth.log"); };
-destination d_syslog { file("/var/log/syslog.log"); };
-destination d_cron { file("/var/log/crond.log"); };
-destination d_daemon { file("/var/log/daemon.log"); };
-destination d_kernel { file("/var/log/kernel.log"); };
-destination d_lpr { file("/var/log/lpr.log"); };
-destination d_user { file("/var/log/user.log"); };
-destination d_uucp { file("/var/log/uucp.log"); };
-destination d_mail { file("/var/log/mail.log"); };
-destination d_news { file("/var/log/news.log"); };
-destination d_ppp { file("/var/log/ppp.log"); };
-destination d_debug { file("/var/log/debug.log"); };
-destination d_messages { file("/var/log/messages.log"); };
-destination d_errors { file("/var/log/errors.log"); };
-destination d_everything { file("/var/log/everything.log"); };
-destination d_iptables { file("/var/log/iptables.log"); };
-destination d_acpid { file("/var/log/acpid.log"); };
-destination d_console { usertty("root"); };
-
-# Log everything to tty12
-destination console_all { file("/dev/tty12"); };
-
-filter f_auth { facility(auth); };
-filter f_authpriv { facility(auth, authpriv); };
-filter f_syslog { program(syslog-ng); };
-filter f_cron { facility(cron); };
-filter f_daemon { facility(daemon); };
-filter f_kernel { facility(kern) and not filter(f_iptables); };
-filter f_lpr { facility(lpr); };
-filter f_mail { facility(mail); };
-filter f_news { facility(news); };
-filter f_user { facility(user); };
-filter f_uucp { facility(uucp); };
-filter f_ppp { facility(local2); };
-filter f_debug { not facility(auth, authpriv, news, mail); };
-filter f_messages { level(info..warn) and not facility(auth, authpriv, mail, news, cron) and not program(syslog-ng) and not filter(f_iptables); };
-filter f_everything { level(debug..emerg) and not facility(auth, authpriv); };
-filter f_emergency { level(emerg); };
-filter f_info { level(info); };
-filter f_notice { level(notice); };
-filter f_warn { level(warn); };
-filter f_crit { level(crit); };
-filter f_err { level(err); };
-filter f_iptables { match("IN=" value("MESSAGE")) and match("OUT=" value("MESSAGE")); };
-filter f_acpid { program("acpid"); };
-
-log { source(src); filter(f_acpid); destination(d_acpid); };
-log { source(src); filter(f_authpriv); destination(d_authlog); };
-log { source(src); filter(f_syslog); destination(d_syslog); };
-log { source(src); filter(f_cron); destination(d_cron); };
-log { source(src); filter(f_daemon); destination(d_daemon); };
-log { source(src); filter(f_kernel); destination(d_kernel); };
-log { source(src); filter(f_lpr); destination(d_lpr); };
-log { source(src); filter(f_mail); destination(d_mail); };
-log { source(src); filter(f_news); destination(d_news); };
-log { source(src); filter(f_ppp); destination(d_ppp); };
-log { source(src); filter(f_user); destination(d_user); };
-log { source(src); filter(f_uucp); destination(d_uucp); };
-#log { source(src); filter(f_debug); destination(d_debug); };
-log { source(src); filter(f_messages); destination(d_messages); };
-log { source(src); filter(f_err); destination(d_errors); };
-log { source(src); filter(f_emergency); destination(d_console); };
-log { source(src); filter(f_everything); destination(d_everything); };
-log { source(src); filter(f_iptables); destination(d_iptables); };
-
-# Log everything to tty12
-#log { source(src); destination(console_all); };
diff --git a/core/syslog-ng/syslog-ng.logrotate b/core/syslog-ng/syslog-ng.logrotate
deleted file mode 100644
index 3509f2970..000000000
--- a/core/syslog-ng/syslog-ng.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log /var/log/acpid.log /var/log/crond.log /var/log/lpr.log /var/log/uucp.log /var/log/news.log /var/log/ppp.log /var/log/debug.log {
- missingok
- sharedscripts
- postrotate
- /bin/kill -HUP $(cat /run/syslog-ng.pid 2>/dev/null) 2>/dev/null || true
- endscript
-}
diff --git a/core/syslog-ng/syslog-ng.rc b/core/syslog-ng/syslog-ng.rc
deleted file mode 100755
index 516b03da3..000000000
--- a/core/syslog-ng/syslog-ng.rc
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-checkconfig() {
- if ! syslog-ng -s -f /etc/syslog-ng/syslog-ng.conf; then
- stat_fail
- exit 1
- fi
-}
-
-pidfile=/run/syslog-ng.pid
-if [[ -r $pidfile ]]; then
- read -r PID < "$pidfile"
- if [[ $PID && ! -d /proc/$PID ]]; then
- # stale pidfile
- unset PID
- rm -f "$pidfile"
- fi
-fi
-
-case $1 in
- start)
- stat_busy "Starting Syslog-NG"
- checkconfig
- if [[ -z $PID ]] && /usr/sbin/syslog-ng; then
- add_daemon syslog-ng
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- stop)
- stat_busy "Stopping Syslog-NG"
- if [[ $PID ]] && kill $PID &>/dev/null; then
- rm_daemon syslog-ng
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- reload)
- stat_busy "Reloading Syslog-NG configuration and re-opening log files"
- if [[ -z $PID ]]; then
- stat_fail
- else
- checkconfig
- if kill -HUP $PID &>/dev/null; then
- stat_done
- else
- stat_fail
- exit 1
- fi
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart|reload}"
-esac
diff --git a/extra/arora/arora.install b/extra/arora/arora.install
deleted file mode 100644
index 5787df72f..000000000
--- a/extra/arora/arora.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/extra/avidemux/avidemux-2.5.4-x264-build115.patch b/extra/avidemux/avidemux-2.5.4-x264-build115.patch
deleted file mode 100644
index c627667ec..000000000
--- a/extra/avidemux/avidemux-2.5.4-x264-build115.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/encoder.cpp 2011-04-28 22:40:26.000000000 +0200
-@@ -488,8 +488,10 @@
- printf("[x264] analyse.b_transform_8x8 = %d\n", x264Param->analyse.b_transform_8x8);
- printf("[x264] analyse.inter = %d\n", x264Param->analyse.inter);
- printf("[x264] b_cabac = %d\n", x264Param->b_cabac);
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- printf("[x264] i_open_gop = %d\n", x264Param->i_open_gop);
-+#elif X264_BUILD > 114
-+ printf("[x264] b_open_gop = %d\n", x264Param->b_open_gop);
- #endif
- printf("[x264] b_interlaced = %d\n", x264Param->b_interlaced);
- #if X264_BUILD > 88
-diff -ru avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:35:36.000000000 +0200
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-28 22:43:36.000000000 +0200
-@@ -417,7 +417,7 @@
- _param.b_cabac = cabac;
- }
-
--#if X264_BUILD > 101
-+#if X264_BUILD > 101 && X264_BUILD < 115
- unsigned int x264Options::getOpenGopMode(void)
- {
- return _param.i_open_gop;
-@@ -428,6 +428,17 @@
- if (openGopMode < 3)
- _param.i_open_gop = openGopMode;
- }
-+#elif X264_BUILD > 114
-+unsigned int x264Options::getOpenGopMode(void)
-+{
-+ return _param.b_open_gop;
-+}
-+
-+void x264Options::setOpenGopMode(unsigned int openGopMode)
-+{
-+ if (openGopMode < 3)
-+ _param.b_open_gop = openGopMode;
-+}
- #endif
-
- unsigned int x264Options::getInterlaced(void)
diff --git a/extra/blender/PKGBUILD b/extra/blender/PKGBUILD
deleted file mode 100644
index fcd0f5da2..000000000
--- a/extra/blender/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# $Id: PKGBUILD 145008 2011-12-14 03:12:03Z eric $
-# Contributor: John Sowiak <john@archlinux.org>
-# Maintainer: tobias <tobias@archlinux.org>
-
-# Apparently, the blender guys refuse to release source tarballs for
-# intermediate releases that deal mainly with binaries but incorporate tiny
-# minor changes from svn. Since I'm sick and tired of the urges of users that
-# look for release numbers only, we make a messy PKGBUILD that can checkout svn
-# release if necessary.
-
-#_svn=true
-_svn=false
-
-pkgname=blender
-pkgver=2.61
-pkgrel=1
-epoch=3
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils' \
- 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' \
- 'freetype2' 'openal' 'ffmpeg')
-makedepends=('cmake')
-install=blender.install
-if [ $_svn = false ]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
- md5sums=('11a4721ff92286f678bb2e05e5f29c97')
-else
- source=(ftp://ftp.archlinux.org/other/${pkgname}/$pkgname-$pkgver.tar.xz)
- md5sums=('7579d1139d0d6025df8afcfca64a65c4')
-fi
-
-# source PKGBUILD && mksource
-mksource() {
- [[ -x /usr/bin/svn ]] || (echo "svn not found. Install subversion." && return 1)
- _svnver=38016
- _svntrunk="https://svn.blender.org/svnroot/bf-blender/trunk/blender"
- _svnmod="$pkgname-$pkgver"
- mkdir ${pkgname}-$pkgver
- pushd ${pkgname}-$pkgver
- svn co $_svntrunk --config-dir ./ -r $_svnver $_svnmod
- find . -depth -type d -name .svn -exec rm -rf {} \;
- tar -cJf ../${pkgname}-$pkgver.tar.xz ${pkgname}-$pkgver/*
- popd
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- mkdir build
- cd build
-
- [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD:BOOL=OFF"
-
- cmake .. \
- -DCMAKE_INSTALL_PREFIX:PATH=/usr \
- -DCMAKE_BUILD_TYPE:STRING=Release \
- -DWITH_INSTALL_PORTABLE:BOOL=OFF \
- -DWITH_PYTHON_INSTALL:BOOL=OFF \
- -DWITH_OPENCOLLADA:BOOL=OFF \
- -DWITH_GAMEENGINE:BOOL=ON \
- -DWITH_PLAYER:BOOL=ON \
- -DWITH_BUILTIN_GLEW:BOOL=OFF \
- -DWITH_CODEC_FFMPEG:BOOL=ON \
- -DWITH_CODEC_SNDFILE:BOOL=ON \
- -DPYTHON_VERSION:STRING=3.2 \
- -DPYTHON_LIBPATH:STRING=/usr/lib \
- -DPYTHON_LIBRARY:STRING=python3.2mu \
- -DPYTHON_INCLUDE_DIRS:STRING=/usr/include/python3.2mu \
- $ENABLESSE2
-
- make $MAKEFLAGS
-
- cp -rf "$srcdir"/${pkgname}-$pkgver/release/plugins/* \
- "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/
- cd "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi
- chmod 755 bmake
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver/build"
- make DESTDIR="${pkgdir}" install
- python -m compileall "${pkgdir}/usr/share/blender"
-
-# install plugins
- install -d -m755 "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/{sequence,texture}
- cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/sequence/*.so \
- "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/sequence/
- cp "$srcdir"/${pkgname}-$pkgver/source/blender/blenpluginapi/texture/*.so \
- "$pkgdir"/usr/share/blender/${pkgver%[a-z]}/plugins/texture/
-}
diff --git a/extra/blender/blender.install b/extra/blender/blender.install
deleted file mode 100644
index 724bfce00..000000000
--- a/extra/blender/blender.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/extra/claws-mail-extra-plugins/webkit1.6.1.patch b/extra/claws-mail-extra-plugins/webkit1.6.1.patch
deleted file mode 100644
index 82bc5d062..000000000
--- a/extra/claws-mail-extra-plugins/webkit1.6.1.patch
+++ /dev/null
@@ -1,106 +0,0 @@
---- src/fancy_viewer.c 2011-07-01 11:50:25.000000000 +0200
-+++ src/fancy_viewer.c 2011-09-30 06:02:45.000000000 +0200
-@@ -83,8 +83,10 @@
- static void download_file_cb(GtkWidget *widget, FancyViewer *viewer);
- #endif
-
--/*FIXME substitute webkitwebsettings.cpp functions with their API when available */
--gchar* webkit_web_view_get_selected_text(WebKitWebView* webView);
-+#if !WEBKIT_CHECK_VERSION (1,5,1)
-+gchar* webkit_web_view_get_selected_text(WebKitWebView* web_view);
-+#endif
-+
- /*------*/
- static GtkWidget *fancy_get_widget(MimeViewer *_viewer)
- {
-@@ -243,6 +245,8 @@
-
- gtk_print_unix_dialog_set_manual_capabilities(print_dialog,
- GTK_PRINT_CAPABILITY_GENERATE_PS);
-+ gtk_print_unix_dialog_set_manual_capabilities(print_dialog,
-+ GTK_PRINT_CAPABILITY_PREVIEW);
-
- result = gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_hide (dialog);
-@@ -293,7 +297,19 @@
- {
- debug_print("fancy_get_selection\n");
- FancyViewer *viewer = (FancyViewer *) _viewer;
-+#if WEBKIT_CHECK_VERSION(1,5,1)
-+ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
-+ viewer->window = webkit_dom_document_get_default_view (viewer->doc);
-+ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
-+ if (viewer->selection == NULL)
-+ return NULL;
-+ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
-+ if (viewer->range == NULL)
-+ return NULL;
-+ gchar *sel = webkit_dom_range_get_text (viewer->range);
-+#else
- gchar *sel = webkit_web_view_get_selected_text(viewer->view);
-+#endif
- if (!viewer->view || strlen(sel) == 0) {
- g_free(sel);
- return NULL;
-@@ -686,7 +702,15 @@
- debug_print("Clicked on Search on Web\n");
- if (webkit_web_view_has_selection(viewer->view)) {
- gchar *search;
-+#if WEBKIT_CHECK_VERSION(1,5,1)
-+ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
-+ viewer->window = webkit_dom_document_get_default_view (viewer->doc);
-+ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
-+ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
-+ gchar *tmp = webkit_dom_range_get_text (viewer->range);
-+#else
- gchar *tmp = webkit_web_view_get_selected_text(viewer->view);
-+#endif
- search = g_strconcat(GOOGLE_SEARCH, tmp, NULL);
- webkit_web_view_open(viewer->view, search);
- g_free(search);
-@@ -896,7 +920,6 @@
- static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu,
- FancyViewer *viewer)
- {
-- /*FIXME hack..until webkit does not give the proper way to handle it*/
- Plugin *plugin = plugin_get_loaded_by_name("RSSyl");
- gtk_container_foreach(GTK_CONTAINER(menu),
- (GtkCallback)viewer_menu_handler,
-@@ -941,7 +964,19 @@
- if (webkit_web_view_can_copy_clipboard(view)) {
- GtkClipboard *wv_clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
- const gchar *sel_text;
-- sel_text = (const gchar*)webkit_web_view_get_selected_text(view);
-+#if WEBKIT_CHECK_VERSION(1,5,1)
-+ viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
-+ viewer->window = webkit_dom_document_get_default_view (viewer->doc);
-+ viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
-+ if (viewer->selection == NULL)
-+ return NULL;
-+ viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
-+ if (viewer->range == NULL)
-+ return NULL;
-+ sel_text = (const *gchar)webkit_dom_range_get_text (viewer->range);
-+#else
-+ sel_text = (const *gchar)webkit_web_view_get_selected_text(viewer->view);
-+#endif
- gtk_clipboard_set_text(wv_clipboard, sel_text, -1);
- }
- return FALSE;
---- src/fancy_viewer.h 2011-07-01 11:50:25.000000000 +0200
-+++ src/fancy_viewer.h 2011-09-30 06:02:45.000000000 +0200
-@@ -113,6 +113,14 @@
- gint tag;
- gint loading;
- gint stop_previous;
-+
-+ /* DOM Objects */
-+#if WEBKIT_CHECK_VERSION(1,5,1)
-+ WebKitDOMDocument *doc;
-+ WebKitDOMDOMWindow *window;
-+ WebKitDOMDOMSelection *selection;
-+ WebKitDOMRange *range;
-+#endif
- };
- #define OPEN_INTERNAL FALSE
- #define OPEN_EXTERNAL TRUE
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
deleted file mode 100644
index 46ece794b..000000000
--- a/extra/cups/PKGBUILD
+++ /dev/null
@@ -1,144 +0,0 @@
-# $Id: PKGBUILD 136886 2011-09-02 16:22:36Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase="cups"
-pkgname=('libcups' 'cups')
-pkgver=1.5.0
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.cups.org/"
-makedepends=('libtiff>=3.9.2-2' 'libpng>=1.4.0' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
- 'xinetd' 'gzip' 'autoconf' 'php' 'libusb-compat' 'dbus-core' 'avahi' 'hicolor-icon-theme')
-source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
- cups-avahi.patch
- cups-no-export-ssllibs.patch
- cups-no-gcrypt.patch
- cups cups.logrotate cups.pam)
-#options=('!emptydirs')
-md5sums=('e54ed09ede2340fc3014913333520fe4'
- 'e0843e8d8c345792ac73a185260e69fe'
- '9b8467a1e51d360096b70e2c3c081e6c'
- '3733c23e77eb503bd94cc368e02830dc'
- '9657daa21760bb0b5fa3d8b51d5e01a1'
- 'f861b18f4446c43918c8643dcbbd7f6d'
- '96f82c38f3f540b53f3e5144900acf17')
-
-# move client.conf man page for next update to the client pkg.
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- # Avahi support in the dnssd backend. patch from Debian based on the Fedora work but brings it in a single file http://patch-tracker.debian.org/package/cups
- patch -Np1 -i ${srcdir}/cups-avahi.patch
-
- # Do not export SSL libs in cups-config
- patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
-
- patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
-
- # Rebuild configure script for --enable-avahi.
- aclocal -I config-scripts
- autoconf -I config-scripts
-
- ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
- --libdir=/usr/lib \
- --with-logdir=/var/log/cups \
- --with-docdir=/usr/share/cups/doc \
- --with-cups-user=daemon \
- --with-cups-group=lp \
- --enable-pam=yes \
- --disable-ldap \
- --enable-raw-printing \
- --enable-dbus --with-dbusdir=/etc/dbus-1 \
- --enable-ssl=yes --enable-gnutls \
- --enable-threads \
- --enable-avahi\
- --with-php=/usr/bin/php-cgi \
- --with-pdftops=pdftops \
- --with-optim="$CFLAGS"
- make
-}
-
-check() {
- cd "$srcdir/$pkgbase-$pkgver"
- #httpAddrGetList(workstation64): FAIL
- #1 TESTS FAILED!
- #make[1]: *** [testhttp] Error 1
- make -k check || /bin/true
-}
-
-package_libcups() {
-pkgdesc="The CUPS Printing System - client libraries and headers"
-depends=('gnutls>=2.8.3' 'libtiff>=3.9.2-2' 'libpng>=1.4.0' 'krb5' 'avahi')
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make BUILDROOT=${pkgdir} install-headers install-libs
- # put this into the libs pkg to make other software find the libs(no pkg-config file included)
- mkdir -p ${pkgdir}/usr/bin
- install -m755 ${srcdir}/${pkgbase}-${pkgver}/cups-config ${pkgdir}/usr/bin/cups-config
-}
-
-package_cups() {
-pkgdesc="The CUPS Printing System - deamon package"
-install=cups.install
-backup=(etc/cups/cupsd.conf
- etc/cups/mime.convs
- etc/cups/mime.types
- etc/cups/snmp.conf
- etc/cups/printers.conf
- etc/cups/classes.conf
- etc/cups/client.conf
- etc/cups/subscriptions.conf
- etc/dbus-1/system.d/cups.conf
- etc/logrotate.d/cups
- etc/pam.d/cups
- etc/xinetd.d/cups-lpd)
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'libusb-compat' 'dbus-core' 'hicolor-icon-theme')
-optdepends=('php: for included phpcups.so module'
- 'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
- 'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
- 'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
- 'foomatic-db-nonfree: drivers use Ghostscript to convert PostScript to a printable form directly'
- 'xdg-utils: xdg .desktop file support')
-
- cd ${srcdir}/${pkgbase}-${pkgver}
- make BUILDROOT=${pkgdir} install-data install-exec
-
- # this one we ship in the libcups pkg
- rm -f ${pkgdir}/usr/bin/cups-config
-
- # kill the sysv stuff
- rm -rf ${pkgdir}/etc/rc*.d
- rm -rf ${pkgdir}/etc/init.d
- install -D -m755 ../cups ${pkgdir}/etc/rc.d/cupsd
- install -D -m644 ../cups.logrotate ${pkgdir}/etc/logrotate.d/cups
- install -D -m644 ../cups.pam ${pkgdir}/etc/pam.d/cups
-
- # fix perms on /var/spool and /etc
- chmod 755 ${pkgdir}/var/spool
- chmod 755 ${pkgdir}/etc
-
- # serial backend needs to run as root (http://bugs.archlinux.org/task/20396)
- chmod 700 ${pkgdir}/usr/lib/cups/backend/serial
-
- # install ssl directory where to store the certs, solves some samba issues
- install -dm700 -g lp ${pkgdir}/etc/cups/ssl
- # remove directory from package, we create it in cups rc.d file
- rm -rf ${pkgdir}/var/run
-# install -dm511 -g lp ${pkgdir}/var/run/cups/certs
-
- # install some more configuration files that will get filled by cupsd
- touch ${pkgdir}/etc/cups/printers.conf
- touch ${pkgdir}/etc/cups/classes.conf
- touch ${pkgdir}/etc/cups/client.conf
- echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
- echo "ServerName /var/run/cups/cups.sock # alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
- touch ${pkgdir}/etc/cups/subscriptions.conf
- chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf}
-
- # fix .desktop file
- sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
-
- # compress some driver files, adopted from Fedora
- find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
-}
diff --git a/extra/cups/cups b/extra/cups/cups
deleted file mode 100755
index 744c8e663..000000000
--- a/extra/cups/cups
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-daemon_name=cupsd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-#. /etc/conf.d/$daemon_name.conf
-
-get_pid() {
- pidof -o %PPID $daemon_name
-}
-
-case "$1" in
- start)
- stat_busy "Starting $daemon_name daemon"
-
- PID=$(get_pid)
- if [ -z "$PID" ]; then
- [ -f /var/run/$daemon_name.pid ] && rm -f /var/run/$daemon_name.pid
- # RUN
- $daemon_name
- #
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- echo $(get_pid) > /var/run/$daemon_name.pid
- add_daemon $daemon_name
- stat_done
- fi
- else
- stat_fail
- exit 1
- fi
- ;;
-
- stop)
- stat_busy "Stopping $daemon_name daemon"
- PID=$(get_pid)
- # KILL
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- #
- if [ $? -gt 0 ]; then
- stat_fail
- exit 1
- else
- rm -f /var/run/$daemon_name.pid &> /dev/null
- rm_daemon $daemon_name
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
-
- status)
- stat_busy "Checking $daemon_name status";
- ck_status $daemon_name
- ;;
-
- *)
- echo "usage: $0 {start|stop|restart|status}"
-esac
-
-exit 0
diff --git a/extra/cups/cups-avahi.patch b/extra/cups/cups-avahi.patch
deleted file mode 100644
index 7e9c8ecea..000000000
--- a/extra/cups/cups-avahi.patch
+++ /dev/null
@@ -1,3156 +0,0 @@
-Description: Avahi support
-Bug: http://www.cups.org/str.php?L3066
-Author: Tim Waugh
-Origin: git clone http://twaugh.fedorapeople.org/cups-avahi.git (Aug 11, 2011)
-
---- a/backend/dnssd.c
-+++ b/backend/dnssd.c
-@@ -15,14 +15,21 @@
- *
- * Contents:
- *
-+ * next_txt_record() - Get next TXT record from a cups_txt_records_t.
-+ * parse_txt_record_pair() - Read key/value pair in cups_txt_records_t.
- * main() - Browse for printers.
- * browse_callback() - Browse devices.
- * browse_local_callback() - Browse local devices.
- * compare_devices() - Compare two devices.
- * exec_backend() - Execute the backend that corresponds to the
- * resolved service name.
-+ * device_type() - Get DNS-SD type enumeration from string.
- * get_device() - Create or update a device.
- * query_callback() - Process query data.
-+ * avahi_client_callback() - Avahi client callback function.
-+ * avahi_query_callback() - Avahi query callback function.
-+ * avahi_browse_callback() - Avahi browse callback function.
-+ * find_device() - Find a device from its name and domain.
- * sigterm_handler() - Handle termination signals...
- * unquote() - Unquote a name string.
- */
-@@ -33,7 +40,18 @@
-
- #include "backend-private.h"
- #include <cups/array.h>
--#include <dns_sd.h>
-+#ifdef HAVE_DNSSD
-+# include <dns_sd.h>
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+# include <avahi-client/client.h>
-+# include <avahi-client/lookup.h>
-+# include <avahi-common/simple-watch.h>
-+# include <avahi-common/domain.h>
-+# include <avahi-common/error.h>
-+# include <avahi-common/malloc.h>
-+#define kDNSServiceMaxDomainName AVAHI_DOMAIN_NAME_MAX
-+#endif /* HAVE_AVAHI */
-
-
- /*
-@@ -53,7 +71,12 @@
-
- typedef struct
- {
-+#ifdef HAVE_DNSSD
- DNSServiceRef ref; /* Service reference for resolve */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ int resolved; /* Did we resolve the device? */
-+#endif /* HAVE_AVAHI */
- char *name, /* Service name */
- *domain, /* Domain name */
- *fullName, /* Full name */
-@@ -65,6 +88,20 @@
- sent; /* Did we list the device? */
- } cups_device_t;
-
-+typedef struct
-+{
-+ char key[256];
-+ char value[256];
-+
-+#ifdef HAVE_DNSSD
-+ const uint8_t *data;
-+ const uint8_t *datanext;
-+ const uint8_t *dataend;
-+#else /* HAVE_AVAHI */
-+ AvahiStringList *txt;
-+#endif /* HAVE_DNSSD */
-+} cups_txt_records_t;
-+
-
- /*
- * Local globals...
-@@ -78,6 +115,7 @@
- * Local functions...
- */
-
-+#ifdef HAVE_DNSSD
- static void browse_callback(DNSServiceRef sdRef,
- DNSServiceFlags flags,
- uint32_t interfaceIndex,
-@@ -93,12 +131,6 @@
- const char *regtype,
- const char *replyDomain,
- void *context);
--static int compare_devices(cups_device_t *a, cups_device_t *b);
--static void exec_backend(char **argv);
--static cups_device_t *get_device(cups_array_t *devices,
-- const char *serviceName,
-- const char *regtype,
-- const char *replyDomain);
- static void query_callback(DNSServiceRef sdRef,
- DNSServiceFlags flags,
- uint32_t interfaceIndex,
-@@ -107,9 +139,118 @@
- uint16_t rrclass, uint16_t rdlen,
- const void *rdata, uint32_t ttl,
- void *context);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+static void avahi_client_callback (AvahiClient *client,
-+ AvahiClientState state,
-+ void *context);
-+static void avahi_browse_callback (AvahiServiceBrowser *browser,
-+ AvahiIfIndex interface,
-+ AvahiProtocol protocol,
-+ AvahiBrowserEvent event,
-+ const char *serviceName,
-+ const char *regtype,
-+ const char *replyDomain,
-+ AvahiLookupResultFlags flags,
-+ void *context);
-+#endif /* HAVE_AVAHI */
-+
-+static cups_device_t * find_device (cups_array_t *devices,
-+ cups_txt_records_t *txt,
-+ cups_device_t *dkey);
-+static int compare_devices(cups_device_t *a, cups_device_t *b);
-+static void exec_backend(char **argv);
-+static cups_device_t *get_device(cups_array_t *devices,
-+ const char *serviceName,
-+ const char *regtype,
-+ const char *replyDomain);
- static void sigterm_handler(int sig);
- static void unquote(char *dst, const char *src, size_t dstsize);
-
-+#ifdef HAVE_AVAHI
-+static AvahiSimplePoll *simple_poll = NULL;
-+static int avahi_got_callback;
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * 'next_txt_record()' - Get next TXT record from a cups_txt_records_t.
-+ */
-+
-+static cups_txt_records_t *
-+next_txt_record (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+ txt->data = txt->datanext;
-+#else /* HAVE_AVAHI */
-+ txt->txt = avahi_string_list_get_next (txt->txt);
-+ if (txt->txt == NULL)
-+ return NULL;
-+#endif /* HAVE_DNSSD */
-+
-+ return txt;
-+}
-+
-+
-+/*
-+ * 'parse_txt_record_pair()' - Read key/value pair in cups_txt_records_t.
-+ */
-+
-+static int
-+parse_txt_record_pair (cups_txt_records_t *txt)
-+{
-+#ifdef HAVE_DNSSD
-+ uint8_t datalen;
-+ uint8_t *data = txt->data;
-+ char *ptr;
-+
-+ /*
-+ * Read a key/value pair starting with an 8-bit length. Since the
-+ * length is 8 bits and the size of the key/value buffers is 256, we
-+ * don't need to check for overflow...
-+ */
-+
-+ datalen = *data++;
-+ if (!datalen || (data + datalen) >= txt->dataend)
-+ return NULL;
-+ txt->datanext = data + datalen;
-+
-+ for (ptr = txt->key; data < txt->datanext && *data != '='; data ++)
-+ *ptr++ = *data;
-+ *ptr = '\0';
-+
-+ if (data < txt->datanext && *data == '=')
-+ {
-+ data++;
-+
-+ if (data < datanext)
-+ memcpy (txt->value, data, txt->datanext - data);
-+ value[txt->datanext - data] = '\0';
-+ }
-+ else
-+ return 1;
-+#else /* HAVE_AVAHI */
-+ char *key, *value;
-+ size_t len;
-+ avahi_string_list_get_pair (txt->txt, &key, &value, &len);
-+ if (len > sizeof (txt->value) - 1)
-+ len = sizeof (txt->value) - 1;
-+
-+ memcpy (txt->value, value, len);
-+ txt->value[len] = '\0';
-+ len = strlen (key);
-+ if (len > sizeof (txt->key) - 1)
-+ len = sizeof (txt->key) - 1;
-+
-+ memcpy (txt->key, key, len);
-+ txt->key[len] = '\0';
-+ avahi_free (key);
-+ avahi_free (value);
-+#endif /* HAVE_AVAHI */
-+
-+ return 0;
-+}
-+
-
- /*
- * 'main()' - Browse for printers.
-@@ -120,6 +261,13 @@
- char *argv[]) /* I - Command-line arguments */
- {
- const char *name; /* Backend name */
-+ cups_array_t *devices; /* Device array */
-+ cups_device_t *device; /* Current device */
-+ char uriName[1024]; /* Unquoted fullName for URI */
-+#ifdef HAVE_DNSSD
-+ int fd; /* Main file descriptor */
-+ fd_set input; /* Input set for select() */
-+ struct timeval timeout; /* Timeout for select() */
- DNSServiceRef main_ref, /* Main service reference */
- fax_ipp_ref, /* IPP fax service reference */
- ipp_ref, /* IPP service reference */
-@@ -133,12 +281,11 @@
- pdl_datastream_ref, /* AppSocket service reference */
- printer_ref, /* LPD service reference */
- riousbprint_ref; /* Remote IO service reference */
-- int fd; /* Main file descriptor */
-- fd_set input; /* Input set for select() */
-- struct timeval timeout; /* Timeout for select() */
-- cups_array_t *devices; /* Device array */
-- cups_device_t *device; /* Current device */
-- char uriName[1024]; /* Unquoted fullName for URI */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ AvahiClient *client;
-+ int error;
-+#endif /* HAVE_AVAHI */
- #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
- struct sigaction action; /* Actions for POSIX signals */
- #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -198,6 +345,49 @@
- * Browse for different kinds of printers...
- */
-
-+#ifdef HAVE_AVAHI
-+ if ((simple_poll = avahi_simple_poll_new ()) == NULL)
-+ {
-+ perror ("ERROR: Unable to create avahi simple poll object");
-+ return (1);
-+ }
-+
-+ client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+ 0, avahi_client_callback, NULL, &error);
-+ if (!client)
-+ {
-+ perror ("DEBUG: Unable to create avahi client");
-+ return (0);
-+ }
-+
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_fax-ipp._tcp", NULL, 0,
-+ avahi_browse_callback, devices);
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_ipp._tcp", NULL, 0,
-+ avahi_browse_callback, devices);
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_ipp-tls._tcp", NULL, 0,
-+ avahi_browse_callback, devices);
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_pdl-datastream._tcp",
-+ NULL, 0,
-+ avahi_browse_callback,
-+ devices);
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_printer._tcp", NULL, 0,
-+ avahi_browse_callback, devices);
-+ avahi_service_browser_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ "_riousbprint._tcp", NULL, 0,
-+ avahi_browse_callback, devices);
-+#endif /* HAVE_AVAHI */
-+#ifdef HAVE_DNSSD
- if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
- {
- perror("ERROR: Unable to create service connection");
-@@ -258,6 +448,7 @@
- riousbprint_ref = main_ref;
- DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
- "_riousbprint._tcp", NULL, browse_callback, devices);
-+#endif /* HAVE_DNSSD */
-
- /*
- * Loop until we are killed...
-@@ -265,6 +456,9 @@
-
- while (!job_canceled)
- {
-+ int announce = 0;
-+
-+#ifdef HAVE_DNSSD
- FD_ZERO(&input);
- FD_SET(fd, &input);
-
-@@ -284,11 +478,35 @@
- }
- else
- {
-+ announce = 1;
-+ }
-+#else /* HAVE_AVAHI */
-+ int r;
-+ avahi_got_callback = 0;
-+ r = avahi_simple_poll_iterate (simple_poll, 1);
-+ if (r != 0 && r != EINTR)
-+ {
-+ /*
-+ * We've been told to exit the loop. Perhaps the connection to
-+ * avahi failed.
-+ */
-+
-+ break;
-+ }
-+
-+ if (avahi_got_callback)
-+ announce = 1;
-+#endif /* HAVE_DNSSD */
-+
-+ if (announce)
-+ {
- /*
- * Announce any devices we've found...
- */
-
-+#ifdef HAVE_DNSSD
- DNSServiceErrorType status; /* DNS query status */
-+#endif /* HAVE_DNSSD */
- cups_device_t *best; /* Best matching device */
- char device_uri[1024]; /* Device URI */
- int count; /* Number of queries */
-@@ -302,6 +520,7 @@
- if (device->sent)
- sent ++;
-
-+#ifdef HAVE_DNSSD
- if (device->ref)
- count ++;
-
-@@ -333,14 +552,23 @@
- count ++;
- }
- }
-- else if (!device->sent)
-+ else
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ if (!device->resolved)
-+ continue;
-+ else
-+#endif /* HAVE_AVAHI */
-+ if (!device->sent)
- {
-+#ifdef HAVE_DNSSD
- /*
- * Got the TXT records, now report the device...
- */
-
- DNSServiceRefDeallocate(device->ref);
- device->ref = 0;
-+#endif /* HAVE_DNSSD */
-
- if (!best)
- best = device;
-@@ -401,6 +629,7 @@
- }
-
-
-+#ifdef HAVE_DNSSD
- /*
- * 'browse_callback()' - Browse devices.
- */
-@@ -489,6 +718,7 @@
- device->fullName);
- device->sent = 1;
- }
-+#endif /* HAVE_DNSSD */
-
-
- /*
-@@ -569,6 +799,41 @@
-
-
- /*
-+ * 'device_type()' - Get DNS-SD type enumeration from string.
-+ */
-+
-+static int
-+device_type (const char *regtype)
-+{
-+#ifdef HAVE_AVAHI
-+ if (!strcmp(regtype, "_ipp._tcp"))
-+ return (CUPS_DEVICE_IPP);
-+ else if (!strcmp(regtype, "_ipps._tcp") ||
-+ !strcmp(regtype, "_ipp-tls._tcp"))
-+ return (CUPS_DEVICE_IPPS);
-+ else if (!strcmp(regtype, "_fax-ipp._tcp"))
-+ return (CUPS_DEVICE_FAX_IPP);
-+ else if (!strcmp(regtype, "_printer._tcp"))
-+ return (CUPS_DEVICE_PDL_DATASTREAM);
-+#else
-+ if (!strcmp(regtype, "_ipp._tcp."))
-+ return (CUPS_DEVICE_IPP);
-+ else if (!strcmp(regtype, "_ipps._tcp.") ||
-+ !strcmp(regtype, "_ipp-tls._tcp."))
-+ return (CUPS_DEVICE_IPPS);
-+ else if (!strcmp(regtype, "_fax-ipp._tcp."))
-+ return (CUPS_DEVICE_FAX_IPP);
-+ else if (!strcmp(regtype, "_printer._tcp."))
-+ return (CUPS_DEVICE_PRINTER);
-+ else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-+ return (CUPS_DEVICE_PDL_DATASTREAM);
-+#endif /* HAVE_AVAHI */
-+
-+ return (CUPS_DEVICE_RIOUSBPRINT);
-+}
-+
-+
-+/*
- * 'get_device()' - Create or update a device.
- */
-
-@@ -589,20 +854,7 @@
- */
-
- key.name = (char *)serviceName;
--
-- if (!strcmp(regtype, "_ipp._tcp."))
-- key.type = CUPS_DEVICE_IPP;
-- else if (!strcmp(regtype, "_ipps._tcp.") ||
-- !strcmp(regtype, "_ipp-tls._tcp."))
-- key.type = CUPS_DEVICE_IPPS;
-- else if (!strcmp(regtype, "_fax-ipp._tcp."))
-- key.type = CUPS_DEVICE_FAX_IPP;
-- else if (!strcmp(regtype, "_printer._tcp."))
-- key.type = CUPS_DEVICE_PRINTER;
-- else if (!strcmp(regtype, "_pdl-datastream._tcp."))
-- key.type = CUPS_DEVICE_PDL_DATASTREAM;
-- else
-- key.type = CUPS_DEVICE_RIOUSBPRINT;
-+ key.type = device_type (regtype);
-
- for (device = cupsArrayFind(devices, &key);
- device;
-@@ -622,8 +874,14 @@
- free(device->domain);
- device->domain = strdup(replyDomain);
-
-+#ifdef HAVE_DNSSD
- DNSServiceConstructFullName(fullName, device->name, regtype,
- replyDomain);
-+#else /* HAVE_AVAHI */
-+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+ serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- free(device->fullName);
- device->fullName = strdup(fullName);
- }
-@@ -643,6 +901,9 @@
- device->domain = strdup(replyDomain);
- device->type = key.type;
- device->priority = 50;
-+#ifdef HAVE_AVAHI
-+ device->resolved = 0;
-+#endif /* HAVE_AVAHI */
-
- cupsArrayAdd(devices, device);
-
-@@ -650,13 +911,20 @@
- * Set the "full name" of this service, which is used for queries...
- */
-
-+#ifdef HAVE_DNSSD
- DNSServiceConstructFullName(fullName, serviceName, regtype, replyDomain);
-+#else /* HAVE_AVAHI */
-+ avahi_service_name_join (fullName, kDNSServiceMaxDomainName,
-+ serviceName, regtype, replyDomain);
-+#endif /* HAVE_DNSSD */
-+
- device->fullName = strdup(fullName);
-
- return (device);
- }
-
-
-+#ifdef HAVE_DNSSD
- /*
- * 'query_callback()' - Process query data.
- */
-@@ -680,7 +948,7 @@
- *ptr; /* Pointer into string */
- cups_device_t dkey, /* Search key */
- *device; /* Device */
--
-+ cups_txt_records_t txt;
-
- fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
- "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -714,94 +982,233 @@
- if ((ptr = strstr(name, "._")) != NULL)
- *ptr = '\0';
-
-- if (strstr(fullName, "_ipp._tcp."))
-- dkey.type = CUPS_DEVICE_IPP;
-- else if (strstr(fullName, "_ipps._tcp.") ||
-- strstr(fullName, "_ipp-tls._tcp."))
-- dkey.type = CUPS_DEVICE_IPPS;
-- else if (strstr(fullName, "_fax-ipp._tcp."))
-- dkey.type = CUPS_DEVICE_FAX_IPP;
-- else if (strstr(fullName, "_printer._tcp."))
-- dkey.type = CUPS_DEVICE_PRINTER;
-- else if (strstr(fullName, "_pdl-datastream._tcp."))
-- dkey.type = CUPS_DEVICE_PDL_DATASTREAM;
-+ dkey.type = device_type (fullName);
-+
-+ txt.data = rdata;
-+ txt.dataend = rdata + rdlen;
-+ device = find_device ((cups_array_t *) context, &txt, &dkey);
-+ if (!device)
-+ fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+}
-+#endif /* HAVE_DNSSD */
-+
-+
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_client_callback()' - Avahi client callback function.
-+ */
-+
-+static void
-+avahi_client_callback(AvahiClient *client,
-+ AvahiClientState state,
-+ void *context)
-+{
-+ /*
-+ * If the connection drops, quit.
-+ */
-+
-+ if (state == AVAHI_CLIENT_FAILURE)
-+ {
-+ fprintf (stderr, "ERROR: Avahi connection failed\n");
-+ avahi_simple_poll_quit (simple_poll);
-+ }
-+}
-+
-+
-+/*
-+ * 'avahi_query_callback()' - Avahi query callback function.
-+ */
-+
-+static void
-+avahi_query_callback(AvahiServiceResolver *resolver,
-+ AvahiIfIndex interface,
-+ AvahiProtocol protocol,
-+ AvahiResolverEvent event,
-+ const char *name,
-+ const char *type,
-+ const char *domain,
-+ const char *host_name,
-+ const AvahiAddress *address,
-+ uint16_t port,
-+ AvahiStringList *txt,
-+ AvahiLookupResultFlags flags,
-+ void *context)
-+{
-+ AvahiClient *client;
-+ cups_device_t key,
-+ *device;
-+ char uqname[1024],
-+ *ptr;
-+ cups_txt_records_t txtr;
-+
-+ client = avahi_service_resolver_get_client (resolver);
-+ if (event != AVAHI_RESOLVER_FOUND)
-+ {
-+ if (event == AVAHI_RESOLVER_FAILURE)
-+ {
-+ fprintf (stderr, "ERROR: %s\n",
-+ avahi_strerror (avahi_client_errno (client)));
-+ }
-+
-+ avahi_service_resolver_free (resolver);
-+ return;
-+ }
-+
-+ /*
-+ * Set search key for device.
-+ */
-+
-+ key.name = uqname;
-+ unquote (uqname, name, sizeof (uqname));
-+ if ((ptr = strstr(name, "._")) != NULL)
-+ *ptr = '\0';
-+
-+ key.domain = (char *) domain;
-+ key.type = device_type (type);
-+
-+ /*
-+ * Find the device and the the TXT information.
-+ */
-+
-+ txtr.txt = txt;
-+ device = find_device ((cups_array_t *) context, &txtr, &key);
-+ if (device)
-+ {
-+ /*
-+ * Let the main loop know to announce the device.
-+ */
-+
-+ device->resolved = 1;
-+ avahi_got_callback = 1;
-+ }
- else
-- dkey.type = CUPS_DEVICE_RIOUSBPRINT;
-+ fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
-+
-+ avahi_service_resolver_free (resolver);
-+}
-+
-+
-+/*
-+ * 'avahi_browse_callback()' - Avahi browse callback function.
-+ */
-+
-+static void
-+avahi_browse_callback(AvahiServiceBrowser *browser,
-+ AvahiIfIndex interface,
-+ AvahiProtocol protocol,
-+ AvahiBrowserEvent event,
-+ const char *name,
-+ const char *type,
-+ const char *domain,
-+ AvahiLookupResultFlags flags,
-+ void *context)
-+{
-+ AvahiClient *client = avahi_service_browser_get_client (browser);
-+
-+ switch (event)
-+ {
-+ case AVAHI_BROWSER_FAILURE:
-+ fprintf (stderr, "ERROR: %s\n",
-+ avahi_strerror (avahi_client_errno (client)));
-+ avahi_simple_poll_quit (simple_poll);
-+ return;
-+
-+ case AVAHI_BROWSER_NEW:
-+ /*
-+ * This object is new on the network.
-+ */
-+
-+ if (flags & AVAHI_LOOKUP_RESULT_LOCAL)
-+ {
-+ /*
-+ * This comes from the local machine so ignore it.
-+ */
-+
-+ fprintf (stderr, "DEBUG: ignoring local service %s\n", name);
-+ }
-+ else
-+ {
-+ /*
-+ * Create a device entry for it if it doesn't yet exist.
-+ */
-+
-+ get_device ((cups_array_t *)context, name, type, domain);
-+
-+ /*
-+ * Now look for a TXT entry.
-+ */
-+
-+ if (avahi_service_resolver_new (client, interface, protocol,
-+ name, type, domain,
-+ AVAHI_PROTO_UNSPEC, 0,
-+ avahi_query_callback, context) == NULL)
-+ {
-+ fprintf (stderr, "ERROR: failed to resolve service %s: %s\n",
-+ name, avahi_strerror (avahi_client_errno (client)));
-+ }
-+ }
-+
-+ break;
-+
-+ case AVAHI_BROWSER_REMOVE:
-+ case AVAHI_BROWSER_ALL_FOR_NOW:
-+ case AVAHI_BROWSER_CACHE_EXHAUSTED:
-+ break;
-+ }
-+}
-+#endif /* HAVE_AVAHI */
-+
-
-- for (device = cupsArrayFind(devices, &dkey);
-+/*
-+ * 'find_device()' - Find a device from its name and domain.
-+ */
-+
-+static cups_device_t *
-+find_device (cups_array_t *devices,
-+ cups_txt_records_t *txt,
-+ cups_device_t *dkey)
-+{
-+ cups_device_t *device;
-+ char *ptr;
-+
-+ for (device = cupsArrayFind(devices, dkey);
- device;
- device = cupsArrayNext(devices))
- {
-- if (_cups_strcasecmp(device->name, dkey.name) ||
-- _cups_strcasecmp(device->domain, dkey.domain))
-+ if (_cups_strcasecmp(device->name, dkey->name) ||
-+ _cups_strcasecmp(device->domain, dkey->domain))
- {
- device = NULL;
- break;
- }
-- else if (device->type == dkey.type)
-+ else if (device->type == dkey->type)
- {
- /*
- * Found it, pull out the priority and make and model from the TXT
- * record and save it...
- */
-
-- const uint8_t *data, /* Pointer into data */
-- *datanext, /* Next key/value pair */
-- *dataend; /* End of entire TXT record */
-- uint8_t datalen; /* Length of current key/value pair */
-- char key[256], /* Key string */
-- value[256], /* Value string */
-- make_and_model[512],
-+ char make_and_model[512],
- /* Manufacturer and model */
- model[256], /* Model */
-- device_id[2048];/* 1284 device ID */
--
-+ device_id[2048]; /* 1284 device ID */
-
- device_id[0] = '\0';
- make_and_model[0] = '\0';
-
- strcpy(model, "Unknown");
-
-- for (data = rdata, dataend = data + rdlen;
-- data < dataend;
-- data = datanext)
-+ for (;;)
- {
-- /*
-- * Read a key/value pair starting with an 8-bit length. Since the
-- * length is 8 bits and the size of the key/value buffers is 256, we
-- * don't need to check for overflow...
-- */
--
-- datalen = *data++;
--
-- if (!datalen || (data + datalen) >= dataend)
-- break;
--
-- datanext = data + datalen;
--
-- for (ptr = key; data < datanext && *data != '='; data ++)
-- *ptr++ = *data;
-- *ptr = '\0';
-+ char *key;
-+ char *value;
-
-- if (data < datanext && *data == '=')
-- {
-- data ++;
--
-- if (data < datanext)
-- memcpy(value, data, datanext - data);
-- value[datanext - data] = '\0';
-+ if (parse_txt_record_pair (txt))
-+ goto next;
-
-- fprintf(stderr, "DEBUG2: query_callback: \"%s=%s\".\n",
-- key, value);
-- }
-- else
-- {
-- fprintf(stderr, "DEBUG2: query_callback: \"%s\" with no value.\n",
-- key);
-- continue;
-- }
--
-- if (!_cups_strncasecmp(key, "usb_", 4))
-+ key = txt->key;
-+ value = txt->value;
-+ if (!strncasecmp(key, "usb_", 4))
- {
- /*
- * Add USB device ID information...
-@@ -856,6 +1263,10 @@
- if (device->type == CUPS_DEVICE_PRINTER)
- device->sent = 1;
- }
-+
-+ next:
-+ if (next_txt_record (txt) == NULL)
-+ break;
- }
-
- if (device->device_id)
-@@ -905,11 +1316,9 @@
- }
- }
-
-- if (!device)
-- fprintf(stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", fullName);
-+ return device;
- }
-
--
- /*
- * 'sigterm_handler()' - Handle termination signals...
- */
---- a/config-scripts/cups-dnssd.m4
-+++ b/config-scripts/cups-dnssd.m4
-@@ -23,6 +23,21 @@
- DNSSDLIBS=""
- DNSSD_BACKEND=""
-
-+AC_ARG_ENABLE(avahi, [ --enable-avahi turn on DNS Service Discovery support, default=no],
-+ [if test x$enable_avahi = xyes; then
-+ AC_MSG_CHECKING(for Avahi)
-+ if $PKGCONFIG --exists avahi-client; then
-+ AC_MSG_RESULT(yes)
-+ CFLAGS="$CFLAGS `$PKGCONFIG --cflags avahi-client`"
-+ DNSSDLIBS="`$PKGCONFIG --libs avahi-client`"
-+ DNSSD_BACKEND="dnssd"
-+ AC_DEFINE(HAVE_AVAHI)
-+ enable_dnssd=no
-+ else
-+ AC_MSG_RESULT(no)
-+ fi
-+ fi])
-+
- if test x$enable_dnssd != xno; then
- AC_CHECK_HEADER(dns_sd.h, [
- case "$uname" in
---- a/config.h.in
-+++ b/config.h.in
-@@ -390,6 +390,13 @@
-
-
- /*
-+ * Do we have Avahi for DNS Service Discovery?
-+ */
-+
-+#undef HAVE_AVAHI
-+
-+
-+/*
- * Do we have <sys/ioctl.h>?
- */
-
---- a/cups/http-support.c
-+++ b/cups/http-support.c
-@@ -43,6 +43,10 @@
- * http_copy_decode() - Copy and decode a URI.
- * http_copy_encode() - Copy and encode a URI.
- * http_resolve_cb() - Build a device URI for the given service name.
-+ * avahi_resolve_uri_client_cb()
-+ * - Avahi client callback for resolving URI.
-+ * avahi_resolve_uri_resolver_cb()
-+ * - Avahi resolver callback for resolving URI.
- */
-
- /*
-@@ -60,6 +64,11 @@
- # include <sys/select.h>
- # endif /* WIN32 */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+# include <avahi-client/client.h>
-+# include <avahi-client/lookup.h>
-+# include <avahi-common/simple-watch.h>
-+#endif /* HAVE_AVAHI */
-
-
- /*
-@@ -127,6 +136,24 @@
- void *context);
- #endif /* HAVE_DNSSD */
-
-+#ifdef HAVE_AVAHI
-+static void avahi_resolve_uri_client_cb(AvahiClient *client,
-+ AvahiClientState state,
-+ void *simple_poll);
-+static void avahi_resolve_uri_resolver_cb(AvahiServiceResolver *resolver,
-+ AvahiIfIndex interface,
-+ AvahiProtocol protocol,
-+ AvahiResolverEvent event,
-+ const char *name,
-+ const char *type,
-+ const char *domain,
-+ const char *host_name,
-+ const AvahiAddress *address,
-+ uint16_t port,
-+ AvahiStringList *txt,
-+ AvahiLookupResultFlags flags,
-+ void *context);
-+#endif /* HAVE_AVAHI */
-
- /*
- * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1431,6 +1458,9 @@
-
- if (strstr(hostname, "._tcp"))
- {
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+ char *regtype, /* Pointer to type in hostname */
-+ *domain; /* Pointer to domain in hostname */
- #ifdef HAVE_DNSSD
- # ifdef WIN32
- # pragma comment(lib, "dnssd.lib")
-@@ -1449,6 +1479,17 @@
- fd_set input_set; /* Input set for select() */
- struct timeval stimeout; /* Timeout value for select() */
- #endif /* HAVE_POLL */
-+#else /* HAVE_AVAHI */
-+ AvahiSimplePoll *simple_poll;
-+ AvahiClient *client;
-+ int error;
-+ struct
-+ {
-+ AvahiSimplePoll *poll;
-+ _http_uribuf_t uribuf;
-+ } user_data;
-+#endif /* HAVE_DNSSD */
-+
-
- if (options & _HTTP_RESOLVE_STDERR)
- fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname);
-@@ -1485,9 +1526,16 @@
- if (domain)
- *domain++ = '\0';
-
-+#ifdef HAVE_DNSSD
- uribuf.buffer = resolved_uri;
- uribuf.bufsize = resolved_size;
- uribuf.options = options;
-+#else
-+ user_data.uribuf.buffer = resolved_uri;
-+ user_data.uribuf.bufsize = resolved_size;
-+ user_data.uribuf.options = options;
-+#endif
-+
- resolved_uri[0] = '\0';
-
- DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", "
-@@ -1501,6 +1549,7 @@
-
- uri = NULL;
-
-+#ifdef HAVE_DNSSD
- if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
- {
- localref = ref;
-@@ -1608,6 +1657,36 @@
-
- DNSServiceRefDeallocate(ref);
- }
-+#else /* HAVE_AVAHI */
-+ if ((simple_poll = avahi_simple_poll_new ()) != NULL)
-+ {
-+ if ((client = avahi_client_new (avahi_simple_poll_get (simple_poll),
-+ 0, avahi_resolve_uri_client_cb,
-+ &simple_poll, &error)) != NULL)
-+ {
-+ user_data.poll = simple_poll;
-+ if (avahi_service_resolver_new (client, AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC, hostname,
-+ regtype, domain, AVAHI_PROTO_UNSPEC, 0,
-+ avahi_resolve_uri_resolver_cb,
-+ &user_data) != NULL)
-+ {
-+ avahi_simple_poll_loop (simple_poll);
-+
-+ /*
-+ * Collect the result.
-+ */
-+
-+ if (resolved_uri[0])
-+ uri = resolved_uri;
-+ }
-+
-+ avahi_client_free (client);
-+ }
-+
-+ avahi_simple_poll_free (simple_poll);
-+ }
-+#endif /* HAVE_DNSSD */
-
- if (options & _HTTP_RESOLVE_STDERR)
- {
-@@ -1619,13 +1698,13 @@
- fputs("STATE: -connecting-to-device,offline-report\n", stderr);
- }
-
--#else
-+#else /* HAVE_DNSSD || HAVE_AVAHI */
- /*
- * No DNS-SD support...
- */
-
- uri = NULL;
--#endif /* HAVE_DNSSD */
-+#endif /* HAVE_DNSSD || HAVE_AVAHI */
-
- if ((options & _HTTP_RESOLVE_STDERR) && !uri)
- _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer."));
-@@ -1895,6 +1974,116 @@
- #endif /* HAVE_DNSSD */
-
-
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_client_cb (AvahiClient *client,
-+ AvahiClientState state,
-+ void *simple_poll)
-+{
-+ DEBUG_printf(("avahi_resolve_uri_client_callback(client=%p, state=%d, "
-+ "simple_poll=%p)\n", client, state, simple_poll));
-+
-+ /*
-+ * If the connection drops, quit.
-+ */
-+
-+ if (state == AVAHI_CLIENT_FAILURE)
-+ avahi_simple_poll_quit (simple_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_resolve_uri_resolver_cb()' - Avahi resolver callback for resolving
-+ * URI.
-+ */
-+
-+static void
-+avahi_resolve_uri_resolver_cb (AvahiServiceResolver *resolver,
-+ AvahiIfIndex interface,
-+ AvahiProtocol protocol,
-+ AvahiResolverEvent event,
-+ const char *name,
-+ const char *type,
-+ const char *domain,
-+ const char *host_name,
-+ const AvahiAddress *address,
-+ uint16_t port,
-+ AvahiStringList *txt,
-+ AvahiLookupResultFlags flags,
-+ void *context)
-+{
-+ const char *scheme; /* URI scheme */
-+ char rp[256]; /* Remote printer */
-+ AvahiStringList *pair;
-+ char *value;
-+ size_t valueLen = 0;
-+ char addr[AVAHI_ADDRESS_STR_MAX];
-+ struct
-+ {
-+ AvahiSimplePoll *poll;
-+ _http_uribuf_t uribuf;
-+ } *poll_uribuf = context;
-+
-+ DEBUG_printf(("avahi_resolve_uri_resolver_callback(resolver=%p, "
-+ "interface=%d, protocol=%d, event=%d, name=\"%s\", "
-+ "type=\"%s\", domain=\"%s\", host_name=\"%s\", address=%p, "
-+ "port=%d, txt=%p, flags=%d, context=%p)\n",
-+ resolver, interface, protocol, event, name, type, domain,
-+ host_name, address, port, txt, flags, context));
-+
-+ if (event != AVAHI_RESOLVER_FOUND)
-+ {
-+ avahi_service_resolver_free (resolver);
-+ avahi_simple_poll_quit (poll_uribuf->poll);
-+ return;
-+ }
-+
-+ /*
-+ * Figure out the scheme from the full name...
-+ */
-+
-+ if (strstr(type, "_ipp."))
-+ scheme = "ipp";
-+ else if (strstr(type, "_printer."))
-+ scheme = "lpd";
-+ else if (strstr(type, "_pdl-datastream."))
-+ scheme = "socket";
-+ else
-+ scheme = "riousbprint";
-+
-+ /*
-+ * Extract the "remote printer key from the TXT record...
-+ */
-+
-+ if ((pair = avahi_string_list_find (txt, "rp")) != NULL)
-+ {
-+ avahi_string_list_get_pair (pair, NULL, &value, &valueLen);
-+ rp[0] = '/';
-+ memcpy (rp + 1, value, valueLen);
-+ rp[valueLen + 1] = '\0';
-+ }
-+ else
-+ rp[0] = '\0';
-+
-+ /*
-+ * Assemble the final device URI...
-+ */
-+
-+ avahi_address_snprint (addr, AVAHI_ADDRESS_STR_MAX, address);
-+ httpAssembleURI(HTTP_URI_CODING_ALL, poll_uribuf->uribuf.buffer,
-+ poll_uribuf->uribuf.bufsize, scheme, NULL,
-+ addr, port, rp);
-+ DEBUG_printf(("avahi_resolve_uri_resolver_callback: Resolved URI is \"%s\"\n",
-+ poll_uribuf->uribuf.buffer));
-+ avahi_simple_poll_quit (poll_uribuf->poll);
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
- * End of "$Id: http-support.c 9820 2011-06-10 22:06:26Z mike $".
- */
---- a/scheduler/Makefile
-+++ b/scheduler/Makefile
-@@ -17,6 +17,7 @@
-
- CUPSDOBJS = \
- auth.o \
-+ avahi.o \
- banners.o \
- cert.o \
- classes.o \
-@@ -39,7 +40,8 @@
- server.o \
- statbuf.o \
- subscriptions.o \
-- sysman.o
-+ sysman.o \
-+ timeout.o
- LIBOBJS = \
- filter.o \
- mime.o \
---- /dev/null
-+++ b/scheduler/avahi.c
-@@ -0,0 +1,445 @@
-+/*
-+ * "$Id$"
-+ *
-+ * Avahi poll implementation for the CUPS scheduler.
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ * Authors:
-+ * Tim Waugh <twaugh@redhat.com>
-+ *
-+ * Distribution and use rights are outlined in the file "LICENSE.txt"
-+ * "LICENSE" which should have been included with this file. If this
-+ * file is missing or damaged, see the license at "http://www.cups.org/".
-+ *
-+ * Contents:
-+ *
-+ * watch_read_cb - Read callback for file descriptor
-+ * watch_write_cb - Write callback for file descriptor
-+ * watched_fd_add_select() - Call cupsdAddSelect() as needed
-+ * watch_new() - Create a new file descriptor watch
-+ * watch_free() - Free a file descriptor watch
-+ * watch_update() - Update watched events for a file descriptor
-+ * watch_get_events() - Get events that happened for a file descriptor
-+ * timeout_cb() - Run a timed Avahi callback
-+ * timeout_new() - Set a wakeup time
-+ * timeout_update() - Update the expiration time for a timeout
-+ * timeout_free() - Free a timeout
-+ * compare_watched_fds() - Compare watched file descriptors for array sorting
-+ * compare_timeouts() - Compare timeouts for array sorting
-+ * avahi_cups_poll_new() - Create a new Avahi main loop object for CUPS
-+ * avahi_cups_poll_free() - Free an Avahi main loop object for CUPS
-+ * avahi_cups_poll_get() - Get the abstract poll API structure
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+# include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+# include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+typedef struct
-+{
-+ AvahiCupsPoll *cups_poll;
-+
-+ int fd;
-+ AvahiWatchEvent occurred;
-+ cups_array_t *watches;
-+} cupsd_watched_fd_t;
-+
-+struct AvahiWatch
-+{
-+ cupsd_watched_fd_t *watched_fd;
-+
-+ AvahiWatchEvent events;
-+ AvahiWatchCallback callback;
-+ void *userdata;
-+};
-+
-+struct AvahiTimeout
-+{
-+ AvahiCupsPoll *cups_poll;
-+ AvahiTimeoutCallback callback;
-+ void *userdata;
-+ cupsd_timeout_t *cupsd_timeout;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+static AvahiWatch * watch_new(const AvahiPoll *api,
-+ int fd,
-+ AvahiWatchEvent events,
-+ AvahiWatchCallback callback,
-+ void *userdata);
-+static void watch_free(AvahiWatch *watch);
-+static void watch_update(AvahiWatch *watch,
-+ AvahiWatchEvent events);
-+static AvahiWatchEvent watch_get_events(AvahiWatch *watch);
-+static int compare_watches(AvahiWatch *p0,
-+ AvahiWatch *p1);
-+
-+
-+/*
-+ * 'watch_read_cb' - Read callback for file descriptor
-+ */
-+
-+static void
-+watch_read_cb (void *userdata)
-+{
-+ AvahiWatch *watch;
-+ cupsd_watched_fd_t *watched_fd = userdata;
-+ watched_fd->occurred |= AVAHI_WATCH_IN;
-+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+ watch;
-+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
-+ if (watch->events & watched_fd->occurred) {
-+ (watch->callback) (watch, watched_fd->fd,
-+ AVAHI_WATCH_IN, watch->userdata);
-+ watched_fd->occurred &= ~AVAHI_WATCH_IN;
-+ break;
-+ }
-+ }
-+}
-+
-+
-+/*
-+ * 'watch_write_cb' - Write callback for file descriptor
-+ */
-+
-+static void
-+watch_write_cb (void *userdata)
-+{
-+ AvahiWatch *watch;
-+ cupsd_watched_fd_t *watched_fd = userdata;
-+ watched_fd->occurred |= AVAHI_WATCH_OUT;
-+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+ watch;
-+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
-+ if (watch->events & watched_fd->occurred) {
-+ (watch->callback) (watch, watched_fd->fd,
-+ AVAHI_WATCH_OUT, watch->userdata);
-+ watched_fd->occurred &= ~AVAHI_WATCH_OUT;
-+ break;
-+ }
-+ }
-+}
-+
-+
-+/*
-+ * 'watched_fd_add_select' - Call cupsdAddSelect() as needed
-+ */
-+
-+static int /* O - Watches? */
-+watched_fd_add_select (cupsd_watched_fd_t *watched_fd)
-+{
-+ AvahiWatch *watch;
-+ cupsd_selfunc_t read_cb = NULL, write_cb = NULL;
-+
-+ for (watch = (AvahiWatch *)cupsArrayFirst(watched_fd->watches);
-+ watch;
-+ watch = (AvahiWatch *)cupsArrayNext(watched_fd->watches)) {
-+ if (watch->events & (AVAHI_WATCH_IN |
-+ AVAHI_WATCH_ERR |
-+ AVAHI_WATCH_HUP)) {
-+ read_cb = (cupsd_selfunc_t)watch_read_cb;
-+ if (write_cb != NULL)
-+ break;
-+ }
-+
-+ if (watch->events & AVAHI_WATCH_OUT) {
-+ write_cb = (cupsd_selfunc_t)watch_write_cb;
-+ if (read_cb != NULL)
-+ break;
-+ }
-+ }
-+
-+ if (read_cb || write_cb)
-+ cupsdAddSelect (watched_fd->fd, read_cb, write_cb, watched_fd);
-+ else
-+ cupsdRemoveSelect (watched_fd->fd);
-+
-+ return (read_cb || write_cb);
-+}
-+
-+/*
-+ * 'watch_new' - Create a new file descriptor watch
-+ */
-+
-+static AvahiWatch *
-+watch_new (const AvahiPoll *api,
-+ int fd,
-+ AvahiWatchEvent events,
-+ AvahiWatchCallback callback,
-+ void *userdata)
-+{
-+ cupsd_watched_fd_t key, *watched_fd;
-+ AvahiCupsPoll *cups_poll = api->userdata;
-+ AvahiWatch *watch = malloc(sizeof(AvahiWatch));
-+ if (watch == NULL)
-+ return (NULL);
-+
-+ watch->events = events;
-+ watch->callback = callback;
-+ watch->userdata = userdata;
-+
-+ key.fd = fd;
-+ watched_fd = cupsArrayFind (cups_poll->watched_fds, &key);
-+ if (watched_fd == NULL) {
-+ watched_fd = malloc(sizeof(cupsd_watched_fd_t));
-+ if (watched_fd == NULL) {
-+ free (watch);
-+ return (NULL);
-+ }
-+
-+ watched_fd->fd = fd;
-+ watched_fd->occurred = 0;
-+ watched_fd->cups_poll = cups_poll;
-+ watched_fd->watches = cupsArrayNew ((cups_array_func_t)compare_watches,
-+ NULL);
-+ }
-+
-+ watch->watched_fd = watched_fd;
-+ cupsArrayAdd(watched_fd->watches, watch);
-+ watched_fd_add_select (watched_fd);
-+ return (watch);
-+}
-+
-+
-+/*
-+ * 'watch_free' - Free a file descriptor watch
-+ */
-+
-+static void
-+watch_free (AvahiWatch *watch)
-+{
-+ cupsd_watched_fd_t *watched_fd = watch->watched_fd;
-+ AvahiCupsPoll *cups_poll = watched_fd->cups_poll;
-+
-+ cupsArrayRemove (watched_fd->watches, watch);
-+ free (watch);
-+
-+ if (!watched_fd_add_select (watched_fd)) {
-+ /* No more watches */
-+ cupsArrayRemove (cups_poll->watched_fds, watched_fd);
-+ free (watched_fd);
-+ }
-+}
-+
-+
-+/*
-+ * 'watch_update' - Update watched events for a file descriptor
-+ */
-+
-+static void
-+watch_update (AvahiWatch *watch,
-+ AvahiWatchEvent events)
-+{
-+ watch->events = events;
-+ watched_fd_add_select (watch->watched_fd);
-+}
-+
-+
-+/*
-+ * 'watch_get_events' - Get events that happened for a file descriptor
-+ */
-+
-+static AvahiWatchEvent
-+watch_get_events (AvahiWatch *watch)
-+{
-+ return (watch->watched_fd->occurred);
-+}
-+
-+
-+/*
-+ * 'compare_watches' - Compare watches for array sorting
-+ */
-+
-+static int
-+compare_watches (AvahiWatch *p0,
-+ AvahiWatch *p1)
-+{
-+ if (p0->watched_fd->fd < p1->watched_fd->fd)
-+ return (-1);
-+
-+ return ((p0->watched_fd->fd == p1->watched_fd->fd) ? 0 : 1);
-+}
-+
-+
-+/*
-+ * 'timeout_cb()' - Run a timed Avahi callback
-+ */
-+
-+static void
-+timeout_cb (cupsd_timeout_t *cupsd_timeout, void *userdata)
-+{
-+ AvahiTimeout *timeout = userdata;
-+ (timeout->callback) (timeout, timeout->userdata);
-+}
-+
-+
-+/*
-+ * 'timeout_new' - Set a wakeup time
-+ */
-+
-+static AvahiTimeout *
-+timeout_new (const AvahiPoll *api,
-+ const struct timeval *tv,
-+ AvahiTimeoutCallback callback,
-+ void *userdata)
-+{
-+ AvahiTimeout *timeout;
-+ AvahiCupsPoll *cups_poll = api->userdata;
-+
-+ timeout = malloc(sizeof(AvahiTimeout));
-+ if (timeout == NULL)
-+ return (NULL);
-+
-+ timeout->cups_poll = cups_poll;
-+ timeout->callback = callback;
-+ timeout->userdata = userdata;
-+ timeout->cupsd_timeout = cupsdAddTimeout (tv,
-+ (cupsd_timeoutfunc_t)timeout_cb,
-+ timeout);
-+ cupsArrayAdd (cups_poll->timeouts, timeout);
-+ return (timeout);
-+}
-+
-+
-+/*
-+ * 'timeout_update' - Update the expiration time for a timeout
-+ */
-+
-+static void
-+timeout_update (AvahiTimeout *timeout,
-+ const struct timeval *tv)
-+{
-+ cupsdUpdateTimeout (timeout->cupsd_timeout, tv);
-+}
-+
-+
-+/*
-+ * ' timeout_free' - Free a timeout
-+ */
-+
-+static void
-+timeout_free (AvahiTimeout *timeout)
-+{
-+ cupsArrayRemove (timeout->cups_poll->timeouts, timeout);
-+ cupsdRemoveTimeout (timeout->cupsd_timeout);
-+ free (timeout);
-+}
-+
-+
-+/*
-+ * 'compare_watched_fds' - Compare watched file descriptors for array sorting
-+ */
-+static int
-+compare_watched_fds(cupsd_watched_fd_t *p0,
-+ cupsd_watched_fd_t *p1)
-+{
-+ if (p0->fd != p1->fd)
-+ return (p0->fd < p1->fd ? -1 : 1);
-+
-+ if (p0 == p1)
-+ return (0);
-+
-+ return (p0 < p1 ? -1 : 1);
-+}
-+
-+
-+/*
-+ * 'compare_timeouts' - Compare timeouts for array sorting
-+ */
-+static int
-+compare_timeouts(AvahiTimeout *p0,
-+ AvahiTimeout *p1)
-+{
-+ /*
-+ * Just compare pointers to make it a stable sort.
-+ */
-+
-+ if (p0->cupsd_timeout < p1->cupsd_timeout)
-+ return (-1);
-+ return ((p0->cupsd_timeout == p1->cupsd_timeout) ? 0 : 1);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_new' - Create a new Avahi main loop object for CUPS
-+ */
-+
-+AvahiCupsPoll *
-+avahi_cups_poll_new (void)
-+{
-+ AvahiCupsPoll *cups_poll = malloc(sizeof(AvahiCupsPoll));
-+ if (cups_poll == NULL)
-+ return (NULL);
-+
-+ cups_poll->watched_fds = cupsArrayNew ((cups_array_func_t)compare_watched_fds,
-+ NULL);
-+ cups_poll->timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts,
-+ NULL);
-+
-+ cups_poll->api.userdata = cups_poll;
-+ cups_poll->api.watch_new = watch_new;
-+ cups_poll->api.watch_free = watch_free;
-+ cups_poll->api.watch_update = watch_update;
-+ cups_poll->api.watch_get_events = watch_get_events;
-+
-+ cups_poll->api.timeout_new = timeout_new;
-+ cups_poll->api.timeout_update = timeout_update;
-+ cups_poll->api.timeout_free = timeout_free;
-+
-+ return (cups_poll);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_free' - Free an Avahi main loop object for CUPS
-+ */
-+void
-+avahi_cups_poll_free (AvahiCupsPoll *cups_poll)
-+{
-+ cupsd_watched_fd_t *watched_fd;
-+
-+ for (watched_fd = (cupsd_watched_fd_t*)cupsArrayFirst(cups_poll->watched_fds);
-+ watched_fd;
-+ watched_fd = (cupsd_watched_fd_t*)cupsArrayNext(cups_poll->watched_fds)){
-+ cupsArrayClear (watched_fd->watches);
-+ }
-+
-+ cupsArrayClear (cups_poll->watched_fds);
-+ cupsArrayClear (cups_poll->timeouts);
-+}
-+
-+
-+/*
-+ * 'avahi_cups_poll_get' - Get the abstract poll API structure
-+ */
-+
-+const AvahiPoll *
-+avahi_cups_poll_get (AvahiCupsPoll *cups_poll)
-+{
-+ return (&cups_poll->api);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
---- /dev/null
-+++ b/scheduler/avahi.h
-@@ -0,0 +1,49 @@
-+/*
-+ * "$Id$"
-+ *
-+ * Avahi poll implementation for the CUPS scheduler.
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ * Authors:
-+ * Tim Waugh <twaugh@redhat.com>
-+ *
-+ * Distribution and use rights are outlined in the file "LICENSE.txt"
-+ * which should have been included with this file. If this file is
-+ * file is missing or damaged, see the license at "http://www.cups.org/".
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI
-+# include <avahi-client/client.h>
-+# include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_AUTHORIZATION_H
-+# include <Security/Authorization.h>
-+#endif /* HAVE_AUTHORIZATION_H */
-+
-+
-+#ifdef HAVE_AVAHI
-+typedef struct
-+{
-+ AvahiPoll api;
-+ cups_array_t *watched_fds;
-+ cups_array_t *timeouts;
-+} AvahiCupsPoll;
-+#endif /* HAVE_AVAHI */
-+
-+/*
-+ * Prototypes...
-+ */
-+
-+#ifdef HAVE_AVAHI
-+extern AvahiCupsPoll * avahi_cups_poll_new(void);
-+extern void avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
-+extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
-+#endif /* HAVE_AVAHI */
-+
-+
-+/*
-+ * End of "$Id$".
-+ */
---- a/scheduler/cupsd.h
-+++ b/scheduler/cupsd.h
-@@ -140,6 +140,15 @@
-
- typedef void (*cupsd_selfunc_t)(void *data);
-
-+#ifdef HAVE_AVAHI
-+/*
-+ * Timeout callback function type...
-+ */
-+
-+typedef struct _cupsd_timeout_s cupsd_timeout_t;
-+typedef void (*cupsd_timeoutfunc_t)(cupsd_timeout_t *timeout, void *data);
-+#endif /* HAVE_AVAHI */
-+
-
- /*
- * Globals...
-@@ -173,6 +182,11 @@
- /* Running from launchd */
- #endif /* HAVE_LAUNCH_H */
-
-+#ifdef HAVE_AVAHI
-+VAR cups_array_t *Timeouts; /* Timed callbacks for main loop */
-+#endif /* HAVE_AVAHI */
-+
-+
-
- /*
- * Prototypes...
-@@ -242,6 +256,20 @@
- extern void cupsdStartServer(void);
- extern void cupsdStopServer(void);
-
-+#ifdef HAVE_AVAHI
-+extern void cupsdInitTimeouts(void);
-+extern cupsd_timeout_t *cupsdAddTimeout (const struct timeval *tv,
-+ cupsd_timeoutfunc_t cb,
-+ void *data);
-+extern cupsd_timeout_t *cupsdNextTimeout (long *delay);
-+extern void cupsdRunTimeout (cupsd_timeout_t *timeout);
-+extern void cupsdUpdateTimeout (cupsd_timeout_t *timeout,
-+ const struct timeval *tv);
-+extern void cupsdRemoveTimeout (cupsd_timeout_t *timeout);
-+#endif /* HAVE_AVAHI */
-+
-+extern int cupsdRemoveFile(const char *filename);
-+
-
- /*
- * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $".
---- a/scheduler/main.c
-+++ b/scheduler/main.c
-@@ -122,6 +122,10 @@
- cupsd_listener_t *lis; /* Current listener */
- time_t current_time, /* Current time */
- activity, /* Client activity timer */
-+#ifdef HAVE_AVAHI
-+ avahi_client_time, /* Time for next Avahi client
-+ check */
-+#endif /* HAVE_AVAHI */
- browse_time, /* Next browse send time */
- senddoc_time, /* Send-Document time */
- expire_time, /* Subscription expire time */
-@@ -148,6 +152,10 @@
- int launchd_idle_exit;
- /* Idle exit on select timeout? */
- #endif /* HAVE_LAUNCHD */
-+#ifdef HAVE_AVAHI
-+ cupsd_timeout_t *tmo; /* Next scheduled timed callback */
-+ long tmo_delay; /* Time before it must be called */
-+#endif /* HAVE_AVAHI */
-
-
- #ifdef HAVE_GETEUID
-@@ -527,6 +535,14 @@
-
- httpInitialize();
-
-+#ifdef HAVE_AVAHI
-+ /*
-+ * Initialize timed callback structures.
-+ */
-+
-+ cupsdInitTimeouts();
-+#endif /* HAVE_AVAHI */
-+
- cupsdStartServer();
-
- /*
-@@ -657,6 +673,9 @@
- */
-
- current_time = time(NULL);
-+#ifdef HAVE_AVAHI
-+ avahi_client_time = current_time;
-+#endif /* HAVE_AVAHI */
- browse_time = current_time;
- event_time = current_time;
- expire_time = current_time;
-@@ -871,6 +890,26 @@
- }
- #endif /* __APPLE__ */
-
-+#ifdef HAVE_AVAHI
-+ /*
-+ * If a timed callback is due, run it.
-+ */
-+
-+ tmo = cupsdNextTimeout (&tmo_delay);
-+ if (tmo && tmo_delay == 0)
-+ cupsdRunTimeout (tmo);
-+
-+ /*
-+ * Try to restart the Avahi client every 10 seconds if needed...
-+ */
-+
-+ if ((current_time - avahi_client_time) >= 10)
-+ {
-+ avahi_client_time = current_time;
-+ cupsdStartAvahiClient();
-+ }
-+#endif /* HAVE_AVAHI */
-+
- #ifndef __APPLE__
- /*
- * Update the network interfaces once a minute...
-@@ -1815,6 +1854,10 @@
- cupsd_job_t *job; /* Job information */
- cupsd_subscription_t *sub; /* Subscription information */
- const char *why; /* Debugging aid */
-+#ifdef HAVE_AVAHI
-+ cupsd_timeout_t *tmo; /* Timed callback */
-+ long tmo_delay; /* Seconds before calling it */
-+#endif /* HAVE_AVAHI */
-
-
- /*
-@@ -1857,6 +1900,19 @@
- }
- #endif /* __APPLE__ */
-
-+#ifdef HAVE_AVAHI
-+ /*
-+ * See if there are any scheduled timed callbacks to run.
-+ */
-+
-+ tmo = cupsdNextTimeout (&tmo_delay);
-+ if (tmo)
-+ {
-+ timeout = tmo_delay;
-+ why = "run a timed callback";
-+ }
-+#endif /* HAVE_AVAHI */
-+
- /*
- * Check whether we are accepting new connections...
- */
---- /dev/null
-+++ b/scheduler/timeout.c
-@@ -0,0 +1,195 @@
-+/*
-+ * "$Id$"
-+ *
-+ * Timeout functions for the Common UNIX Printing System (CUPS).
-+ *
-+ * Copyright (C) 2010 Red Hat, Inc.
-+ * Authors:
-+ * Tim Waugh <twaugh@redhat.com>
-+ *
-+ * Distribution and use rights are outlined in the file "LICENSE.txt"
-+ * which should have been included with this file. If this file is
-+ * file is missing or damaged, see the license at "http://www.cups.org/".
-+ *
-+ * Contents:
-+ *
-+ * cupsdInitTimeouts() - Initialise timeout structure.
-+ * cupsdAddTimeout() - Add a timed callback.
-+ * cupsdNextTimeout() - Find the next enabled timed callback.
-+ * cupsdUpdateTimeout() - Adjust the time of a timed callback or disable it.
-+ * cupsdRemoveTimeout() - Discard a timed callback.
-+ * compare_timeouts() - Compare timed callbacks for array sorting.
-+ */
-+
-+#include <config.h>
-+
-+#ifdef HAVE_AVAHI /* Applies to entire file... */
-+
-+/*
-+ * Include necessary headers...
-+ */
-+
-+#include "cupsd.h"
-+
-+#if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
-+# include <malloc.h>
-+#endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
-+
-+#ifdef HAVE_AVAHI
-+# include <avahi-common/timeval.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+struct _cupsd_timeout_s
-+{
-+ struct timeval when;
-+ int enabled;
-+ cupsd_timeoutfunc_t callback;
-+ void *data;
-+};
-+
-+/*
-+ * Local functions...
-+ */
-+
-+/*
-+ * 'compare_timeouts()' - Compare timed callbacks for array sorting.
-+ */
-+
-+static int
-+compare_timeouts (cupsd_timeout_t *p0, cupsd_timeout_t *p1)
-+{
-+ if (!p0->enabled || !p1->enabled)
-+ {
-+ if (!p0->enabled && !p1->enabled)
-+ return (0);
-+
-+ return (p0->enabled ? -1 : 1);
-+ }
-+
-+ return (avahi_timeval_compare (&p0->when, &p1->when));
-+}
-+
-+
-+/*
-+ * 'cupsdInitTimeouts()' - Initialise timeout structures.
-+ */
-+
-+void
-+cupsdInitTimeouts(void)
-+{
-+ Timeouts = cupsArrayNew ((cups_array_func_t)compare_timeouts, NULL);
-+}
-+
-+
-+/*
-+ * 'cupsdAddTimeout()' - Add a timed callback.
-+ */
-+
-+cupsd_timeout_t * /* O - Timeout handle */
-+cupsdAddTimeout(const struct timeval *tv, /* I - Absolute time */
-+ cupsd_timeoutfunc_t cb, /* I - Callback function */
-+ void *data) /* I - User data */
-+{
-+ cupsd_timeout_t *timeout;
-+
-+ timeout = malloc (sizeof(cupsd_timeout_t));
-+ if (timeout != NULL)
-+ {
-+ timeout->enabled = (tv != NULL);
-+ if (tv)
-+ {
-+ timeout->when.tv_sec = tv->tv_sec;
-+ timeout->when.tv_usec = tv->tv_usec;
-+ }
-+
-+ timeout->callback = cb;
-+ timeout->data = data;
-+ cupsArrayAdd (Timeouts, timeout);
-+ }
-+
-+ return timeout;
-+}
-+
-+
-+/*
-+ * 'cupsdNextTimeout()' - Find the next enabled timed callback.
-+ */
-+
-+cupsd_timeout_t * /* O - Next enabled timeout or NULL */
-+cupsdNextTimeout(long *delay) /* O - Seconds before scheduled */
-+{
-+ cupsd_timeout_t *first = cupsArrayFirst (Timeouts);
-+ struct timeval curtime;
-+
-+ if (first && !first->enabled)
-+ first = NULL;
-+
-+ if (first && delay)
-+ {
-+ gettimeofday (&curtime, NULL);
-+ if (avahi_timeval_compare (&curtime, &first->when) > 0)
-+ {
-+ *delay = 0;
-+ } else {
-+ *delay = 1 + first->when.tv_sec - curtime.tv_sec;
-+ if (first->when.tv_usec < curtime.tv_usec)
-+ (*delay)--;
-+ }
-+ }
-+
-+ return (first);
-+}
-+
-+
-+/*
-+ * 'cupsdRunTimeout()' - Run a timed callback.
-+ */
-+
-+void
-+cupsdRunTimeout(cupsd_timeout_t *timeout) /* I - Timeout */
-+{
-+ if (!timeout)
-+ return;
-+ timeout->enabled = 0;
-+ if (!timeout->callback)
-+ return;
-+ timeout->callback (timeout, timeout->data);
-+}
-+
-+/*
-+ * 'cupsdUpdateTimeout()' - Adjust the time of a timed callback or disable it.
-+ */
-+
-+void
-+cupsdUpdateTimeout(cupsd_timeout_t *timeout, /* I - Timeout */
-+ const struct timeval *tv) /* I - Absolute time or NULL */
-+{
-+ cupsArrayRemove (Timeouts, timeout);
-+ timeout->enabled = (tv != NULL);
-+ if (tv)
-+ {
-+ timeout->when.tv_sec = tv->tv_sec;
-+ timeout->when.tv_usec = tv->tv_usec;
-+ }
-+ cupsArrayAdd (Timeouts, timeout);
-+}
-+
-+
-+/*
-+ * 'cupsdRemoveTimeout()' - Discard a timed callback.
-+ */
-+
-+void
-+cupsdRemoveTimeout(cupsd_timeout_t *timeout) /* I - Timeout */
-+{
-+ cupsArrayRemove (Timeouts, timeout);
-+ free (timeout);
-+}
-+
-+
-+#endif /* HAVE_AVAHI ... from top of file */
-+
-+/*
-+ * End of "$Id$".
-+ */
---- a/cgi-bin/admin.c
-+++ b/cgi-bin/admin.c
-@@ -1643,7 +1643,7 @@
- else
- local_protocols[0] = '\0';
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- if (cgiGetVariable("BROWSE_LOCAL_DNSSD"))
- {
- if (local_protocols[0])
-@@ -1651,7 +1651,7 @@
- else
- strcat(local_protocols, "dnssd");
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- #ifdef HAVE_LDAP
- if (cgiGetVariable("BROWSE_LOCAL_LDAP"))
-@@ -2718,9 +2718,9 @@
- #endif /* HAVE_GSSAPI */
- cgiSetVariable("KERBEROS", "");
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- cgiSetVariable("HAVE_DNSSD", "1");
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- #ifdef HAVE_LDAP
- cgiSetVariable("HAVE_LDAP", "1");
---- a/scheduler/client.c
-+++ b/scheduler/client.c
-@@ -4987,7 +4987,7 @@
- !strncmp(host, "[::1]:", 6));
- }
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
- * Check if the hostname is something.local (Bonjour); if so, allow it.
- */
-@@ -4996,7 +4996,7 @@
- (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||
- !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8)))
- return (1);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- /*
- * Check if the hostname is an IP address...
---- a/scheduler/dirsvc.c
-+++ b/scheduler/dirsvc.c
-@@ -27,6 +27,7 @@
- * ldap_connect() - Start new LDAP connection
- * ldap_reconnect() - Reconnect to LDAP Server
- * ldap_disconnect() - Disconnect from LDAP Server
-+ * cupsdStartAvahiClient() - Start an Avahi client if needed
- * cupsdStartBrowsing() - Start sending and receiving broadcast
- * information.
- * cupsdStartPolling() - Start polling servers as needed.
-@@ -45,6 +46,8 @@
- * printer.
- * dnssdPackTxtRecord() - Pack an array of key/value pairs into the TXT
- * record format.
-+ * avahiPackTxtRecord() - Pack an array of key/value pairs into an
-+ * AvahiStringList.
- * dnssdRegisterCallback() - DNSServiceRegister callback.
- * dnssdRegisterPrinter() - Start sending broadcast information for a
- * printer or update the broadcast contents.
-@@ -83,6 +86,7 @@
- */
-
- #include "cupsd.h"
-+#include <assert.h>
- #include <grp.h>
-
- #ifdef HAVE_DNSSD
-@@ -97,6 +101,17 @@
- # endif /* HAVE_SYSTEMCONFIGURATION */
- # endif /* __APPLE__ */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+# include <avahi-common/domain.h>
-+#endif /* HAVE_AVAHI */
-+
-+
-+#ifdef HAVE_DNSSD
-+typedef char *cupsd_txt_record_t;
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+typedef AvahiStringList *cupsd_txt_record_t;
-+#endif /* HAVE_AVAHI */
-
-
- /*
-@@ -159,27 +174,39 @@
- static void update_smb(int onoff);
-
-
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+static cupsd_txt_record_t dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
-+ int for_lpd);
-+static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
-+static void dnssdDeregisterPrinter(cupsd_printer_t *p);
-+static void dnssdRegisterPrinter(cupsd_printer_t *p);
-+static void dnssdStop(void);
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
- #ifdef HAVE_DNSSD
- # ifdef HAVE_COREFOUNDATION
- static void dnssdAddAlias(const void *key, const void *value,
- void *context);
- # endif /* HAVE_COREFOUNDATION */
--static char *dnssdBuildTxtRecord(int *txt_len, cupsd_printer_t *p,
-- int for_lpd);
--static int dnssdComparePrinters(cupsd_printer_t *a, cupsd_printer_t *b);
--static void dnssdDeregisterPrinter(cupsd_printer_t *p);
--static char *dnssdPackTxtRecord(int *txt_len, char *keyvalue[][2],
-- int count);
- static void dnssdRegisterCallback(DNSServiceRef sdRef,
- DNSServiceFlags flags,
- DNSServiceErrorType errorCode,
- const char *name, const char *regtype,
- const char *domain, void *context);
--static void dnssdRegisterPrinter(cupsd_printer_t *p);
--static void dnssdStop(void);
- static void dnssdUpdate(void);
- #endif /* HAVE_DNSSD */
-
-+#ifdef HAVE_AVAHI
-+static AvahiStringList *avahiPackTxtRecord(char *keyvalue[][2],
-+ int count);
-+static void avahi_entry_group_cb (AvahiEntryGroup *group,
-+ AvahiEntryGroupState state,
-+ void *userdata);
-+static void avahi_client_cb (AvahiClient *client,
-+ AvahiClientState state,
-+ void *userdata);
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LDAP
- static const char * const ldap_attrs[] =/* CUPS LDAP attributes */
- {
-@@ -283,10 +310,10 @@
- ldap_dereg_printer(p);
- #endif /* HAVE_LDAP */
-
--#ifdef HAVE_DNSSD
-- if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+ if (removeit && (BrowseLocalProtocols & BROWSE_DNSSD))
- dnssdDeregisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
-
-
-@@ -702,10 +729,10 @@
- slpRegisterPrinter(p); */
- #endif /* HAVE_LIBSLP */
-
--#ifdef HAVE_DNSSD
-- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+ if ((BrowseLocalProtocols & BROWSE_DNSSD))
- dnssdRegisterPrinter(p);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
-
-
-@@ -1419,6 +1446,27 @@
- #endif /* HAVE_LDAP */
-
-
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'cupsdStartAvahiClient()' - Start an Avahi client if needed
-+ */
-+
-+void
-+cupsdStartAvahiClient(void)
-+{
-+ if (!AvahiCupsClient && !AvahiCupsClientConnecting)
-+ {
-+ if (!AvahiCupsPollHandle)
-+ AvahiCupsPollHandle = avahi_cups_poll_new ();
-+
-+ if (AvahiCupsPollHandle)
-+ avahi_client_new (avahi_cups_poll_get (AvahiCupsPollHandle),
-+ AVAHI_CLIENT_NO_FAIL, avahi_client_cb, NULL, NULL);
-+ }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
- * 'cupsdStartBrowsing()' - Start sending and receiving broadcast information.
- */
-@@ -1542,13 +1590,16 @@
- else
- BrowseSocket = -1;
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_DNSSD)
- {
-+#ifdef HAVE_DNSSD
- DNSServiceErrorType error; /* Error from service creation */
-+#endif /* HAVE_DNSSD */
- cupsd_listener_t *lis; /* Current listening socket */
-
-
-+#ifdef HAVE_DNSSD
- /*
- * First create a "master" connection for all registrations...
- */
-@@ -1573,6 +1624,7 @@
- fcntl(fd, F_SETFD, fcntl(fd, F_GETFD) | FD_CLOEXEC);
-
- cupsdAddSelect(fd, (cupsd_selfunc_t)dnssdUpdate, NULL, NULL);
-+#endif /* HAVE_DNSSD */
-
- /*
- * Then get the port we use for registrations. If we are not listening
-@@ -1606,9 +1658,16 @@
- */
-
- cupsdUpdateDNSSDName();
-+
-+#ifdef HAVE_AVAHI
-+ cupsdStartAvahiClient ();
-+#endif /* HAVE_AVAHI */
-+
-+#ifdef HAVE_DNSSD
- }
-- }
- #endif /* HAVE_DNSSD */
-+ }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- #ifdef HAVE_LIBSLP
- if ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP)
-@@ -1834,10 +1893,10 @@
- BrowseSocket = -1;
- }
-
--#ifdef HAVE_DNSSD
-- if ((BrowseLocalProtocols & BROWSE_DNSSD) && DNSSDRef)
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
-+ if ((BrowseLocalProtocols & BROWSE_DNSSD))
- dnssdStop();
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- #ifdef HAVE_LIBSLP
- if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_SLP) &&
-@@ -1902,7 +1961,7 @@
- }
-
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
- * 'cupsdUpdateDNSSDName()' - Update the computer name we use for browsing...
- */
-@@ -1910,8 +1969,14 @@
- void
- cupsdUpdateDNSSDName(void)
- {
-+#ifdef HAVE_DNSSD
- DNSServiceErrorType error; /* Error from service creation */
- char webif[1024]; /* Web interface share name */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ int ret; /* Error from service creation */
-+ char webif[AVAHI_LABEL_MAX]; /* Web interface share name */
-+#endif /* HAVE_AVAHI */
- # ifdef HAVE_SYSTEMCONFIGURATION
- SCDynamicStoreRef sc; /* Context for dynamic store */
- CFDictionaryRef btmm; /* Back-to-My-Mac domains */
-@@ -2042,6 +2107,7 @@
- else
- strlcpy(webif, "CUPS Web Interface", sizeof(webif));
-
-+#ifdef HAVE_DNSSD
- if (WebIFRef)
- DNSServiceRefDeallocate(WebIFRef);
-
-@@ -2054,9 +2120,45 @@
- NULL)) != kDNSServiceErr_NoError)
- cupsdLogMessage(CUPSD_LOG_ERROR,
- "DNS-SD web interface registration failed: %d", error);
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+ if (!AvahiCupsClient)
-+ /*
-+ * Client not yet running.
-+ */
-+ return;
-+
-+ if (AvahiWebIFGroup)
-+ avahi_entry_group_reset (AvahiWebIFGroup);
-+ else
-+ AvahiWebIFGroup = avahi_entry_group_new (AvahiCupsClient,
-+ avahi_entry_group_cb,
-+ NULL);
-+
-+ if (AvahiWebIFGroup)
-+ {
-+ ret = avahi_entry_group_add_service (AvahiWebIFGroup,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, /* flags */
-+ webif, /* name */
-+ "_http._tcp", /* type */
-+ NULL, /* domain */
-+ NULL, /* host */
-+ DNSSDPort, /* port */
-+ "path=/", NULL);
-+ if (ret == 0)
-+ ret = avahi_entry_group_commit (AvahiWebIFGroup);
-+
-+ if (ret != 0)
-+ cupsdLogMessage (CUPSD_LOG_ERROR,
-+ "Avahi web interface registration failed: %d", ret);
-+ }
-+#endif /* HAVE_AVAHI */
- }
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
-
- #ifdef HAVE_LDAP
-@@ -2334,13 +2436,15 @@
- "Bad Back to My Mac domain in dynamic store!");
- }
- # endif /* HAVE_COREFOUNDATION */
-+#endif /* HAVE_DNSSD */
-
-
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
- * 'dnssdBuildTxtRecord()' - Build a TXT record from printer info.
- */
-
--static char * /* O - TXT record */
-+static cupsd_txt_record_t /* O - TXT record */
- dnssdBuildTxtRecord(
- int *txt_len, /* O - TXT record length */
- cupsd_printer_t *p, /* I - Printer information */
-@@ -2379,7 +2483,12 @@
- keyvalue[i ][0] = "ty";
- keyvalue[i++][1] = p->make_model ? p->make_model : "Unknown";
-
-- snprintf(admin_hostname, sizeof(admin_hostname), "%s.local.", DNSSDHostName);
-+ snprintf(admin_hostname, sizeof(admin_hostname),
-+ "%s.local"
-+#ifdef HAVE_DNSSD
-+ "." /* terminating dot no good for Avahi */
-+#endif /* HAVE_DNSSD */
-+ , DNSSDHostName);
- httpAssembleURIf(HTTP_URI_CODING_ALL, adminurl_str, sizeof(adminurl_str),
- "http", NULL, admin_hostname, DNSSDPort, "/%s/%s",
- (p->type & CUPS_PRINTER_CLASS) ? "classes" : "printers",
-@@ -2462,7 +2571,12 @@
- * Then pack them into a proper txt record...
- */
-
-+#ifdef HAVE_DNSSD
- return (dnssdPackTxtRecord(txt_len, keyvalue, i));
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ return (avahiPackTxtRecord(keyvalue, i));
-+#endif /* HAVE_AVAHI */
- }
-
-
-@@ -2474,7 +2588,16 @@
- dnssdComparePrinters(cupsd_printer_t *a,/* I - First printer */
- cupsd_printer_t *b)/* I - Second printer */
- {
-- return (_cups_strcasecmp(a->reg_name, b->reg_name));
-+ if (!a->reg_name)
-+ if (!b->reg_name)
-+ return 0;
-+ else
-+ return -1;
-+ else
-+ if (!b->reg_name)
-+ return 1;
-+ else
-+ return (_cups_strcasecmp(a->reg_name, b->reg_name));
- }
-
-
-@@ -2489,6 +2612,10 @@
- {
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdDeregisterPrinter(%s)", p->name);
-
-+#ifdef HAVE_DNSSD
-+ if (!DNSSDRef)
-+ return;
-+
- /*
- * Closing the socket deregisters the service
- */
-@@ -2524,6 +2651,24 @@
- free(p->printer_txt);
- p->printer_txt = NULL;
- }
-+#endif /* HAVE_DNSSD */
-+
-+#ifdef HAVE_AVAHI
-+ if (p->avahi_group)
-+ {
-+ avahi_entry_group_reset (p->avahi_group);
-+ avahi_entry_group_free (p->avahi_group);
-+ p->avahi_group = NULL;
-+
-+ if (p->ipp_txt)
-+ avahi_string_list_free (p->ipp_txt);
-+
-+ if (p->printer_txt)
-+ avahi_string_list_free (p->printer_txt);
-+
-+ p->ipp_txt = p->printer_txt = NULL;
-+ }
-+#endif /* HAVE_AVAHI */
-
- /*
- * Remove the printer from the array of DNS-SD printers, then clear the
-@@ -2533,8 +2678,10 @@
- cupsArrayRemove(DNSSDPrinters, p);
- cupsdClearString(&p->reg_name);
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
-
-+#ifdef HAVE_DNSSD
- /*
- * 'dnssdPackTxtRecord()' - Pack an array of key/value pairs into the
- * TXT record format.
-@@ -2644,8 +2791,10 @@
- LastEvent |= CUPSD_EVENT_PRINTER_MODIFIED;
- }
- }
-+#endif /* HAVE_DNSSD */
-
-
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- /*
- * 'dnssdRegisterPrinter()' - Start sending broadcast information for a printer
- * or update the broadcast contents.
-@@ -2654,20 +2803,40 @@
- static void
- dnssdRegisterPrinter(cupsd_printer_t *p)/* I - Printer */
- {
-+#ifdef HAVE_DNSSD
- DNSServiceErrorType se; /* dnssd errors */
- char *ipp_txt, /* IPP TXT record buffer */
- *printer_txt, /* LPD TXT record buffer */
-- name[1024], /* Service name */
-- *nameptr; /* Pointer into name */
-+ name[1024]; /* Service name */
- int ipp_len, /* IPP TXT record length */
- printer_len, /* LPD TXT record length */
- printer_port; /* LPD port number */
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ int ret; /* Error code */
-+ AvahiStringList *ipp_txt, /* IPP TXT record */
-+ *printer_txt; /* LPD TXT record */
-+ char name[AVAHI_LABEL_MAX], /* Service name */
-+ fullsubtype[AVAHI_LABEL_MAX]; /* Full subtype */
-+ char *regtype_copy, /* Writeable copy of reg type */
-+ *subtype, /* Current service sub type */
-+ *nextsubtype; /* Next service sub type */
-+#endif /* HAVE_AVAHI */
-+ char *nameptr; /* Pointer into name */
- const char *regtype; /* Registration type */
-
-
-+#ifdef HAVE_DNSSD
-+ if (!DNSSDRef)
-+ return;
-+
- cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
- !p->ipp_ref ? "new" : "update");
--
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ cupsdLogMessage(CUPSD_LOG_DEBUG2, "dnssdRegisterPrinter(%s) %s", p->name,
-+ !p->avahi_group ? "new" : "update");
-+#endif /* HAVE_AVAHI */
- /*
- * If per-printer sharing was just disabled make sure we're not
- * registered before returning.
-@@ -2686,12 +2855,36 @@
- if (p->info && strlen(p->info) > 0)
- {
- if (DNSSDComputerName)
-- snprintf(name, sizeof(name), "%s @ %s", p->info, DNSSDComputerName);
-+ {
-+ /*
-+ * Make sure there is room for at least 15 characters of
-+ * DNSSDComputerName.
-+ */
-+
-+ assert(sizeof(name) >= 15 + 4);
-+ nameptr = name + strlcpy(name, p->info,
-+ sizeof(name) - 4 -
-+ strnlen(DNSSDComputerName, 15));
-+ nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+ strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+ }
- else
- strlcpy(name, p->info, sizeof(name));
- }
- else if (DNSSDComputerName)
-- snprintf(name, sizeof(name), "%s @ %s", p->name, DNSSDComputerName);
-+ {
-+ /*
-+ * Make sure there is room for at least 15 characters of
-+ * DNSSDComputerName.
-+ */
-+
-+ assert(sizeof(name) >= 15 + 4);
-+ nameptr = name + strlcpy(name, p->info,
-+ sizeof(name) - 4 -
-+ strnlen(DNSSDComputerName, 15));
-+ nameptr += strlcpy(nameptr, " @ ", sizeof(name) - (nameptr - name));
-+ strlcpy(nameptr, DNSSDComputerName, sizeof(name) - (nameptr - name));
-+ }
- else
- strlcpy(name, p->name, sizeof(name));
-
-@@ -2712,6 +2905,7 @@
- * Register IPP and (optionally) LPD...
- */
-
-+#ifdef HAVE_DNSSD
- ipp_len = 0; /* anti-compiler-warning-code */
- ipp_txt = dnssdBuildTxtRecord(&ipp_len, p, 0);
-
-@@ -2884,6 +3078,209 @@
-
- if (printer_txt)
- free(printer_txt);
-+#endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ if (!AvahiCupsClient)
-+ /*
-+ * Client not running yet. The client callback will call us again later.
-+ */
-+ return;
-+
-+ ipp_txt = dnssdBuildTxtRecord(NULL, p, 0);
-+ printer_txt = dnssdBuildTxtRecord(NULL, p, 1);
-+ regtype = (p->type & CUPS_PRINTER_FAX) ? "_fax-ipp._tcp" : DNSSDRegType;
-+
-+ if (p->avahi_group && p->ipp_txt && ipp_txt &&
-+ !avahi_string_list_equal (p->ipp_txt, ipp_txt))
-+ {
-+ /*
-+ * Update the existing registration...
-+ */
-+
-+ avahi_string_list_free (p->ipp_txt);
-+
-+ if (p->printer_txt)
-+ avahi_string_list_free (p->printer_txt);
-+
-+ /*
-+ * Update the service group entry.
-+ */
-+
-+ regtype_copy = strdup (regtype);
-+ subtype = strchr (regtype_copy, ',');
-+ if (subtype)
-+ *subtype = '\0';
-+
-+ cupsdLogMessage (CUPSD_LOG_DEBUG,
-+ "Updating TXT record for %s (%s)", name, regtype_copy);
-+ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, name,
-+ regtype_copy,
-+ NULL, ipp_txt);
-+ free (regtype_copy);
-+
-+ if (ret < 0)
-+ goto update_failed;
-+
-+ p->ipp_txt = ipp_txt;
-+ ipp_txt = NULL;
-+
-+ if (BrowseLocalProtocols & BROWSE_LPD)
-+ {
-+ ret = avahi_entry_group_update_service_txt_strlst (p->avahi_group,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, name,
-+ "_printer._tcp", NULL,
-+ printer_txt);
-+ if (ret < 0)
-+ goto update_failed;
-+
-+ p->printer_txt = printer_txt;
-+ printer_txt = NULL;
-+ }
-+
-+ ret = avahi_entry_group_commit (p->avahi_group);
-+ if (ret < 0)
-+ {
-+ update_failed:
-+ cupsdLogMessage (CUPSD_LOG_ERROR,
-+ "Failed to update TXT record for %s: %d",
-+ name, ret);
-+ avahi_entry_group_reset (p->avahi_group);
-+ avahi_entry_group_free (p->avahi_group);
-+ p->avahi_group = NULL;
-+ ipp_txt = p->ipp_txt;
-+ p->ipp_txt = NULL;
-+ }
-+ }
-+
-+ if (!p->avahi_group)
-+ {
-+ /*
-+ * Initial registration. Use the _fax subtype for fax queues...
-+ */
-+
-+ p->avahi_group = avahi_entry_group_new (AvahiCupsClient,
-+ avahi_entry_group_cb,
-+ p);
-+
-+ cupsdLogMessage(CUPSD_LOG_DEBUG,
-+ "Registering Avahi printer %s with name \"%s\" and "
-+ "type \"%s\"", p->name, name, regtype);
-+
-+ if (!p->avahi_group)
-+ {
-+ ret = 0;
-+ goto add_failed;
-+ }
-+
-+ /*
-+ * Add each service type (DNSSDRegType may contain several,
-+ * separated by commas).
-+ */
-+
-+ subtype = regtype_copy = strdup (regtype);
-+ while (subtype && *subtype)
-+ {
-+ nextsubtype = strchr (subtype, ',');
-+ if (nextsubtype)
-+ *nextsubtype++ = '\0';
-+
-+ if (subtype == regtype_copy)
-+ {
-+ /*
-+ * Main type entry.
-+ */
-+
-+ cupsdLogMessage (CUPSD_LOG_DEBUG,
-+ "Adding TXT record for %s (%s)", name, regtype_copy);
-+ ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, name, regtype_copy,
-+ NULL, NULL,
-+ DNSSDPort,
-+ ipp_txt);
-+ }
-+ else
-+ {
-+ /*
-+ * Sub-type entry.
-+ */
-+
-+ snprintf (fullsubtype, sizeof(fullsubtype),
-+ "%s._sub.%s", subtype, regtype_copy);
-+ cupsdLogMessage (CUPSD_LOG_DEBUG,
-+ "Adding TXT record for %s (%s)", name, fullsubtype);
-+ ret = avahi_entry_group_add_service_subtype (p->avahi_group,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, name,
-+ regtype_copy,
-+ NULL, fullsubtype);
-+ }
-+
-+ if (ret < 0)
-+ {
-+ free (regtype_copy);
-+ goto add_failed;
-+ }
-+
-+ subtype = nextsubtype;
-+ }
-+
-+ free (regtype_copy);
-+ p->ipp_txt = ipp_txt;
-+ ipp_txt = NULL;
-+
-+ if (BrowseLocalProtocols & BROWSE_LPD)
-+ {
-+ cupsdLogMessage(CUPSD_LOG_DEBUG,
-+ "Registering Avahi printer %s with name \"%s\" and "
-+ "type \"_printer._tcp\"", p->name, name);
-+
-+ ret = avahi_entry_group_add_service_strlst (p->avahi_group,
-+ AVAHI_IF_UNSPEC,
-+ AVAHI_PROTO_UNSPEC,
-+ 0, name,
-+ "_printer._tcp", NULL, NULL,
-+ 515,
-+ printer_txt);
-+ if (ret < 0)
-+ goto add_failed;
-+
-+ p->printer_txt = printer_txt;
-+ printer_txt = NULL;
-+ }
-+
-+ ret = avahi_entry_group_commit (p->avahi_group);
-+
-+ if (ret < 0)
-+ {
-+ add_failed:
-+ cupsdLogMessage (CUPSD_LOG_ERROR,
-+ "Failed to add Avahi entry for %s: %d",
-+ name, ret);
-+ if (p->avahi_group)
-+ {
-+ avahi_entry_group_reset (p->avahi_group);
-+ avahi_entry_group_free (p->avahi_group);
-+ p->avahi_group = NULL;
-+ }
-+ ipp_txt = p->ipp_txt;
-+ p->ipp_txt = NULL;
-+ }
-+ }
-+
-+ if (ipp_txt)
-+ avahi_string_list_free (ipp_txt);
-+
-+ if (printer_txt)
-+ avahi_string_list_free (printer_txt);
-+#endif /* HAVE_AVAHI */
- }
-
-
-@@ -2896,6 +3293,10 @@
- {
- cupsd_printer_t *p; /* Current printer */
-
-+#ifdef HAVE_DNSSD
-+ if (!DNSSDRef)
-+ return;
-+#endif /* HAVE_DNSSD */
-
- /*
- * De-register the individual printers
-@@ -2906,6 +3307,7 @@
- p = (cupsd_printer_t *)cupsArrayNext(Printers))
- dnssdDeregisterPrinter(p);
-
-+#ifdef HAVE_DNSSD
- /*
- * Shutdown the rest of the service refs...
- */
-@@ -2926,14 +3328,17 @@
-
- DNSServiceRefDeallocate(DNSSDRef);
- DNSSDRef = NULL;
-+#endif /* HAVE_DNSSD */
-
- cupsArrayDelete(DNSSDPrinters);
- DNSSDPrinters = NULL;
-
- DNSSDPort = 0;
- }
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
-
-+#ifdef HAVE_DNSSD
- /*
- * 'dnssdUpdate()' - Handle DNS-SD queries.
- */
-@@ -2955,6 +3360,147 @@
- #endif /* HAVE_DNSSD */
-
-
-+#ifdef HAVE_AVAHI
-+/*
-+ * 'avahiPackTxtRecord()' - Pack an array of key/value pairs into an
-+ * AvahiStringList.
-+ */
-+
-+static AvahiStringList * /* O - new string list */
-+avahiPackTxtRecord(char *keyvalue[][2], /* I - Table of key value pairs */
-+ int count) /* I - Number of items in table */
-+{
-+ AvahiStringList *strlst = NULL;
-+ char **elements;
-+ size_t len;
-+ int i = 0;
-+
-+ elements = malloc ((1 + count) * sizeof (char *));
-+ if (!elements)
-+ goto cleanup;
-+
-+ for (i = 0; i < count; i++)
-+ {
-+ len = (1 + strlen (keyvalue[i][0]) +
-+ (keyvalue[i][1] ? 1 + strlen (keyvalue[i][1]) : 1));
-+ elements[i] = malloc (len * sizeof (char));
-+ if (!elements[i])
-+ goto cleanup;
-+
-+ snprintf (elements[i], len, "%s=%s", keyvalue[i][0], keyvalue[i][1]);
-+ }
-+
-+ strlst = avahi_string_list_new_from_array ((const char **) elements, count);
-+
-+cleanup:
-+ while (--i >= 0)
-+ free (elements[i]);
-+
-+ free (elements);
-+ return (strlst);
-+}
-+
-+
-+/*
-+ * 'avahi_entry_group_cb()' - Avahi entry group callback function.
-+ */
-+static void
-+avahi_entry_group_cb (AvahiEntryGroup *group,
-+ AvahiEntryGroupState state,
-+ void *userdata)
-+{
-+ char *name;
-+
-+ if (userdata)
-+ name = ((cupsd_printer_t *) userdata)->reg_name;
-+ else
-+ name = "CUPS web interface";
-+
-+ switch (state)
-+ {
-+ case AVAHI_ENTRY_GROUP_UNCOMMITED:
-+ case AVAHI_ENTRY_GROUP_REGISTERING:
-+ break;
-+
-+ case AVAHI_ENTRY_GROUP_ESTABLISHED:
-+ cupsdLogMessage (CUPSD_LOG_DEBUG,
-+ "Avahi entry group established for %s", name);
-+ break;
-+
-+ default:
-+ cupsdLogMessage (CUPSD_LOG_DEBUG,
-+ "Avahi entry group %s has state %d",
-+ name, state);
-+ break;
-+ }
-+}
-+
-+
-+/*
-+ * 'avahi_client_cb()' - Avahi client callback function.
-+ */
-+static void
-+avahi_client_cb (AvahiClient *client,
-+ AvahiClientState state,
-+ void *userdata)
-+{
-+ cupsd_printer_t *printer;
-+ switch (state)
-+ {
-+ case AVAHI_CLIENT_S_RUNNING:
-+ /*
-+ * Avahi client started successfully.
-+ */
-+ AvahiCupsClient = client;
-+ AvahiCupsClientConnecting = 0;
-+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client started");
-+
-+ cupsdUpdateDNSSDName ();
-+
-+ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+ printer;
-+ printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+ if (Browsing && (BrowseLocalProtocols & BROWSE_DNSSD) &&
-+ (!(printer->type & (CUPS_PRINTER_REMOTE | CUPS_PRINTER_IMPLICIT |
-+ CUPS_PRINTER_SCANNER))) && printer->shared)
-+ dnssdRegisterPrinter (printer);
-+
-+ break;
-+
-+ case AVAHI_CLIENT_CONNECTING:
-+ /*
-+ * No Avahi daemon, client is waiting.
-+ */
-+ AvahiCupsClientConnecting = 1;
-+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client connecting");
-+ break;
-+
-+ case AVAHI_CLIENT_FAILURE:
-+ /*
-+ * Avahi client failed, close it to allow a clean restart.
-+ */
-+ cupsdLogMessage (CUPSD_LOG_ERROR,
-+ "Avahi client failed, "
-+ "closing client to allow a clean restart");
-+
-+ for (printer = (cupsd_printer_t *)cupsArrayFirst(Printers);
-+ printer;
-+ printer = (cupsd_printer_t *)cupsArrayNext(Printers))
-+ dnssdDeregisterPrinter (printer);
-+
-+ avahi_client_free(client);
-+ AvahiCupsClientConnecting = 0;
-+ AvahiCupsClient = NULL;
-+
-+ break;
-+
-+ default:
-+ cupsdLogMessage (CUPSD_LOG_DEBUG, "Avahi client state: %d", state);
-+ }
-+}
-+#endif /* HAVE_AVAHI */
-+
-+
- /*
- * 'get_auth_info_required()' - Get the auth-info-required value to advertise.
- */
---- a/scheduler/dirsvc.h
-+++ b/scheduler/dirsvc.h
-@@ -31,6 +31,10 @@
- # endif /* HAVE_LDAP_SSL_H */
- #endif /* HAVE_LDAP */
-
-+#ifdef HAVE_AVAHI
-+# include <avahi-client/publish.h>
-+#endif /* HAVE_AVAHI */
-+
- /*
- * Browse protocols...
- */
-@@ -131,19 +135,22 @@
- VAR cupsd_statbuf_t *PollStatusBuffer VALUE(NULL);
- /* Status buffer for pollers */
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- VAR char *DNSSDComputerName VALUE(NULL),
- /* Computer/server name */
- *DNSSDHostName VALUE(NULL),
- /* Hostname */
- *DNSSDRegType VALUE(NULL);
- /* Bonjour registration type */
--VAR cups_array_t *DNSSDAlias VALUE(NULL);
-- /* List of dynamic ServerAlias's */
- VAR int DNSSDPort VALUE(0);
- /* Port number to register */
- VAR cups_array_t *DNSSDPrinters VALUE(NULL);
- /* Printers we have registered */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+
-+#ifdef HAVE_DNSSD
-+VAR cups_array_t *DNSSDAlias VALUE(NULL);
-+ /* List of dynamic ServerAlias's */
- VAR DNSServiceRef DNSSDRef VALUE(NULL),
- /* Master DNS-SD service reference */
- WebIFRef VALUE(NULL),
-@@ -152,6 +159,17 @@
- /* Remote printer browse reference */
- #endif /* HAVE_DNSSD */
-
-+#ifdef HAVE_AVAHI
-+VAR AvahiCupsPoll *AvahiCupsPollHandle VALUE(NULL);
-+ /* AvahiCupsPoll object */
-+VAR AvahiClient *AvahiCupsClient VALUE(NULL);
-+ /* AvahiClient object */
-+VAR int AvahiCupsClientConnecting VALUE(0);
-+ /* Is AvahiClient object connecting? */
-+VAR AvahiEntryGroup *AvahiWebIFGroup VALUE(NULL);
-+ /* Web interface entry group */
-+#endif /* HAVE_AVAHI */
-+
- #ifdef HAVE_LIBSLP
- VAR SLPHandle BrowseSLPHandle VALUE(NULL);
- /* SLP API handle */
-@@ -195,13 +213,14 @@
- extern void cupsdRestartPolling(void);
- extern void cupsdSaveRemoteCache(void);
- extern void cupsdSendBrowseList(void);
-+extern void cupsdStartAvahiClient(void);
- extern void cupsdStartBrowsing(void);
- extern void cupsdStartPolling(void);
- extern void cupsdStopBrowsing(void);
- extern void cupsdStopPolling(void);
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- extern void cupsdUpdateDNSSDName(void);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- #ifdef HAVE_LDAP
- extern void cupsdUpdateLDAPBrowse(void);
- #endif /* HAVE_LDAP */
---- a/scheduler/ipp.c
-+++ b/scheduler/ipp.c
-@@ -6087,7 +6087,7 @@
- ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
- ippTimeToDate(curtime));
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
- {
- if (printer->reg_name)
-@@ -6097,7 +6097,7 @@
- ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
- "printer-dns-sd-name", 0);
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- if (!ra || cupsArrayFind(ra, "printer-error-policy"))
- ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
---- a/scheduler/printers.c
-+++ b/scheduler/printers.c
-@@ -883,9 +883,9 @@
- cupsdClearString(&p->alert);
- cupsdClearString(&p->alert_description);
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- cupsdClearString(&p->pdl);
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-
- cupsArrayDelete(p->filetypes);
-
-@@ -3765,7 +3765,7 @@
- attr->values[i].string.text = _cupsStrAlloc(mimetype);
- }
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- {
- char pdl[1024]; /* Buffer to build pdl list */
- mime_filter_t *filter; /* MIME filter looping var */
-@@ -3821,7 +3821,7 @@
-
- cupsdSetString(&p->pdl, pdl);
- }
--#endif /* HAVE_DNSSD */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
- }
-
-
---- a/scheduler/printers.h
-+++ b/scheduler/printers.h
-@@ -16,6 +16,9 @@
- #ifdef HAVE_DNSSD
- # include <dns_sd.h>
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+# include "avahi.h"
-+#endif /* HAVE_AVAHI */
- #include <cups/pwg-private.h>
-
-
-@@ -95,16 +98,23 @@
- time_t marker_time; /* Last time marker attributes were updated */
- _ppd_cache_t *pc; /* PPD cache and mapping data */
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- char *reg_name, /* Name used for service registration */
-- *pdl, /* pdl value for TXT record */
-- *ipp_txt, /* IPP TXT record contents */
-+ *pdl; /* pdl value for TXT record */
-+#endif /* defined(HAVE_DNSSD) || defined(HAVE_AVAHI) */
-+#ifdef HAVE_DNSSD
-+ char *ipp_txt, /* IPP TXT record contents */
- *printer_txt; /* LPD TXT record contents */
- int ipp_len, /* IPP TXT record length */
- printer_len; /* LPD TXT record length */
- DNSServiceRef ipp_ref, /* Reference for _ipp._tcp,_cups */
- printer_ref; /* Reference for _printer._tcp */
- #endif /* HAVE_DNSSD */
-+#ifdef HAVE_AVAHI
-+ AvahiStringList *ipp_txt, /* IPP TXT record */
-+ *printer_txt; /* LPD TXT record */
-+ AvahiEntryGroup *avahi_group; /* Avahi entry group */
-+#endif /* HAVE_AVAHI */
- };
-
-
---- a/scheduler/conf.c
-+++ b/scheduler/conf.c
-@@ -650,7 +650,7 @@
- Browsing = CUPS_DEFAULT_BROWSING;
- DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED;
-
--#ifdef HAVE_DNSSD
-+#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
- cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups");
- #endif /* HAVE_DNSSD */
-
diff --git a/extra/cups/cups-no-export-ssllibs.patch b/extra/cups/cups-no-export-ssllibs.patch
deleted file mode 100644
index 9be3c819b..000000000
--- a/extra/cups/cups-no-export-ssllibs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs cups-1.5b1/config-scripts/cups-ssl.m4
---- cups-1.5b1/config-scripts/cups-ssl.m4.no-export-ssllibs 2011-05-11 02:52:08.000000000 +0200
-+++ cups-1.5b1/config-scripts/cups-ssl.m4 2011-05-23 17:47:27.000000000 +0200
-@@ -164,7 +164,7 @@ AC_SUBST(IPPALIASES)
- AC_SUBST(SSLFLAGS)
- AC_SUBST(SSLLIBS)
-
--EXPORT_SSLLIBS="$SSLLIBS"
-+EXPORT_SSLLIBS=""
- AC_SUBST(EXPORT_SSLLIBS)
-
-
diff --git a/extra/cups/cups-no-gcrypt.patch b/extra/cups/cups-no-gcrypt.patch
deleted file mode 100644
index 42f71d0d4..000000000
--- a/extra/cups/cups-no-gcrypt.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ruN cups-1.4.7.orig//config-scripts/cups-ssl.m4 cups-1.4.7/config-scripts/cups-ssl.m4
---- cups-1.5.0.orig//config-scripts/cups-ssl.m4 2011-01-11 08:05:58.000000000 +0100
-+++ cups-1.5.0/config-scripts/cups-ssl.m4 2011-08-02 10:44:26.011047900 +0200
-@@ -96,7 +96,6 @@
- dnl Then look for GNU TLS...
- if test $have_ssl = 0 -a "x$enable_gnutls" != "xno" -a "x$PKGCONFIG" != x; then
- AC_PATH_PROG(LIBGNUTLSCONFIG,libgnutls-config)
-- AC_PATH_PROG(LIBGCRYPTCONFIG,libgcrypt-config)
- if $PKGCONFIG --exists gnutls; then
- have_ssl=1
- SSLLIBS=`$PKGCONFIG --libs gnutls`
-@@ -110,16 +109,6 @@
- AC_DEFINE(HAVE_SSL)
- AC_DEFINE(HAVE_GNUTLS)
- fi
--
-- if test $have_ssl = 1; then
-- if $PKGCONFIG --exists gcrypt; then
-- SSLLIBS="$SSLLIBS `$PKGCONFIG --libs gcrypt`"
-- SSLFLAGS="$SSLFLAGS `$PKGCONFIG --cflags gcrypt`"
-- elif test "x$LIBGCRYPTCONFIG" != x; then
-- SSLLIBS="$SSLLIBS `$LIBGCRYPTCONFIG --libs`"
-- SSLFLAGS="$SSLFLAGS `$LIBGCRYPTCONFIG --cflags`"
-- fi
-- fi
- fi
-
- dnl Check for the OpenSSL library last...
---- cups-1.5.0.orig//cups/http-private.h 2011-01-22 01:07:22.000000000 +0100
-+++ cups-1.5.0/cups/http-private.h 2011-08-02 10:42:43.341604107 +0200
-@@ -93,7 +93,6 @@
- # elif defined HAVE_GNUTLS
- # include <gnutls/gnutls.h>
- # include <gnutls/x509.h>
--# include <gcrypt.h>
- # elif defined(HAVE_CDSASSL)
- # include <CoreFoundation/CoreFoundation.h>
- # include <Security/Security.h>
diff --git a/extra/cups/cups.install b/extra/cups/cups.install
deleted file mode 100644
index 47c3d9b82..000000000
--- a/extra/cups/cups.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_install() {
- if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
- fi
- echo ">> If you use an HTTPS connection to CUPS, the first time you access"
- echo ">> the interface it may take a very long time before the site comes up."
- echo ">> This is because the first request triggers the generation of the CUPS"
- echo ">> SSL certificates which can be a very time-consuming job."
-}
-
-post_upgrade() {
- if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
- fi
- if [ "`vercmp $2 1.4.7-2`" -lt 0 ]; then
- # important upgrade notice
- echo "daemon script has been renamed to /etc/rc.d/cupsd"
- echo "change your entry in /etc/rc.conf"
- fi
-}
-
-post_remove() {
- if [ -x usr/bin/xdg-icon-resource ]; then
- xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
- fi
-}
diff --git a/extra/cups/cups.logrotate b/extra/cups/cups.logrotate
deleted file mode 100644
index 9c49bbdaf..000000000
--- a/extra/cups/cups.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/cups/*log {
- missingok
- notifempty
- delaycompress
- postrotate
- /bin/kill -HUP `cat /var/run/cups.pid 2>/dev/null` 2>/dev/null || true
- endscript
-}
diff --git a/extra/cups/cups.pam b/extra/cups/cups.pam
deleted file mode 100644
index 53724d1f8..000000000
--- a/extra/cups/cups.pam
+++ /dev/null
@@ -1,3 +0,0 @@
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
diff --git a/extra/emacs/emacs.desktop b/extra/emacs/emacs.desktop
deleted file mode 100644
index 71b3d5bbf..000000000
--- a/extra/emacs/emacs.desktop
+++ /dev/null
@@ -1,12 +0,0 @@
-[Desktop Entry]
-Name=Emacs Text Editor
-Name[de]=Emacs Texteditor
-GenericName=Text Editor
-Comment=Edit text
-MimeType=text/english;text/plain;text/x-makefile;text/x-c++hdr;text/x-c++src;text/x-chdr;text/x-csrc;text/x-java;text/x-moc;text/x-pascal;text/x-tcl;text/x-tex;application/x-shellscript;text/x-c;text/x-c++;
-Exec=emacs %f
-Icon=emacs-icon
-Type=Application
-Terminal=false
-Categories=Development;TextEditor;
-StartupWMClass=Emacs
diff --git a/extra/ettercap/ettercap.desktop b/extra/ettercap/ettercap.desktop
deleted file mode 100644
index b8981dcb9..000000000
--- a/extra/ettercap/ettercap.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=ettercap
-GenericName=Ettercap
-Comment=Multipurpose sniffer/interceptor/logger
-Icon=ettercap
-Exec=gksu "/usr/bin/ettercap --gtk"
-Terminal=false
-Categories=Application;Network;System;Security;GTK
diff --git a/extra/fping/fping-2.4b2_p161-min-time.patch b/extra/fping/fping-2.4b2_p161-min-time.patch
deleted file mode 100644
index 5e5ccd40f..000000000
--- a/extra/fping/fping-2.4b2_p161-min-time.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- old/fping.c 2010-08-24 16:59:38.947000447 +0100
-+++ new/fping.c 2010-08-24 16:55:52.101000443 +0100
-@@ -25,6 +25,7 @@
- * Original author: Roland Schemers <schemers@stanford.edu>
- * IPv6 Support: Jeroen Massar <jeroen@unfix.org / jeroen@ipng.nl>
- * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
-+ * Fixes: min_reply_i in splits and compiler warning. Alex Ghoth (alex AT ghoth.net)
- *
- *
- * RCS header information no longer used. It has been moved to the
-@@ -743,7 +744,7 @@
-
- if( ( ping_data_size > MAX_PING_DATA ) || ( ping_data_size < MIN_PING_DATA ) )
- {
-- fprintf( stderr, "%s: data size %u not valid, must be between %u and %u\n",
-+ fprintf( stderr, "%s: data size %u not valid, must be between %lu and %u\n",
- prog, ping_data_size, MIN_PING_DATA, MAX_PING_DATA );
- usage();
-
-@@ -1112,7 +1113,7 @@
- ht = timeval_diff( &current_time, &cursor->last_send_time );
-
- if( report_interval && ( loop_flag || count_flag ) &&
-- ( timeval_diff ( &current_time, &last_report_time ) > report_interval ) )
-+ ( timeval_diff ( &current_time, &last_report_time ) >= report_interval ) )
- {
- print_per_system_splits();
- gettimeofday( &current_time, &tz );
-@@ -1487,8 +1488,8 @@
- }/* IF */
-
- fprintf( stderr, "\n" );
-- h->num_sent_i = h->num_recv_i = h->max_reply_i =
-- h->min_reply_i = h->total_time_i = 0;
-+ h->num_sent_i = h->num_recv_i = h->max_reply_i = h->total_time_i = 0;
-+ h->min_reply_i = 10000000;
-
- }/* FOR */
-
-@@ -2377,6 +2378,7 @@
- p->timeout = timeout;
- p->running = 1;
- p->min_reply = 10000000;
-+ p->min_reply_i = 10000000;
-
- if( strlen( p->host ) > max_hostname_len )
- max_hostname_len = strlen( p->host );
diff --git a/extra/fping/fping_2.4b2-to-ipv6-16.1.diff b/extra/fping/fping_2.4b2-to-ipv6-16.1.diff
deleted file mode 100644
index 435723832..000000000
--- a/extra/fping/fping_2.4b2-to-ipv6-16.1.diff
+++ /dev/null
@@ -1,838 +0,0 @@
---- fping-2.4b2-to-ipv6.orig/fping.8
-+++ fping-2.4b2-to-ipv6/fping.8
-@@ -1,4 +1,4 @@
--.TH fping l
-+.TH fping 8
- .SH NAME
- fping \- send ICMP ECHO_REQUEST packets to network hosts
- .SH SYNOPSIS
-@@ -12,9 +12,9 @@
-
-
- .B fping
--is a
--.MS ping 8
--like program which uses the Internet Control
-+is a program like
-+.B ping(8)
-+which uses the Internet Control
- Message Protocol (ICMP) echo request to determine if a target host is
- responding.
- .B fping
-@@ -37,8 +37,7 @@
- ).
- .PP
- Unlike
--.B ping
--,
-+.B ping,
- .B fping
- is meant to be used in scripts, so its output is designed to be
- easy to parse.
-@@ -130,12 +129,16 @@
- a target will be made, not including the first try.
- .IP \fB-s\fR 5
- Print cumulative statistics upon exit.
-+.IP \fB-S\fIaddr\fR 5
-+Set source address.
- .IP \fB-t\fIn\fR 5
- Initial target timeout in milliseconds (default 500). In the default
- mode, this is the amount of time that
- .B fping
- waits for a response to its first request. Successive timeouts are
- multiplied by the backoff factor.
-+.IP \fB-T\fIn\fR 5
-+Select timeout in seconds (default 10).
- .IP \fB-u\fR 5
- Show targets that are unreachable.
- .IP \fB-v\fR 5
-@@ -152,7 +155,7 @@
- example none the less.
- .nf
-
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- require 'open2.pl';
-
- $MAILTO = "root";
-@@ -178,7 +181,7 @@
- that are currently reachable.
- .nf
-
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- $hosts_to_backup = `cat /etc/hosts.backup | fping -a`;
-
---- fping-2.4b2-to-ipv6.orig/fping.c
-+++ fping-2.4b2-to-ipv6/fping.c
-@@ -24,7 +24,7 @@
- *
- * Original author: Roland Schemers <schemers@stanford.edu>
- * IPv6 Support: Jeroen Massar <jeroen@unfix.org / jeroen@ipng.nl>
-- *
-+ * Bugfixes, byte order & senseful seq.-numbers: Stephan Fuhrmann (stephan.fuhrmann AT 1und1.de)
- *
- *
- * RCS header information no longer used. It has been moved to the
-@@ -42,7 +42,6 @@
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
--#define IPV6 1 /* This should be a compiler option, or even better be done from the Makefile... ;) */
-
- #ifndef _NO_PROTO
- #if !__STDC__ && !defined( __cplusplus ) && !defined( FUNCPROTO ) \
-@@ -101,13 +100,8 @@
- #endif
- #include <netinet/in_systm.h>
-
--/* Linux has bizarre ip.h and ip_icmp.h */
--#if defined( __linux__ )
--#include "linux.h"
--#else
- #include <netinet/ip.h>
- #include <netinet/ip_icmp.h>
--#endif /* defined(__linux__) */
-
- #include <arpa/inet.h>
- #include <netdb.h>
-@@ -150,7 +144,11 @@
- #define MIN_PING_DATA sizeof( PING_DATA )
- #define MAX_IP_PACKET 65536 /* (theoretical) max IP packet size */
- #define SIZE_IP_HDR 20
-+#ifndef IPV6
- #define SIZE_ICMP_HDR ICMP_MINLEN /* from ip_icmp.h */
-+#else
-+#define SIZE_ICMP_HDR sizeof(FPING_ICMPHDR)
-+#endif
- #define MAX_PING_DATA ( MAX_IP_PACKET - SIZE_IP_HDR - SIZE_ICMP_HDR )
-
- /* sized so as to be like traditional ping */
-@@ -192,7 +190,7 @@
- "",
- "",
- "ICMP Time Exceeded", /* 11 */
-- "ICMP Paramter Problem", /* 12 */
-+ "ICMP Parameter Problem", /* 12 */
- "ICMP Timestamp Request", /* 13 */
- "ICMP Timestamp Reply", /* 14 */
- "ICMP Information Request", /* 15 */
-@@ -283,6 +281,12 @@
- u_int count = 1;
- u_int trials;
- u_int report_interval = 0;
-+int src_addr_present = 0;
-+#ifndef IPV6
-+struct in_addr src_addr;
-+#else
-+struct in6_addr src_addr;
-+#endif
-
- /* global stats */
- long max_reply = 0;
-@@ -292,6 +296,7 @@
- int max_hostname_len = 0;
- int num_jobs = 0; /* number of hosts still to do */
- int num_hosts; /* total number of hosts */
-+int max_seq_sent = 0; /* maximum sequence number sent so far */
- int num_alive = 0, /* total number alive */
- num_unreachable = 0, /* total number unreachable */
- num_noaddress = 0; /* total number of addresses not found */
-@@ -408,6 +413,11 @@
- struct protoent *proto;
- char *buf;
- uid_t uid;
-+#ifndef IPV6
-+ struct sockaddr_in sa;
-+#else
-+ struct sockaddr_in6 sa;
-+#endif
- /* check if we are root */
-
- if( geteuid() )
-@@ -439,7 +449,7 @@
-
- #ifdef IPV6
- /*
-- * let the kerel pass extension headers of incoming packets,
-+ * let the kernel pass extension headers of incoming packets,
- * for privileged socket options
- */
- #ifdef IPV6_RECVHOPOPTS
-@@ -474,6 +484,35 @@
- sizeof(opton)))
- err(1, "setsockopt(IPV6_RTHDR)");
- #endif
-+#ifndef USE_SIN6_SCOPE_ID
-+#ifdef IPV6_RECVPKTINFO
-+ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVPKTINFO, &opton,
-+ sizeof(opton)))
-+ err(1, "setsockopt(IPV6_RECVPKTINFO)");
-+#else /* old adv. API */
-+ if (setsockopt(s, IPPROTO_IPV6, IPV6_PKTINFO, &opton,
-+ sizeof(opton)))
-+ err(1, "setsockopt(IPV6_PKTINFO)");
-+#endif
-+#endif /* USE_SIN6_SCOPE_ID */
-+#ifdef IPV6_RECVHOPLIMIT
-+ if (setsockopt(s, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &opton,
-+ sizeof(opton)))
-+ err(1, "setsockopt(IPV6_RECVHOPLIMIT)");
-+#else /* old adv. API */
-+ if (setsockopt(s, IPPROTO_IPV6, IPV6_HOPLIMIT, &opton,
-+ sizeof(opton)))
-+ err(1, "setsockopt(IPV6_HOPLIMIT)");
-+#endif
-+#ifdef IPV6_CHECKSUM
-+#ifndef SOL_RAW
-+#define SOL_RAW IPPROTO_IPV6
-+#endif
-+ opton = 2;
-+ if (setsockopt(s, SOL_RAW, IPV6_CHECKSUM, &opton,
-+ sizeof(opton)))
-+ err(1, "setsockopt(SOL_RAW,IPV6_CHECKSUM)");
-+#endif
- #endif
-
- if( ( uid = getuid() ) )
-@@ -491,7 +530,7 @@
-
- /* get command line options */
-
-- while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:" ) ) != EOF )
-+ while( ( c = getopt( argc, argv, "gedhlmnqusaAvz:t:i:p:f:r:c:b:C:Q:B:S:I:T:" ) ) != EOF )
- {
- switch( c )
- {
-@@ -502,7 +541,7 @@
- break;
-
- case 'r':
-- if( !( retry = ( u_int )atoi( optarg ) ) )
-+ if( ( retry = ( u_int )atoi( optarg ) ) < 0 )
- usage();
-
- break;
-@@ -639,6 +678,33 @@
- generate_flag = 1;
- break;
-
-+ case 'S':
-+#ifndef IPV6
-+ if( ! inet_pton( AF_INET, optarg, &src_addr ) )
-+#else
-+ if( ! inet_pton( AF_INET6, optarg, &src_addr ) )
-+#endif
-+ usage();
-+ src_addr_present = 1;
-+ break;
-+
-+ case 'I':
-+#ifdef SO_BINDTODEVICE
-+ if (setsockopt(s, SOL_SOCKET, SO_BINDTODEVICE, optarg,
-+ strlen(optarg)))
-+ err(1, "setsockopt(AF_INET, SO_BINDTODEVICE)");
-+#else
-+ fprintf( stderr,
-+ "Warning: SO_BINDTODEVICE not supported, argument -I %s ignored\n",
-+ optarg );
-+#endif
-+ break;
-+
-+ case 'T':
-+ if ( ! ( select_time = ( u_int )atoi( optarg ) * 100 ) )
-+ usage();
-+ break;
-+
- default:
- usage();
- break;
-@@ -821,7 +887,7 @@
- errno_crash_and_burn( "fopen" );
-
-
-- while( fgets( line, 132, ping_file ) )
-+ while( fgets( line, sizeof(line), ping_file ) )
- {
- if( sscanf( line, "%s", host ) != 1 )
- continue;
-@@ -962,6 +1028,22 @@
- if( !num_hosts )
- exit( 2 );
-
-+ /* set the source address */
-+
-+ if( src_addr_present )
-+ {
-+ memset( &sa, 0, sizeof( sa ) );
-+#ifndef IPV6
-+ sa.sin_family = AF_INET;
-+ sa.sin_addr = src_addr;
-+#else
-+ sa.sin6_family = AF_INET6;
-+ sa.sin6_addr = src_addr;
-+#endif
-+ if ( bind( s, (struct sockaddr *)&sa, sizeof( sa ) ) < 0 )
-+ errno_crash_and_burn( "cannot bind source address" );
-+ }
-+
- /* allocate array to hold outstanding ping requests */
-
- table = ( HOST_ENTRY** )malloc( sizeof( HOST_ENTRY* ) * num_hosts );
-@@ -1112,7 +1194,7 @@
- /* but allow time for the last one to come in */
- if( count_flag )
- {
-- if( ( cursor->num_sent >= count ) && ( ht > cursor->timeout ) )
-+ if( ( cursor->num_sent >= count ) && ( cursor->num_recv >= count || ht > cursor->timeout ) )
- {
- remove_job( cursor );
- continue;
-@@ -1153,6 +1235,7 @@
-
- finish();
-
-+ return 0;
- } /* main() */
-
-
-@@ -1382,15 +1465,15 @@
- if( h->num_recv_i <= h->num_sent_i )
- {
- fprintf( stderr, " xmt/rcv/%%loss = %d/%d/%d%%",
-- h->num_sent_i, h->num_recv_i,
-- ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i );
-+ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ?
-+ ( ( h->num_sent_i - h->num_recv_i ) * 100 ) / h->num_sent_i : 0 );
-
- }/* IF */
- else
- {
- fprintf( stderr, " xmt/rcv/%%return = %d/%d/%d%%",
-- h->num_sent_i, h->num_recv_i,
-- ( ( h->num_recv_i * 100 ) / h->num_sent_i ) );
-+ h->num_sent_i, h->num_recv_i, h->num_sent_i > 0 ?
-+ ( ( h->num_recv_i * 100 ) / h->num_sent_i ) : 0 );
-
- }/* ELSE */
-
-@@ -1504,12 +1587,15 @@
- icp = ( FPING_ICMPHDR* )buffer;
-
- gettimeofday( &h->last_send_time, &tz );
-+ int myseq = h->num_sent * num_hosts + h->i;
-+ max_seq_sent = myseq > max_seq_sent ? myseq : max_seq_sent;
-+
- #ifndef IPV6
- icp->icmp_type = ICMP_ECHO;
- icp->icmp_code = 0;
- icp->icmp_cksum = 0;
-- icp->icmp_seq = h->i;
-- icp->icmp_id = ident;
-+ icp->icmp_seq = htons(myseq);
-+ icp->icmp_id = htons(ident);
-
- pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
- pdp->ping_ts = h->last_send_time;
-@@ -1519,8 +1605,8 @@
- #else
- icp->icmp6_type = ICMP6_ECHO_REQUEST;
- icp->icmp6_code = 0;
-- icp->icmp6_seq = h->i;
-- icp->icmp6_id = ident;
-+ icp->icmp6_seq = htons(myseq);
-+ icp->icmp6_id = htons(ident);
-
- pdp = ( PING_DATA* )( buffer + SIZE_ICMP_HDR );
- pdp->ping_ts = h->last_send_time;
-@@ -1667,25 +1753,25 @@
- }/* IF */
-
- #ifndef IPV6
-- if( icp->icmp_id != ident )
-+ if( ntohs(icp->icmp_id) != ident )
- #else
-- if( icp->icmp6_id != ident )
-+ if( ntohs(icp->icmp6_id) != ident )
- #endif
- return 1; /* packet received, but not the one we are looking for! */
-
- num_pingreceived++;
-
- #ifndef IPV6
-- if( icp->icmp_seq >= ( n_short )num_hosts )
-+ if( ntohs(icp->icmp_seq) > max_seq_sent )
- #else
-- if( icp->icmp6_seq >= ( n_short )num_hosts )
-+ if( ntohs(icp->icmp6_seq) > max_seq_sent )
- #endif
- return( 1 ); /* packet received, don't worry about it anymore */
-
- #ifndef IPV6
-- n = icp->icmp_seq;
-+ n = ntohs(icp->icmp_seq) % num_hosts;
- #else
-- n = icp->icmp6_seq;
-+ n = ntohs(icp->icmp6_seq) % num_hosts;
- #endif
- h = table[n];
-
-@@ -1824,6 +1910,7 @@
-
- }/* IF */
-
-+ fflush( stdout );
- return num_jobs;
-
- } /* wait_for_reply() */
-@@ -1875,11 +1962,11 @@
- sent_icmp = ( struct icmp* )( c + 28 );
-
- if( ( sent_icmp->icmp_type == ICMP_ECHO ) &&
-- ( sent_icmp->icmp_id == ident ) &&
-- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) )
-+ ( ntohs(sent_icmp->icmp_id) == ident ) &&
-+ ( ntohs(sent_icmp->icmp_seq) <= ( n_short )max_seq_sent ) )
- {
- /* this is a response to a ping we sent */
-- h = table[sent_icmp->icmp_seq];
-+ h = table[ntohs(sent_icmp->icmp_seq) % num_hosts];
-
- if( p->icmp_code > ICMP_UNREACH_MAXTYPE )
- {
-@@ -1888,11 +1975,11 @@
-
- #else
- if( ( sent_icmp->icmp6_type == ICMP_ECHO ) &&
-- ( sent_icmp->icmp6_id == ident ) &&
-- ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) )
-+ ( ntohs(sent_icmp->icmp6_id) == ident ) &&
-+ ( ntohs(sent_icmp->icmp6_seq) <= ( n_short )max_seq_sent ) )
- {
- /* this is a response to a ping we sent */
-- h = table[sent_icmp->icmp6_seq];
-+ h = table[ntohs(sent_icmp->icmp6_seq) % num_hosts];
-
- if( p->icmp6_code > ICMP_UNREACH_MAXTYPE )
- {
-@@ -1930,24 +2017,24 @@
- case ICMP_PARAMPROB:
- sent_icmp = ( FPING_ICMPHDR* )( c + 28 );
- #ifndef IPV6
-- if( ( sent_icmp->icmp_type = ICMP_ECHO ) &&
-- ( sent_icmp->icmp_id = ident ) &&
-- ( sent_icmp->icmp_seq < ( n_short )num_hosts ) )
-+ if( ( sent_icmp->icmp_type == ICMP_ECHO ) &&
-+ ( ntohs(sent_icmp->icmp_id) == ident ) &&
-+ ( ntohs(sent_icmp->icmp_seq) <= ( n_short )max_seq_sent ) )
- {
- /* this is a response to a ping we sent */
-- h = table[sent_icmp->icmp_seq];
-+ h = table[ntohs(sent_icmp->icmp_seq) % num_hosts];
- fprintf( stderr, "%s from %s for ICMP Echo sent to %s",
- icmp_type_str[p->icmp_type], inet_ntoa( addr->sin_addr ), h->host );
-
- if( inet_addr( h->host ) == -1 )
- fprintf( stderr, " (%s)", inet_ntoa( h->saddr.sin_addr ) );
- #else
-- if( ( sent_icmp->icmp6_type = ICMP_ECHO ) &&
-- ( sent_icmp->icmp6_id = ident ) &&
-- ( sent_icmp->icmp6_seq < ( n_short )num_hosts ) )
-+ if( ( sent_icmp->icmp6_type == ICMP_ECHO ) &&
-+ ( ntohs(sent_icmp->icmp6_id) == ident ) &&
-+ ( ntohs(sent_icmp->icmp6_seq) <= ( n_short )max_seq_sent ) )
- {
- /* this is a response to a ping we sent */
-- h = table[sent_icmp->icmp6_seq];
-+ h = table[ntohs(sent_icmp->icmp6_seq) % num_hosts];
- fprintf( stderr, "%s from %s for ICMP Echo sent to %s",
- icmp_type_str[p->icmp6_type], addr_ascii, h->host );
-
-@@ -2165,20 +2252,33 @@
- struct addrinfo *res, hints;
- int ret_ga;
- char *hostname;
-+ size_t len;
-
- /* getaddrinfo */
- bzero(&hints, sizeof(struct addrinfo));
-- hints.ai_flags = AI_CANONNAME;
-+ hints.ai_flags = name_flag ? AI_CANONNAME : 0;
- hints.ai_family = AF_INET6;
- hints.ai_socktype = SOCK_RAW;
- hints.ai_protocol = IPPROTO_ICMPV6;
-
- ret_ga = getaddrinfo(name, NULL, &hints, &res);
-- if (ret_ga) errx(1, "%s", gai_strerror(ret_ga));
-+ if (ret_ga) {
-+ if(!quiet_flag)
-+ warnx("%s", gai_strerror(ret_ga));
-+ num_noaddress++;
-+ return;
-+ }
- if (res->ai_canonname) hostname = res->ai_canonname;
- else hostname = name;
-- if (!res->ai_addr) errx(1, "getaddrinfo failed");
-- (void)memcpy(&dst, res->ai_addr, sizeof(FPING_SOCKADDR)); /*res->ai_addrlen);*/
-+ if (!res->ai_addr) {
-+ if(!quiet_flag)
-+ warnx("getaddrinfo failed");
-+ num_noaddress++;
-+ return;
-+ }
-+ len = res->ai_addrlen;
-+ if (len > sizeof(FPING_SOCKADDR)) len = sizeof(FPING_SOCKADDR);
-+ (void)memcpy(&dst, res->ai_addr, len);
- add_addr(name, name, &dst);
- #endif
- } /* add_name() */
-@@ -2730,9 +2830,11 @@
- fprintf( stderr, " (in looping and counting modes, default %d)\n", perhost_interval / 100 );
- fprintf( stderr, " -q quiet (don't show per-target/per-ping results)\n" );
- fprintf( stderr, " -Q n same as -q, but show summary every n seconds\n" );
-- fprintf( stderr, " -r n number of retries (default %d)\n", retry );
-+ fprintf( stderr, " -r n number of retries (default %d)\n", DEFAULT_RETRY );
- fprintf( stderr, " -s print final stats\n" );
-+ fprintf( stderr, " -S addr set source address\n" );
- fprintf( stderr, " -t n individual target initial timeout (in millisec) (default %d)\n", timeout / 100 );
-+ fprintf( stderr, " -T n set select timeout (default %d)\n", select_time / 100 );
- fprintf( stderr, " -u show targets that are unreachable\n" );
- fprintf( stderr, " -v show version\n" );
- fprintf( stderr, " targets list of targets to check (if no -f specified)\n" );
---- fping-2.4b2-to-ipv6.orig/debian/fping.docs
-+++ fping-2.4b2-to-ipv6/debian/fping.docs
-@@ -0,0 +1 @@
-+README
---- fping-2.4b2-to-ipv6.orig/debian/lintian.overrides
-+++ fping-2.4b2-to-ipv6/debian/lintian.overrides
-@@ -0,0 +1 @@
-+fping: setuid-binary
---- fping-2.4b2-to-ipv6.orig/debian/fping.dirs
-+++ fping-2.4b2-to-ipv6/debian/fping.dirs
-@@ -0,0 +1,4 @@
-+usr/bin
-+usr/sbin
-+usr/share/man/man8
-+usr/share/lintian/overrides
---- fping-2.4b2-to-ipv6.orig/debian/copyright
-+++ fping-2.4b2-to-ipv6/debian/copyright
-@@ -0,0 +1,33 @@
-+This package was split from netstd by Herbert Xu herbert@debian.org on
-+Sat, 30 Oct 1999 16:39:06 +1000.
-+
-+It is maintained by Anibal Monsalve Salazar <anibal@debian.org>.
-+
-+netstd was created by Peter Tobias tobias@et-inf.fho-emden.de on
-+Wed, 20 Jul 1994 17:23:21 +0200.
-+
-+It was downloaded from http://www.fping.com/.
-+
-+Copyright:
-+
-+Upstream maintainer: David Papp <david@remote.net>
-+Original author: Roland Schemers <schemers@stanford.edu>
-+IPv6 Support: Jeroen Massar <jeroen@unfix.org / jeroen@ipng.nl>
-+
-+
-+Copyright (c) 1992, 1994, 1997
-+Board of Trustees
-+Leland Stanford Jr. University
-+
-+Redistribution and use in source and binary forms are permitted provided
-+that the above copyright notice and this paragraph are duplicated in all
-+such forms and that any documentation, advertising materials, and other
-+materials related to such distribution and use acknowledge that the software
-+was developed by Stanford University. The name of the University may not
-+be used to endorse or promote products derived from this software without
-+specific prior written permission.
-+
-+THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR IMPLIED
-+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
-+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-+
---- fping-2.4b2-to-ipv6.orig/debian/control
-+++ fping-2.4b2-to-ipv6/debian/control
-@@ -0,0 +1,20 @@
-+Source: fping
-+Section: net
-+Priority: optional
-+Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
-+Standards-Version: 3.8.0
-+Build-Depends: debhelper (>= 5)
-+Homepage: http://fping.sourceforge.net/
-+
-+Package: fping
-+Architecture: any
-+Depends: ${shlibs:Depends}, ${misc:Depends}
-+Conflicts: suidmanager (<< 0.50)
-+Replaces: netstd
-+Description: sends ICMP ECHO_REQUEST packets to network hosts
-+ fping is a ping like program which uses the Internet Control Message Protocol
-+ (ICMP) echo request to determine if a target host is responding. fping
-+ differs from ping in that you can specify any number of targets on the command
-+ line, or specify a file containing the lists of targets to ping. Instead of
-+ sending to one target until it times out or replies, fping will send out a
-+ ping packet and move on to the next target in a round-robin fashion.
---- fping-2.4b2-to-ipv6.orig/debian/rules
-+++ fping-2.4b2-to-ipv6/debian/rules
-@@ -0,0 +1,78 @@
-+#!/usr/bin/make -f
-+# GNU copyright 1997 to 1999 by Joey Hess.
-+# Copyright (c) 1999 Herbert Xu <herbert@debian.org>
-+# Copyright (c) 2004-2005 Anibal Monsalve Salazar <anibal@debian.org>
-+
-+# Uncomment this to turn on verbose mode.
-+export DH_VERBOSE=1
-+
-+configure: configure-stamp
-+configure-stamp:
-+ dh_testdir
-+
-+ mkdir build build/ipv4 build/ipv6
-+ cp -a $$(find * -maxdepth 0 ! -name build) build
-+ cd build/ipv4; ../configure
-+ cd build/ipv6; ../configure
-+
-+ touch configure-stamp
-+
-+build: build-stamp
-+build-stamp: configure-stamp
-+ dh_testdir
-+
-+ $(MAKE) -C build/ipv4
-+ $(MAKE) -C build/ipv6 CFLAGS='-g -O2 -DIPV6=1'
-+
-+ touch build-stamp
-+
-+clean:
-+ dh_testdir
-+ dh_testroot
-+
-+ rm -rf build build-stamp configure-stamp
-+
-+ dh_clean
-+
-+install: build
-+ dh_testdir
-+ dh_testroot
-+ dh_clean -k
-+ dh_installdirs
-+
-+ install build/ipv4/fping debian/fping/usr/bin
-+ install build/ipv6/fping debian/fping/usr/bin/fping6
-+ cp fping.8 debian/fping/usr/share/man/man8
-+ ln -s fping.8 debian/fping/usr/share/man/man8/fping6.8
-+
-+ install -g 0 -o 0 -m 644 -p debian/lintian.overrides debian/fping/usr/share/lintian/overrides/fping
-+
-+ touch install-stamp
-+
-+# Build architecture-independent files here.
-+binary-indep: build install
-+# We have nothing to do by default.
-+
-+# Build architecture-dependent files here.
-+binary-arch: build install
-+ dh_testdir
-+ dh_testroot
-+ dh_installdocs
-+ dh_installexamples
-+ dh_installmenu
-+ dh_installcron
-+ dh_installinfo
-+ dh_installchangelogs ChangeLog
-+ dh_link
-+ dh_strip
-+ dh_compress
-+ dh_fixperms
-+ chmod 4755 debian/fping/usr/bin/fping*
-+ dh_installdeb
-+ dh_shlibdeps
-+ dh_gencontrol
-+ dh_md5sums
-+ dh_builddeb
-+
-+binary: binary-indep binary-arch
-+.PHONY: build clean configure binary-indep binary-arch binary install
---- fping-2.4b2-to-ipv6.orig/debian/compat
-+++ fping-2.4b2-to-ipv6/debian/compat
-@@ -0,0 +1 @@
-+5
---- fping-2.4b2-to-ipv6.orig/debian/changelog
-+++ fping-2.4b2-to-ipv6/debian/changelog
-@@ -0,0 +1,174 @@
-+fping (2.4b2-to-ipv6-16.1) unstable; urgency=low
-+
-+ * NMU during Moenchengladbach BSP
-+ * Fixes FTBFS on kfreebsd (Closes: #555398)
-+ * Fixes typo "Paramter" in binary
-+
-+ -- Axel Beckert <abe@deuxchevaux.org> Sat, 23 Jan 2010 16:22:02 +0100
-+
-+fping (2.4b2-to-ipv6-16) unstable; urgency=low
-+
-+ * Fix the following bugs
-+ - Network byte order sensitivity was missing completely.
-+ Added hopefully all missing calls.
-+ - The sequence numbering scheme used led to packet drops.
-+ Changed it to a more senseful numbering scheme.
-+ - Some minor C programming mistakes ('=' instead of '==').
-+ Patch by Stephan Fuhrmann; closes: #502569
-+ * Add support for command line select timeout setting
-+ Patch by Marton Balint; closes: #502575
-+ * Remove symlinks in /usr/sbin; closes: #377732
-+ * Standards-Version is 3.8.0
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 18 Oct 2008 12:04:52 +1100
-+
-+fping (2.4b2-to-ipv6-15) unstable; urgency=low
-+
-+ * Added interface binding (-I) for fping
-+ Patch by Peter Naulls <peter@mushroomnetworks.com>
-+ Closes: #439014
-+ * Fixed a couple of typos in fping.8. Closes: #423180
-+ * Added homepage control header
-+ * Bumped Standards-Version to 3.7.3
-+ * Fixed the following lintian issue:
-+ - debian-rules-sets-DH_COMPAT
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org> Mon, 03 Mar 2008 17:46:17 +1100
-+
-+fping (2.4b2-to-ipv6-14) unstable; urgency=low
-+
-+ * Set Standards-Version to 3.7.2.
-+ * Set DH_COMPAT to 5.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org> Fri, 23 Jun 2006 20:56:39 +1000
-+
-+fping (2.4b2-to-ipv6-13) unstable; urgency=low
-+
-+ * Fixed stdout flush problem, closes: #340146.
-+ Patch by Bart Martens <bart.martens@advalvas.be>.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org> Fri, 30 Dec 2005 08:30:09 +1100
-+
-+fping (2.4b2-to-ipv6-12) unstable; urgency=low
-+
-+ * Fixed "problem with option -r (retry limit)", closes: #318402.
-+ Patch by Qingning Huo <qingningh@lanware.co.uk>.
-+ * Set Standards-Version to 3.6.2 in debian/control and DH_COMPAT
-+ to 4 in debian/rules..
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org> Sat, 08 Oct 2005 21:26:35 +1000
-+
-+fping (2.4b2-to-ipv6-11) unstable; urgency=low
-+
-+ * Fixed "would be useful to specify 'source address' like ping for multi
-+ homed machines", closes: #198486.
-+ Patch by Marc Haber <mh+debian-bugs@zugschlus.de>.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org> Thu, 02 Jun 2005 08:14:54 +1000
-+
-+fping (2.4b2-to-ipv6-10) unstable; urgency=low
-+
-+ * Fixed "unnecessary delay with the -c option after the last packet"
-+ (Closes: #293856). Patch by Niko Tyni <ntyni@iki.fi>
-+ * New maintainer's email address.
-+
-+ -- Anibal Monsalve Salazar <anibal@debian.org> Sun, 06 Feb 2005 23:25:57 +1100
-+
-+fping (2.4b2-to-ipv6-9) unstable; urgency=low
-+
-+ * Fixed "fping6 always does reverse lookup" (Closes: #273647).
-+ Patch by Jeroen Massar and forwarded by Bernhard Schmidt <berni@birkenwald.de>
-+
-+ -- Anibal Monsalve Salazar <A.Monsalve.Salazar@IEEE.org> Mon, 10 Jan 2005 00:01:32 +1100
-+
-+fping (2.4b2-to-ipv6-8) unstable; urgency=low
-+
-+ * New maintainer.
-+
-+ -- Anibal Monsalve Salazar <A.Monsalve.Salazar@IEEE.org> Thu, 20 May 2004 09:42:08 +1000
-+
-+fping (2.4b2-to-ipv6-7) unstable; urgency=low
-+
-+ * Build fping in build/ipv[46] instead of build and build-ipv6.
-+ * Made DNS errors non-fatal for IPv6 (closes: #198056).
-+
-+ -- Herbert Xu <herbert@debian.org> Fri, 20 Jun 2003 21:36:30 +1000
-+
-+fping (2.4b2-to-ipv6-6) unstable; urgency=low
-+
-+ * Do not use incorrect linux.h file (closes: #85468).
-+
-+ -- Herbert Xu <herbert@debian.org> Sat, 17 May 2003 14:13:11 +1000
-+
-+fping (2.4b2-to-ipv6-5) unstable; urgency=low
-+
-+ * Fixed yet another divide by zero bug (closes: #148445).
-+
-+ -- Herbert Xu <herbert@debian.org> Tue, 4 Jun 2002 12:18:03 +1000
-+
-+fping (2.4b2-to-ipv6-4) unstable; urgency=low
-+
-+ * Made fping6 setuid (closes: #136386).
-+ * Moved fping back into bin.
-+ * Partially applied IPv6 patch to fix IPv6 checksums (closes: #136479).
-+
-+ -- Herbert Xu <herbert@debian.org> Sun, 7 Apr 2002 20:36:56 +1000
-+
-+fping (2.4b2-to-ipv6-3) unstable; urgency=low
-+
-+ * Added compatibility symlink for fping (closes: #135203).
-+
-+ -- Herbert Xu <herbert@debian.org> Sat, 23 Feb 2002 08:34:11 +1100
-+
-+fping (2.4b2-to-ipv6-2) unstable; urgency=low
-+
-+ * Turned setuid bit on again since the code before dropping privilegs is
-+ minimal.
-+ * Fixed another divide by zero error (closes: #132370).
-+
-+ -- Herbert Xu <herbert@debian.org> Thu, 7 Feb 2002 20:10:48 +1100
-+
-+fping (2.4b2-to-ipv6-1) unstable; urgency=low
-+
-+ * New upstream release.
-+ * Install fping into sbin as done by upstream.
-+ * Turned setuid bit off.
-+
-+ -- Herbert Xu <herbert@debian.org> Fri, 1 Feb 2002 22:11:59 +1100
-+
-+fping (2.2b2-3) unstable; urgency=low
-+
-+ * Removed INSTALL file from package (closes: #84050).
-+ * Fixed alignment bug.
-+
-+ -- Herbert Xu <herbert@debian.org> Sat, 10 Feb 2001 19:25:18 +1100
-+
-+fping (2.2b2-2) unstable; urgency=low
-+
-+ * Made changes for dpkg-statoverride (closes: #83838).
-+
-+ -- Herbert Xu <herbert@debian.org> Sun, 28 Jan 2001 21:53:05 +1100
-+
-+fping (2.2b2-1) unstable; urgency=low
-+
-+ * New upstream release.
-+ * Fixed typo that prevented -d from working (closes: #83255).
-+ * Drop root privileges after opening the socket (closes: #81589).
-+ * Fixed the options [tip], they were out by a factor of 10
-+ (Richard Kettlewell, closes: #83742).
-+
-+ -- Herbert Xu <herbert@debian.org> Sun, 28 Jan 2001 00:09:41 +1100
-+
-+fping (2.2b1-2) unstable; urgency=low
-+
-+ * Fixed typo in control file, spotted by William Ono (closes: #49909).
-+
-+ -- Herbert Xu <herbert@debian.org> Mon, 15 May 2000 12:27:03 +1000
-+
-+fping (2.2b1-1) unstable; urgency=low
-+
-+ * Initial release.
-+ * Fixed divide by zero error (closes: #29902).
-+
-+ -- Herbert Xu <herbert@debian.org> Sat, 30 Oct 1999 16:36:19 +1000
-+
diff --git a/extra/gegl/0.1.6-ffmpeg.patch b/extra/gegl/0.1.6-ffmpeg.patch
deleted file mode 100644
index 51fb95d28..000000000
--- a/extra/gegl/0.1.6-ffmpeg.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -urN gegl-0.1.6.old//operations/external/ff-load.c gegl-0.1.6/operations/external/ff-load.c
---- gegl-0.1.6.old//operations/external/ff-load.c 2011-01-24 19:03:30.000000000 -0300
-+++ gegl-0.1.6/operations/external/ff-load.c 2011-05-04 09:59:48.910379742 -0300
-@@ -69,17 +69,17 @@
- {
- switch (err)
- {
-- case AVERROR_NUMEXPECTED:
-+ case AVERROR(EDOM):
- g_warning ("%s: Incorrect image filename syntax.\n"
- "Use '%%d' to specify the image number:\n"
- " for img1.jpg, img2.jpg, ..., use 'img%%d.jpg';\n"
- " for img001.jpg, img002.jpg, ..., use 'img%%03d.jpg'.\n",
- filename);
- break;
-- case AVERROR_INVALIDDATA:
-+ case AVERROR(EINVAL):
- g_warning ("%s: Error while parsing header\n", filename);
- break;
-- case AVERROR_NOFMT:
-+ case AVERROR(EILSEQ):
- g_warning ("%s: Unknown format\n", filename);
- break;
- default:
-@@ -278,7 +278,7 @@
- for (i = 0; i< p->ic->nb_streams; i++)
- {
- AVCodecContext *c = p->ic->streams[i]->codec;
-- if (c->codec_type == CODEC_TYPE_VIDEO)
-+ if (c->codec_type == AVMEDIA_TYPE_VIDEO)
- {
- p->video_st = p->ic->streams[i];
- p->video_stream = i;
diff --git a/extra/gtk3/filechooserdefault_do_not_unref_value_twice.patch b/extra/gtk3/filechooserdefault_do_not_unref_value_twice.patch
deleted file mode 100644
index 3a0f8320e..000000000
--- a/extra/gtk3/filechooserdefault_do_not_unref_value_twice.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From aca43f43be3886f1a0befda0178ebb94ea2cf7b1 Mon Sep 17 00:00:00 2001
-From: Benjamin Otte <otte@redhat.com>
-Date: Tue, 29 Nov 2011 19:39:21 +0000
-Subject: filechooserdefault: Don't unref value twice
-
-Double unref was introduced in eb02dacb370e8b4e6ef62328d0c09673b1234b32
-
-https://bugzilla.gnome.org/show_bug.cgi?id=646461
-https://bugzilla.gnome.org/show_bug.cgi?id=664137
----
-diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
-index e33b91e..a74aacc 100644
---- a/gtk/gtkfilechooserdefault.c
-+++ b/gtk/gtkfilechooserdefault.c
-@@ -10127,7 +10127,6 @@ list_row_activated (GtkTreeView *tree_view,
- if (is_folder && file)
- {
- change_folder_and_display_error (impl, file, FALSE);
-- g_object_unref (file);
- goto out;
- }
-
---
-cgit v0.9.0.2
diff --git a/extra/gtk3/moveresize.patch b/extra/gtk3/moveresize.patch
deleted file mode 100644
index a2795fcc8..000000000
--- a/extra/gtk3/moveresize.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 89c90ed193331d2ee96f323e10aaafd4366f4b0e Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 10 Dec 2011 02:21:09 +0000
-Subject: Fix move-resize emulation with XI2
-
-https://bugzilla.gnome.org/show_bug.cgi?id=650943
----
-diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c
-index 1ff816e..d48927f 100644
---- a/gdk/x11/gdkwindow-x11.c
-+++ b/gdk/x11/gdkwindow-x11.c
-@@ -4296,6 +4296,33 @@ _gdk_x11_moveresize_handle_event (XEvent *event)
- if (event->xbutton.button == mv_resize->moveresize_button)
- finish_drag (mv_resize);
- break;
-+
-+#ifdef HAVE_XGENERICEVENTS
-+ case GenericEvent:
-+ {
-+ /* we just assume this is an XI2 event */
-+ XIEvent *ev = (XIEvent *) event->xcookie.data;
-+ XIDeviceEvent *xev = (XIDeviceEvent *)ev;
-+ gint state;
-+ switch (ev->evtype)
-+ {
-+ case XI_Motion:
-+ update_pos (mv_resize, xev->root_x, xev->root_y);
-+ state = _gdk_x11_device_xi2_translate_state (&xev->mods, &xev->buttons, &xev->group);
-+ if ((state & button_mask) == 0)
-+ finish_drag (mv_resize);
-+ break;
-+
-+ case XI_ButtonRelease:
-+ update_pos (mv_resize, xev->root_x, xev->root_y);
-+ if (xev->detail == mv_resize->moveresize_button)
-+ finish_drag (mv_resize);
-+ break;
-+ }
-+ }
-+ break;
-+#endif
-+
- }
- return TRUE;
- }
---
-cgit v0.9.0.2
diff --git a/extra/hplip/PKGBUILD b/extra/hplip/PKGBUILD
deleted file mode 100644
index c9a89bd84..000000000
--- a/extra/hplip/PKGBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# $Id: PKGBUILD 144358 2011-12-05 03:45:19Z eric $
-# Maintainer : Rémy Oudompheng <remy@archlinux.org>
-# Contributor: Morgan LEFIEUX <comete@archlinuxfr.org>
-
-pkgname=hplip
-pkgver=3.11.10
-pkgrel=2
-pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet"
-arch=('i686' 'x86_64')
-url="http://hplipopensource.com"
-license=('GPL')
-depends=('python2' 'ghostscript>=8.64-6' 'foomatic-db' 'foomatic-db-engine'
- 'net-snmp>=5.7.1')
-makedepends=('python2-qt' 'python2-gobject2' 'sane' 'rpcbind' 'cups')
-optdepends=('cups: for printing support'
- 'dbus-python: for dbus support'
- 'sane: for scanner support'
- 'python-imaging: for commandline scanning support'
- 'python-notify: for Desktop notification support'
- 'rpcbind: for network support'
- 'python2-qt: for running hp-toolbox'
- 'python2-gobject2: for running hp-toolbox'
- 'hplip-plugin: binary blobs for specific devices')
-replaces=('hpijs')
-options=('!libtool')
-install=hplip.install
-source=(http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.gz{,.asc})
-md5sums=('6143f30f3b6905ef22105176a3b80db0'
- '396bbd8c5cc92aa8295e5bcb508692f3')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- export PYTHON=python2
- find . -type f -exec sed -i 's~^#.*env python~#!/usr/bin/env python2~' {} +
- sed -i '1s|#!/usr/bin/python|#!/usr/bin/python2|' base/magic.py
- sed -i 's|python ./print.py|python2 ./print.py|' scan.py
- sed -i 's|python ./testpage.py|python2 ./testpage.py|' setup.py
- sed -i 's|python ./setup.py|python2 ./setup.py|' ui4/devmgr5.py ui4/nodevicesdialog.py
- sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py
- sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py
-
- # fix sysfs rules
- sed -i -e "s|SYSFS|ATTR|g" \
- -e "s|sysfs|attr|g" \
- data/rules/56-hpmud_support.rules
-
- ./configure --prefix=/usr \
- --enable-qt4 \
- --enable-foomatic-rip-hplip-install \
- --enable-foomatic-ppd-install \
- --enable-hpcups-install \
- --enable-new-hpcups \
- --enable-cups-ppd-install \
- --enable-cups-drv-install \
- --enable-hpijs-install \
- --enable-foomatic-drv-install \
- --enable-pp-build \
- --enable-udev-acl-rules
-
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install
- # remove config provided by sane and autostart of hp-daemon
- rm -rf "$pkgdir"/etc/{sane.d,xdg}
-}
diff --git a/extra/hplip/hplip.install b/extra/hplip/hplip.install
deleted file mode 100644
index cb0eaf8e8..000000000
--- a/extra/hplip/hplip.install
+++ /dev/null
@@ -1,10 +0,0 @@
-post_install() {
- cat << EOF
-
-NOTE
-----
-# If you want to use this driver with sane:
-# echo "hpaio" >> /etc/sane.d/dll.conf
-
-EOF
-}
diff --git a/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch b/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch
deleted file mode 100644
index 79ca0a6c0..000000000
--- a/extra/icedtea-web-java7/icedtea-web-1.1.4-npapi-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc
---- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav 2011-11-08 17:27:29.046520865 -0500
-+++ ./plugin/icedteanp/IcedTeaNPPlugin.cc 2011-11-08 17:27:40.469611421 -0500
-@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
-
- // Returns a string describing the MIME type that this plugin
- // handles.
--char*
-+const char*
- NP_GetMIMEDescription ()
- {
- PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
diff --git a/extra/icedtea-web/icedtea-web-1.1.4-npapi-fix.patch b/extra/icedtea-web/icedtea-web-1.1.4-npapi-fix.patch
deleted file mode 100644
index 79ca0a6c0..000000000
--- a/extra/icedtea-web/icedtea-web-1.1.4-npapi-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav ./plugin/icedteanp/IcedTeaNPPlugin.cc
---- ./plugin/icedteanp/IcedTeaNPPlugin.cc.sav 2011-11-08 17:27:29.046520865 -0500
-+++ ./plugin/icedteanp/IcedTeaNPPlugin.cc 2011-11-08 17:27:40.469611421 -0500
-@@ -2262,7 +2262,7 @@ NP_Initialize (NPNetscapeFuncs* browserT
-
- // Returns a string describing the MIME type that this plugin
- // handles.
--char*
-+const char*
- NP_GetMIMEDescription ()
- {
- PLUGIN_DEBUG ("NP_GetMIMEDescription\n");
diff --git a/extra/kdebase-workspace/kdm-zsh-profile.patch b/extra/kdebase-workspace/kdm-zsh-profile.patch
deleted file mode 100644
index 779456b39..000000000
--- a/extra/kdebase-workspace/kdm-zsh-profile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- " zhome=${ZDOTDIR:-$HOME}\n"
- " # zshenv is always sourced automatically.\n"
--" [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+" [ -f /etc/profile ] && . /etc/profile\n"
- " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- " [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
diff --git a/extra/kile/PKGBUILD b/extra/kile/PKGBUILD
deleted file mode 100644
index fb6b5756c..000000000
--- a/extra/kile/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 135613 2011-08-16 16:22:12Z andrea $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Damir Perisa <damir.perisa@bluewin.ch>
-
-pkgname=kile
-pkgver=2.1
-pkgrel=2
-pkgdesc="A user friendly TeX/LaTeX frontend for KDE"
-arch=("i686" "x86_64")
-license=('GPL2')
-url="http://kile.sourceforge.net/"
-depends=('kdebase-runtime' 'texlive-core' 'kdebase-kwrite')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-sha1sums=('860ac96b68b6026f48b8a9c401c6024ba78e3cdf')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/extra/kile/kile.install b/extra/kile/kile.install
deleted file mode 100644
index 9fe93eeac..000000000
--- a/extra/kile/kile.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/extra/libdrm/list.h b/extra/libdrm/list.h
deleted file mode 100644
index 305c903e1..000000000
--- a/extra/libdrm/list.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *
- * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- */
-
-/**
- * \file
- * List macros heavily inspired by the Linux kernel
- * list handling. No list looping yet.
- *
- * Is not threadsafe, so common operations need to
- * be protected using an external mutex.
- */
-#ifndef _U_DOUBLE_LIST_H_
-#define _U_DOUBLE_LIST_H_
-
-#include <stddef.h>
-
-struct list_head
-{
- struct list_head *prev;
- struct list_head *next;
-};
-
-static void list_inithead(struct list_head *item)
-{
- item->prev = item;
- item->next = item;
-}
-
-static void list_add(struct list_head *item, struct list_head *list)
-{
- item->prev = list;
- item->next = list->next;
- list->next->prev = item;
- list->next = item;
-}
-
-static void list_addtail(struct list_head *item, struct list_head *list)
-{
- item->next = list;
- item->prev = list->prev;
- list->prev->next = item;
- list->prev = item;
-}
-
-static void list_replace(struct list_head *from, struct list_head *to)
-{
- to->prev = from->prev;
- to->next = from->next;
- from->next->prev = to;
- from->prev->next = to;
-}
-
-static void list_del(struct list_head *item)
-{
- item->prev->next = item->next;
- item->next->prev = item->prev;
-}
-
-static void list_delinit(struct list_head *item)
-{
- item->prev->next = item->next;
- item->next->prev = item->prev;
- item->next = item;
- item->prev = item;
-}
-
-#define LIST_INITHEAD(__item) list_inithead(__item)
-#define LIST_ADD(__item, __list) list_add(__item, __list)
-#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list)
-#define LIST_REPLACE(__from, __to) list_replace(__from, __to)
-#define LIST_DEL(__item) list_del(__item)
-#define LIST_DELINIT(__item) list_delinit(__item)
-
-#define LIST_ENTRY(__type, __item, __field) \
- ((__type *)(((char *)(__item)) - offsetof(__type, __field)))
-
-#define LIST_IS_EMPTY(__list) \
- ((__list)->next == (__list))
-
-#ifndef container_of
-#define container_of(ptr, sample, member) \
- (void *)((char *)(ptr) \
- - ((char *)&(sample)->member - (char *)(sample)))
-#endif
-
-#define LIST_FOR_EACH_ENTRY(pos, head, member) \
- for (pos = container_of((head)->next, pos, member); \
- &pos->member != (head); \
- pos = container_of(pos->member.next, pos, member))
-
-#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member) \
- for (pos = container_of((head)->next, pos, member), \
- storage = container_of(pos->member.next, pos, member); \
- &pos->member != (head); \
- pos = storage, storage = container_of(storage->member.next, storage, member))
-
-#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member) \
- for (pos = container_of((head)->prev, pos, member), \
- storage = container_of(pos->member.prev, pos, member); \
- &pos->member != (head); \
- pos = storage, storage = container_of(storage->member.prev, storage, member))
-
-#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member) \
- for (pos = container_of((start), pos, member); \
- &pos->member != (head); \
- pos = container_of(pos->member.next, pos, member))
-
-#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member) \
- for (pos = container_of((start), pos, member); \
- &pos->member != (head); \
- pos = container_of(pos->member.prev, pos, member))
-
-#endif /*_U_DOUBLE_LIST_H_*/
diff --git a/extra/libdrm/rbo.h b/extra/libdrm/rbo.h
deleted file mode 100644
index c25c73a4c..000000000
--- a/extra/libdrm/rbo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright © 2011 Red Hat
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Jerome Glisse <j.glisse@gmail.com>
- */
-#ifndef RBO_H
-#define RBO_H
-
-#include "list.h"
-
-struct rbo {
- struct list_head list;
- int fd;
- unsigned refcount;
- unsigned mapcount;
- unsigned handle;
- unsigned size;
- unsigned alignment;
- void *data;
-};
-
-struct rbo *rbo(int fd, unsigned handle, unsigned size,
- unsigned alignment, void *ptr);
-int rbo_map(struct rbo *bo);
-void rbo_unmap(struct rbo *bo);
-struct rbo *rbo_incref(struct rbo *bo);
-struct rbo *rbo_decref(struct rbo *bo);
-int rbo_wait(struct rbo *bo);
-
-#endif
diff --git a/extra/libgsf/libgsf-gnome.install b/extra/libgsf/libgsf-gnome.install
deleted file mode 100644
index 60f62ff35..000000000
--- a/extra/libgsf/libgsf-gnome.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=libgsf-gnome
-
-post_install() {
- usr/sbin/gconfpkg --install ${pkgname}
-}
-
-pre_upgrade() {
- pre_remove $1
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- if [ -f usr/share/gconf/schemas/${pkgname}.schemas ]; then
- usr/sbin/gconfpkg --uninstall ${pkgname}
- fi
-}
diff --git a/extra/llvm/bug-9869-operator-h-c++0x.patch b/extra/llvm/bug-9869-operator-h-c++0x.patch
deleted file mode 100644
index b95d7d772..000000000
--- a/extra/llvm/bug-9869-operator-h-c++0x.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- llvm/trunk/include/llvm/Operator.h 2011/02/07 16:40:21 125006
-+++ llvm/trunk/include/llvm/Operator.h 2011/05/08 01:59:22 131062
-@@ -186,28 +186,46 @@
- };
-
- class AddOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Add> {
-+ ~AddOperator(); // DO NOT IMPLEMENT
-+};
- class SubOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Sub> {
-+ ~SubOperator(); // DO NOT IMPLEMENT
-+};
- class MulOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Mul> {
-+ ~MulOperator(); // DO NOT IMPLEMENT
-+};
- class ShlOperator
-- : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {};
-+ : public ConcreteOperator<OverflowingBinaryOperator, Instruction::Shl> {
-+ ~ShlOperator(); // DO NOT IMPLEMENT
-+};
-
-
- class SDivOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::SDiv> {
-+ ~SDivOperator(); // DO NOT IMPLEMENT
-+};
- class UDivOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::UDiv> {
-+ ~UDivOperator(); // DO NOT IMPLEMENT
-+};
- class AShrOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::AShr> {
-+ ~AShrOperator(); // DO NOT IMPLEMENT
-+};
- class LShrOperator
-- : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {};
-+ : public ConcreteOperator<PossiblyExactOperator, Instruction::LShr> {
-+ ~LShrOperator(); // DO NOT IMPLEMENT
-+};
-
-
-
- class GEPOperator
- : public ConcreteOperator<Operator, Instruction::GetElementPtr> {
-+ ~GEPOperator(); // DO NOT IMPLEMENT
-+
- enum {
- IsInBounds = (1 << 0)
- };
diff --git a/extra/llvm/clang-toolchains-gcc-versions.patch b/extra/llvm/clang-toolchains-gcc-versions.patch
deleted file mode 100644
index 7624842a8..000000000
--- a/extra/llvm/clang-toolchains-gcc-versions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp
---- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200
-+++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300
-@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
- GccTriple = "i586-suse-linux";
- }
-
-- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+ const char* GccVersions[] = {"4.6.2", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
- "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
- "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
- "4.2"};
diff --git a/extra/mediastreamer/disable-v4l1.patch b/extra/mediastreamer/disable-v4l1.patch
deleted file mode 100644
index 9f6cb84d4..000000000
--- a/extra/mediastreamer/disable-v4l1.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.am linphone-3.4.3.my/mediastreamer2/src/Makefile.am
---- linphone-3.4.3/mediastreamer2/src/Makefile.am 2011-02-09 08:43:11.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.am 2011-04-01 14:54:04.000000000 +0000
-@@ -117,7 +117,7 @@
- endif
-
- if BUILD_V4L
--libmediastreamer_la_SOURCES+=msv4l.c msv4l2.c
-+libmediastreamer_la_SOURCES+=msv4l2.c
- endif
-
- if BUILD_WIN32
-diff -wbBur linphone-3.4.3/mediastreamer2/src/Makefile.in linphone-3.4.3.my/mediastreamer2/src/Makefile.in
---- linphone-3.4.3/mediastreamer2/src/Makefile.in 2011-03-28 18:34:07.000000000 +0000
-+++ linphone-3.4.3.my/mediastreamer2/src/Makefile.in 2011-04-01 14:55:00.000000000 +0000
-@@ -54,7 +54,7 @@
- @BUILD_MACAQSND_TRUE@am__append_12 = aqsnd.c
- @BUILD_PULSEAUDIO_TRUE@am__append_13 = pulseaudio.c
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__append_14 = msv4m.m
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l.c msv4l2.c
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__append_15 = msv4l2.c
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__append_16 = msdscap-mingw.cc drawdib-display.c
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__append_17 = theora.c
- @BUILD_FFMPEG_TRUE@@BUILD_VIDEO_TRUE@am__append_18 = videoenc.c \
-@@ -135,7 +135,7 @@
- audiostream.c msspeex.c speexec.c gsm.c winsnd3.c \
- msfileplayer_win.c msfilerec_win.c msfileplayer.c msfilerec.c \
- msresample.c alsa.c oss.c arts.c pasnd.c macsnd.c msiounit.c \
-- aqsnd.c pulseaudio.c msv4m.m msv4l.c msv4l2.c msdscap-mingw.cc \
-+ aqsnd.c pulseaudio.c msv4m.m msv4l2.c msdscap-mingw.cc \
- drawdib-display.c theora.c videoenc.c videodec.c pixconv.c \
- sizeconv.c nowebcam.c nowebcam.h swscale.h ffmpeg-priv.h \
- h264dec.c jpegwriter.c videoout.c x11video.c rfc2429.h \
-@@ -156,7 +156,7 @@
- @BUILD_MACAQSND_TRUE@am__objects_12 = aqsnd.lo
- @BUILD_PULSEAUDIO_TRUE@am__objects_13 = pulseaudio.lo
- @BUILD_MACOSX_TRUE@@BUILD_VIDEO_TRUE@am__objects_14 = msv4m.lo
--@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l.lo msv4l2.lo
-+@BUILD_V4L_TRUE@@BUILD_VIDEO_TRUE@am__objects_15 = msv4l2.lo
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@am__objects_16 = msdscap-mingw.lo \
- @BUILD_VIDEO_TRUE@@BUILD_WIN32_TRUE@ drawdib-display.lo
- @BUILD_THEORA_TRUE@@BUILD_VIDEO_TRUE@am__objects_17 = theora.lo
-@@ -600,7 +600,6 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mssndcard.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msspeex.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msticker.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4l2.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msv4m.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/msvideo.Plo@am__quote@
diff --git a/extra/monodevelop-debugger-mdb/PKGBUILD b/extra/monodevelop-debugger-mdb/PKGBUILD
deleted file mode 100644
index 43a7140c9..000000000
--- a/extra/monodevelop-debugger-mdb/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Daniel Isenmann <daniel@archlinux.org>
-# Contributor: Artyom Smirnov <smirnoffjr@gmail.com>
-
-pkgname=monodevelop-debugger-mdb
-pkgver=2.4
-pkgrel=1
-pkgdesc="Mono Debugger support"
-arch=('i686' 'x86_64')
-url="http://monodevelop.com"
-license=('GPL')
-depends=('monodevelop' 'mono-debugger>=2.6.3')
-makedepends=('mono>=2.6.3')
-source=(http://ftp.novell.com/pub/mono/sources/$pkgname/$pkgname-$pkgver.tar.bz2
- support_mdb_2.4.2.patch)
-
-build() {
- export MONO_SHARED_DIR="${srcdir}/.wabi"
- mkdir -p "${MONO_SHARED_DIR}"
-
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- #patch -p1 <"${srcdir}/support_mdb_2.4.2.patch" || return 1
-
- ./configure --prefix=/usr
- make || return 1
- make DESTDIR="${pkgdir}" install
-}
-
-md5sums=('b2a51036d55fef42f391adf23e6c5c2c'
- '95a4f34728950af4a1040761435a4dbf')
diff --git a/extra/monodevelop-debugger-mdb/support_mdb_2.4.2.patch b/extra/monodevelop-debugger-mdb/support_mdb_2.4.2.patch
deleted file mode 100644
index 164aa8071..000000000
--- a/extra/monodevelop-debugger-mdb/support_mdb_2.4.2.patch
+++ /dev/null
@@ -1,444 +0,0 @@
-
-Index: monodevelop-debugger-mdb/Mono.Debugging.Backend.Mdb/IDebuggerServer.cs
-===================================================================
---- monodevelop-debugger-mdb.orig/Mono.Debugging.Backend.Mdb/IDebuggerServer.cs 2009-07-01 09:23:09.000000000 +0100
-+++ monodevelop-debugger-mdb/Mono.Debugging.Backend.Mdb/IDebuggerServer.cs 2009-07-01 09:25:21.000000000 +0100
-@@ -32,6 +32,8 @@
- {
- public interface IDebuggerServer
- {
-+ string InitializeMdb (string mdbVersion);
-+
- void Run (DebuggerStartInfo startInfo);
-
- void Stop ();
-Index: monodevelop-debugger-mdb/Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs
-===================================================================
---- monodevelop-debugger-mdb.orig/Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs 2009-07-01 09:23:18.000000000 +0100
-+++ monodevelop-debugger-mdb/Mono.Debugging.Backend.Mdb/MonoDebuggerSession.cs 2009-07-01 09:25:21.000000000 +0100
-@@ -37,11 +37,13 @@
- public class MonoDebuggerSession: DebuggerSession
- {
- DebuggerController controller;
-+ static string detectedMdbVersion;
-
- public void StartDebugger ()
- {
- controller = new DebuggerController (this, Frontend);
- controller.StartDebugger ();
-+ InitMdbVersion ();
- }
-
- public override void Dispose ()
-@@ -54,6 +56,12 @@
- {
- controller.DebuggerServer.Run (startInfo);
- }
-+
-+ void InitMdbVersion ()
-+ {
-+ // Cache detected mdb versions, so version detection is done only once
-+ detectedMdbVersion = controller.DebuggerServer.InitializeMdb (detectedMdbVersion);
-+ }
-
- protected override void OnAttachToProcess (int processId)
- {
-Index: monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/DebuggerServer.cs
-===================================================================
---- monodevelop-debugger-mdb.orig/Mono.Debugging.Server.Mdb/DebuggerServer.cs 2009-07-01 09:24:51.000000000 +0100
-+++ monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/DebuggerServer.cs 2009-07-01 09:25:21.000000000 +0100
-@@ -39,6 +39,7 @@
- Dictionary<int, ST.WaitCallback> breakUpdates = new Dictionary<int,ST.WaitCallback> ();
- bool breakUpdateEventsQueued;
-
-+ MdbAdaptor mdbAdaptor;
- AsyncEvaluationTracker asyncEvaluationTracker;
- RuntimeInvokeManager invokeManager;
-
-@@ -51,6 +52,7 @@
- public DebuggerServer (IDebuggerController dc)
- {
- this.controller = dc;
-+
- MarshalByRefObject mbr = (MarshalByRefObject)controller;
- ILease lease = mbr.GetLifetimeService() as ILease;
- lease.Register(this);
-@@ -79,8 +81,18 @@
- }
- }
-
-+ public MdbAdaptor MdbAdaptor {
-+ get { return mdbAdaptor; }
-+ }
-+
- #region IDebugger Members
-
-+ public string InitializeMdb (string mdbVersion)
-+ {
-+ mdbAdaptor = MdbAdaptorFactory.CreateAdaptor (mdbVersion);
-+ return mdbAdaptor.MdbVersion;
-+ }
-+
- public void Run (DL.DebuggerStartInfo startInfo)
- {
- try {
-@@ -91,6 +103,7 @@
-
- DebuggerConfiguration config = new DebuggerConfiguration ();
- config.LoadConfiguration ();
-+ mdbAdaptor.InitializeConfiguration (config);
- debugger = new MD.Debugger (config);
-
- debugger.ModuleLoadedEvent += OnModuleLoadedEvent;
-Index: monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/Makefile
-===================================================================
---- monodevelop-debugger-mdb.orig/Mono.Debugging.Server.Mdb/Makefile 2009-07-01 09:24:35.000000000 +0100
-+++ monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/Makefile 2009-07-01 09:25:21.000000000 +0100
-@@ -59,6 +59,8 @@
- ICollectionAdaptor.cs \
- IndexerValueReference.cs \
- LiteralValueReference.cs \
-+ MdbAdaptor.cs \
-+ MdbAdaptorFactory.cs \
- NamespaceValueReference.cs \
- NRefactoryEvaluator.cs \
- NullValueReference.cs \
-@@ -77,7 +79,9 @@
-
- DATA_FILES =
-
--RESOURCES =
-+RESOURCES = \
-+ MdbAdaptor-2-0.cs \
-+ MdbAdaptor-2-4-2.cs
-
- EXTRAS = \
- ChangeLog
-Index: monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-0.cs 2009-07-01 09:25:21.000000000 +0100
-@@ -0,0 +1,40 @@
-+//
-+// MdbAdaptor_2_0.cs
-+//
-+// Author:
-+// Lluis Sanchez Gual <lluis@novell.com>
-+//
-+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-+//
-+// Permission is hereby granted, free of charge, to any person obtaining a copy
-+// of this software and associated documentation files (the "Software"), to deal
-+// in the Software without restriction, including without limitation the rights
-+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+// copies of the Software, and to permit persons to whom the Software is
-+// furnished to do so, subject to the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be included in
-+// all copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+// THE SOFTWARE.
-+
-+using System;
-+
-+namespace DebuggerServer
-+{
-+ public class MdbAdaptor_2_0: MdbAdaptor
-+ {
-+ public override void AbortThread (Mono.Debugger.Thread thread, Mono.Debugger.RuntimeInvokeResult result)
-+ {
-+ result.Abort ();
-+ result.CompletedEvent.WaitOne ();
-+ thread.AbortInvocation ();
-+ }
-+ }
-+}
-Index: monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/MdbAdaptor-2-4-2.cs 2009-07-01 09:25:21.000000000 +0100
-@@ -0,0 +1,51 @@
-+//
-+// MdbAdaptor22.cs
-+//
-+// Author:
-+// Lluis Sanchez Gual <lluis@novell.com>
-+//
-+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-+//
-+// Permission is hereby granted, free of charge, to any person obtaining a copy
-+// of this software and associated documentation files (the "Software"), to deal
-+// in the Software without restriction, including without limitation the rights
-+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+// copies of the Software, and to permit persons to whom the Software is
-+// furnished to do so, subject to the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be included in
-+// all copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+// THE SOFTWARE.
-+
-+using System;
-+using Mono.Debugger;
-+
-+namespace DebuggerServer
-+{
-+ public class MdbAdaptor_2_4_2: MdbAdaptor
-+ {
-+ public override void SetupXsp (DebuggerConfiguration config)
-+ {
-+ config.SetupXSP ();
-+ config.StopOnManagedSignals = true;
-+ }
-+
-+ public override void InitializeConfiguration (Mono.Debugger.DebuggerConfiguration config)
-+ {
-+ base.InitializeConfiguration (config);
-+ config.RedirectOutput = true;
-+ }
-+
-+ public override void AbortThread (Mono.Debugger.Thread thread, Mono.Debugger.RuntimeInvokeResult result)
-+ {
-+ result.Abort ();
-+ }
-+ }
-+}
-Index: monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/MdbAdaptor.cs
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/MdbAdaptor.cs 2009-07-01 09:25:21.000000000 +0100
-@@ -0,0 +1,62 @@
-+//
-+// MdbAdaptor.cs
-+//
-+// Author:
-+// Lluis Sanchez Gual <lluis@novell.com>
-+//
-+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-+//
-+// Permission is hereby granted, free of charge, to any person obtaining a copy
-+// of this software and associated documentation files (the "Software"), to deal
-+// in the Software without restriction, including without limitation the rights
-+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+// copies of the Software, and to permit persons to whom the Software is
-+// furnished to do so, subject to the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be included in
-+// all copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+// THE SOFTWARE.
-+
-+using System;
-+using MDB=Mono.Debugger;
-+using Mono.Debugging.Backend.Mdb;
-+
-+namespace DebuggerServer
-+{
-+ public abstract class MdbAdaptor
-+ {
-+ public MdbAdaptor ()
-+ {
-+ MdbVersion = "2.0";
-+ }
-+
-+ public string MdbVersion { get; internal set; }
-+
-+ public virtual void SetupXsp (MDB.DebuggerConfiguration config)
-+ {
-+ ThrowNotSupported ("ASP.NET debugging not supported");
-+ }
-+
-+ public virtual void InitializeBreakpoint (MDB.SourceBreakpoint bp)
-+ {
-+ }
-+
-+ public virtual void InitializeConfiguration (MDB.DebuggerConfiguration config)
-+ {
-+ }
-+
-+ public abstract void AbortThread (MDB.Thread thread, MDB.RuntimeInvokeResult result);
-+
-+ public void ThrowNotSupported (string feature)
-+ {
-+ throw new InvalidOperationException (feature + ". You need to install a more recent Mono Debugger version.");
-+ }
-+ }
-+}
-Index: monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/MdbAdaptorFactory.cs 2009-07-01 09:25:21.000000000 +0100
-@@ -0,0 +1,128 @@
-+//
-+// MdbAdaptorFactory.cs
-+//
-+// Author:
-+// Lluis Sanchez Gual <lluis@novell.com>
-+//
-+// Copyright (c) 2009 Novell, Inc (http://www.novell.com)
-+//
-+// Permission is hereby granted, free of charge, to any person obtaining a copy
-+// of this software and associated documentation files (the "Software"), to deal
-+// in the Software without restriction, including without limitation the rights
-+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+// copies of the Software, and to permit persons to whom the Software is
-+// furnished to do so, subject to the following conditions:
-+//
-+// The above copyright notice and this permission notice shall be included in
-+// all copies or substantial portions of the Software.
-+//
-+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-+// THE SOFTWARE.
-+
-+using System;
-+using System.Reflection;
-+using System.Diagnostics;
-+using System.IO;
-+
-+namespace DebuggerServer
-+{
-+ public static class MdbAdaptorFactory
-+ {
-+ // Bump this version number if any change is in MdbAdaptor or subclases
-+ const int ApiVersion = 2;
-+
-+ static readonly string[] supportedVersions = new string[] {"2-4-2", "2-0"};
-+
-+ public static MdbAdaptor CreateAdaptor (string mdbVersion)
-+ {
-+ ProcessStartInfo pinfo = new ProcessStartInfo ();
-+ pinfo.FileName = "gmcs";
-+
-+ if (mdbVersion != null) {
-+ MdbAdaptor mdb = TryCreateAdaptor (pinfo, mdbVersion);
-+ if (mdb == null)
-+ throw new InvalidOperationException ("Unsupported MDB version");
-+ return mdb;
-+ }
-+
-+ foreach (string v in supportedVersions) {
-+ MdbAdaptor mdb = TryCreateAdaptor (pinfo, v);
-+ if (mdb != null)
-+ return mdb;
-+ }
-+ throw new InvalidOperationException ("Unsupported MDB version");
-+ }
-+
-+ static MdbAdaptor TryCreateAdaptor (ProcessStartInfo pinfo, string versions)
-+ {
-+ string[] versionsArray = versions.Split ('|');
-+ string version = versionsArray [0];
-+
-+ string tmpPath = Path.GetTempPath ();
-+ tmpPath = Path.Combine (tmpPath, "monodevelop-debugger-mdb");
-+ if (!Directory.Exists (tmpPath))
-+ Directory.CreateDirectory (tmpPath);
-+
-+ string outFile = Path.Combine (tmpPath, "adaptor-" + ApiVersion + "--" + version + ".dll");
-+
-+ string[] refAssemblies = new string [] {
-+ typeof(MdbAdaptorFactory).Assembly.Location,
-+ typeof(Mono.Debugger.Debugger).Assembly.Location,
-+ typeof(Mono.Debugging.Client.DebuggerSession).Assembly.Location,
-+ typeof(Mono.Debugging.Backend.Mdb.IDebuggerServer).Assembly.Location
-+ };
-+
-+ DateTime refsTime = DateTime.MinValue;
-+ foreach (string rasm in refAssemblies) {
-+ DateTime t = File.GetLastWriteTime (rasm);
-+ if (t > refsTime)
-+ refsTime = t;
-+ }
-+
-+ if (!File.Exists (outFile) || File.GetLastWriteTime (outFile) < refsTime) {
-+ string args = "/t:library ";
-+ args += "\"/out:" + outFile + "\" ";
-+ foreach (string rasm in refAssemblies)
-+ args += "\"/r:" + rasm + "\" ";
-+
-+ // Write the source code for all required classes
-+ foreach (string ver in versionsArray) {
-+ Stream s = typeof(MdbAdaptorFactory).Assembly.GetManifestResourceStream ("MdbAdaptor-" + ver + ".cs");
-+ StreamReader sr = new StreamReader (s);
-+ string txt = sr.ReadToEnd ();
-+ sr.Close ();
-+ s.Close ();
-+
-+ string csfile = Path.Combine (tmpPath, "adaptor-" + ver + ".cs");
-+ File.WriteAllText (csfile, txt);
-+ args += "\"" + csfile + "\" ";
-+ }
-+
-+ pinfo.Arguments = args;
-+ Process proc = Process.Start (pinfo);
-+ proc.WaitForExit ();
-+ if (proc.ExitCode != 0)
-+ return null;
-+ Console.WriteLine ("Generated: " + outFile);
-+ }
-+
-+ Assembly asm = Assembly.LoadFrom (outFile);
-+ Type at = asm.GetType ("DebuggerServer.MdbAdaptor_" + version.Replace ('-','_'));
-+ if (at != null) {
-+ try {
-+ MdbAdaptor a = (MdbAdaptor) Activator.CreateInstance (at);
-+ a.MdbVersion = version;
-+ return a;
-+ } catch {
-+ // MDB version not really supported
-+ }
-+ }
-+ return null;
-+ }
-+ }
-+}
-Index: monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs
-===================================================================
---- monodevelop-debugger-mdb.orig/Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs 2009-07-01 09:24:00.000000000 +0100
-+++ monodevelop-debugger-mdb/Mono.Debugging.Server.Mdb/RuntimeInvokeManager.cs 2009-07-01 09:25:21.000000000 +0100
-@@ -52,9 +52,7 @@
- lock (operationsToCancel) {
- if (!aborted) {
- aborted = true;
-- res.Abort ();
-- res.CompletedEvent.WaitOne ();
-- ctx.Thread.AbortInvocation ();
-+ Server.Instance.MdbAdaptor.AbortThread (ctx.Thread, res);
- WaitToStop (ctx.Thread);
- }
- }
-@@ -73,9 +71,7 @@
- }
- else
- aborted = true;
-- res.Abort ();
-- res.CompletedEvent.WaitOne ();
-- ctx.Thread.AbortInvocation ();
-+ Server.Instance.MdbAdaptor.AbortThread (ctx.Thread, res);
- WaitToStop (ctx.Thread);
- throw new TimeOutException ();
- }
-
diff --git a/extra/nss/distrust-diginotar.patch b/extra/nss/distrust-diginotar.patch
deleted file mode 100644
index 60c63fc68..000000000
--- a/extra/nss/distrust-diginotar.patch
+++ /dev/null
@@ -1,1675 +0,0 @@
-Index: security/nss/lib/ckfw/builtins/certdata.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.c,v
-retrieving revision 1.67.2.10
-retrieving revision 1.67.2.11
-diff -u -r1.67.2.10 -r1.67.2.11
---- security/nss/lib/ckfw/builtins/certdata.c 1 Aug 2011 06:40:03 -0000 1.67.2.10
-+++ security/nss/lib/ckfw/builtins/certdata.c 30 Aug 2011 20:04:39 -0000 1.67.2.11
-@@ -35,7 +35,7 @@
- *
- * ***** END LICENSE BLOCK ***** */
- #ifdef DEBUG
--static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $";
-+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $";
- #endif /* DEBUG */
-
- #ifndef BUILTINS_H
-@@ -1039,12 +1039,6 @@
- static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = {
- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
- };
--static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = {
-- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
--};
--static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = {
-- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
--};
- #ifdef DEBUG
- static const NSSItem nss_builtins_items_0 [] = {
- { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-@@ -1053,7 +1047,7 @@
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)"CVS ID", (PRUint32)7 },
- { (void *)"NSS", (PRUint32)4 },
-- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $", (PRUint32)164 }
-+ { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $", (PRUint32)165 }
- };
- #endif /* DEBUG */
- static const NSSItem nss_builtins_items_1 [] = {
-@@ -12506,151 +12500,6 @@
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)"DigiNotar Root CA", (PRUint32)18 },
-- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
--"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
--"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
--"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
--"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
--"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
--"\154"
--, (PRUint32)97 },
-- { (void *)"0", (PRUint32)2 },
-- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
--"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
--"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
--"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
--"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
--"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
--"\154"
--, (PRUint32)97 },
-- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
--"\074\114"
--, (PRUint32)18 },
-- { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014"
--"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060"
--"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137"
--"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060"
--"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141"
--"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151"
--"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060"
--"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156"
--"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060"
--"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132"
--"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060"
--"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022"
--"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164"
--"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147"
--"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040"
--"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151"
--"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154"
--"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
--"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
--"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126"
--"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201"
--"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300"
--"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177"
--"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330"
--"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213"
--"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337"
--"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045"
--"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123"
--"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007"
--"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043"
--"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042"
--"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041"
--"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324"
--"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313"
--"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110"
--"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114"
--"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376"
--"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344"
--"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357"
--"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346"
--"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314"
--"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351"
--"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154"
--"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262"
--"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042"
--"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077"
--"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102"
--"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323"
--"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176"
--"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147"
--"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216"
--"\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035"
--"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125"
--"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125"
--"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153"
--"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206"
--"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002"
--"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004"
--"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257"
--"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362"
--"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203"
--"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302"
--"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150"
--"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307"
--"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050"
--"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350"
--"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013"
--"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075"
--"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114"
--"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313"
--"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273"
--"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235"
--"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146"
--"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160"
--"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007"
--"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351"
--"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134"
--"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045"
--"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113"
--"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174"
--"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304"
--"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012"
--"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330"
--"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124"
--"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163"
--"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056"
--"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175"
--"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163"
--"\262\345\214\360\206\231\270\345\305\337\204\301\267\353"
--, (PRUint32)1422 }
--};
--static const NSSItem nss_builtins_items_187 [] = {
-- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)"DigiNotar Root CA", (PRUint32)18 },
-- { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317"
--"\201\147\107\214"
--, (PRUint32)20 },
-- { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230"
--, (PRUint32)16 },
-- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
--"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
--"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
--"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
--"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
--"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
--"\154"
--, (PRUint32)97 },
-- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
--"\074\114"
--, (PRUint32)18 },
-- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
--};
--static const NSSItem nss_builtins_items_188 [] = {
-- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)"Network Solutions Certificate Authority", (PRUint32)40 },
- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
- { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-@@ -12738,7 +12587,7 @@
- "\244\140\114\260\125\240\240\173\127\262"
- , (PRUint32)1002 }
- };
--static const NSSItem nss_builtins_items_189 [] = {
-+static const NSSItem nss_builtins_items_187 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12765,7 +12614,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_190 [] = {
-+static const NSSItem nss_builtins_items_188 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12874,7 +12723,7 @@
- "\333"
- , (PRUint32)1217 }
- };
--static const NSSItem nss_builtins_items_191 [] = {
-+static const NSSItem nss_builtins_items_189 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12902,7 +12751,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_192 [] = {
-+static const NSSItem nss_builtins_items_190 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12976,7 +12825,7 @@
- "\334\335\363\377\035\054\072\026\127\331\222\071\326"
- , (PRUint32)653 }
- };
--static const NSSItem nss_builtins_items_193 [] = {
-+static const NSSItem nss_builtins_items_191 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13005,7 +12854,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_194 [] = {
-+static const NSSItem nss_builtins_items_192 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13097,7 +12946,7 @@
- "\321\236\164\310\166\147"
- , (PRUint32)1078 }
- };
--static const NSSItem nss_builtins_items_195 [] = {
-+static const NSSItem nss_builtins_items_193 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13122,7 +12971,7 @@
- { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_196 [] = {
-+static const NSSItem nss_builtins_items_194 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13219,7 +13068,7 @@
- "\253\205\322\140\126\132"
- , (PRUint32)1030 }
- };
--static const NSSItem nss_builtins_items_197 [] = {
-+static const NSSItem nss_builtins_items_195 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13247,7 +13096,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_198 [] = {
-+static const NSSItem nss_builtins_items_196 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13332,7 +13181,7 @@
- "\164"
- , (PRUint32)897 }
- };
--static const NSSItem nss_builtins_items_199 [] = {
-+static const NSSItem nss_builtins_items_197 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13358,7 +13207,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_200 [] = {
-+static const NSSItem nss_builtins_items_198 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13455,7 +13304,7 @@
- "\374\276\337\012\015"
- , (PRUint32)1013 }
- };
--static const NSSItem nss_builtins_items_201 [] = {
-+static const NSSItem nss_builtins_items_199 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13484,7 +13333,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_202 [] = {
-+static const NSSItem nss_builtins_items_200 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13595,7 +13444,7 @@
- "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224"
- , (PRUint32)1151 }
- };
--static const NSSItem nss_builtins_items_203 [] = {
-+static const NSSItem nss_builtins_items_201 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13627,7 +13476,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_204 [] = {
-+static const NSSItem nss_builtins_items_202 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13781,7 +13630,7 @@
- "\103\307\003\340\067\116\135\012\334\131\040\045"
- , (PRUint32)1964 }
- };
--static const NSSItem nss_builtins_items_205 [] = {
-+static const NSSItem nss_builtins_items_203 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13809,7 +13658,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_206 [] = {
-+static const NSSItem nss_builtins_items_204 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13890,7 +13739,7 @@
- "\300\226\130\057\352\273\106\327\273\344\331\056"
- , (PRUint32)940 }
- };
--static const NSSItem nss_builtins_items_207 [] = {
-+static const NSSItem nss_builtins_items_205 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13913,7 +13762,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_208 [] = {
-+static const NSSItem nss_builtins_items_206 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14047,7 +13896,7 @@
- "\005\211\374\170\326\134\054\046\103\251"
- , (PRUint32)1642 }
- };
--static const NSSItem nss_builtins_items_209 [] = {
-+static const NSSItem nss_builtins_items_207 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14075,7 +13924,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_210 [] = {
-+static const NSSItem nss_builtins_items_208 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14180,7 +14029,7 @@
- "\334\144\047\027\214\132\267\332\164\050\315\227\344\275"
- , (PRUint32)1198 }
- };
--static const NSSItem nss_builtins_items_211 [] = {
-+static const NSSItem nss_builtins_items_209 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14207,7 +14056,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_212 [] = {
-+static const NSSItem nss_builtins_items_210 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14312,7 +14161,7 @@
- "\016\121\075\157\373\226\126\200\342\066\027\321\334\344"
- , (PRUint32)1198 }
- };
--static const NSSItem nss_builtins_items_213 [] = {
-+static const NSSItem nss_builtins_items_211 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14339,7 +14188,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_214 [] = {
-+static const NSSItem nss_builtins_items_212 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14432,7 +14281,7 @@
- "\230"
- , (PRUint32)993 }
- };
--static const NSSItem nss_builtins_items_215 [] = {
-+static const NSSItem nss_builtins_items_213 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14459,7 +14308,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_216 [] = {
-+static const NSSItem nss_builtins_items_214 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14548,7 +14397,7 @@
- "\126\144\127"
- , (PRUint32)931 }
- };
--static const NSSItem nss_builtins_items_217 [] = {
-+static const NSSItem nss_builtins_items_215 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14575,7 +14424,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_218 [] = {
-+static const NSSItem nss_builtins_items_216 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14656,7 +14505,7 @@
- "\000\147\240\161\000\202\110"
- , (PRUint32)919 }
- };
--static const NSSItem nss_builtins_items_219 [] = {
-+static const NSSItem nss_builtins_items_217 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14680,7 +14529,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_220 [] = {
-+static const NSSItem nss_builtins_items_218 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14762,7 +14611,7 @@
- "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217"
- , (PRUint32)943 }
- };
--static const NSSItem nss_builtins_items_221 [] = {
-+static const NSSItem nss_builtins_items_219 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14786,7 +14635,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_222 [] = {
-+static const NSSItem nss_builtins_items_220 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14867,7 +14716,7 @@
- "\246\210\070\316\125"
- , (PRUint32)933 }
- };
--static const NSSItem nss_builtins_items_223 [] = {
-+static const NSSItem nss_builtins_items_221 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14890,7 +14739,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_224 [] = {
-+static const NSSItem nss_builtins_items_222 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15009,7 +14858,7 @@
- "\201\370\021\234"
- , (PRUint32)1460 }
- };
--static const NSSItem nss_builtins_items_225 [] = {
-+static const NSSItem nss_builtins_items_223 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15035,7 +14884,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_226 [] = {
-+static const NSSItem nss_builtins_items_224 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15169,7 +15018,7 @@
- "\311\234\220\332\354\251\102\074\255\266\002"
- , (PRUint32)1307 }
- };
--static const NSSItem nss_builtins_items_227 [] = {
-+static const NSSItem nss_builtins_items_225 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15207,7 +15056,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_228 [] = {
-+static const NSSItem nss_builtins_items_226 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15285,7 +15134,7 @@
- "\366\324\357\277\114\210\150"
- , (PRUint32)855 }
- };
--static const NSSItem nss_builtins_items_229 [] = {
-+static const NSSItem nss_builtins_items_227 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15309,7 +15158,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_230 [] = {
-+static const NSSItem nss_builtins_items_228 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15387,7 +15236,7 @@
- "\246\347\313\100\003\335\171"
- , (PRUint32)855 }
- };
--static const NSSItem nss_builtins_items_231 [] = {
-+static const NSSItem nss_builtins_items_229 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15411,7 +15260,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_232 [] = {
-+static const NSSItem nss_builtins_items_230 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15538,7 +15387,7 @@
- "\320\352\111\242\034\215\122\024\246\012\223"
- , (PRUint32)1515 }
- };
--static const NSSItem nss_builtins_items_233 [] = {
-+static const NSSItem nss_builtins_items_231 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15566,7 +15415,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_234 [] = {
-+static const NSSItem nss_builtins_items_232 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15640,7 +15489,7 @@
- "\366\356\260\132\116\111\104\124\130\137\102\203"
- , (PRUint32)828 }
- };
--static const NSSItem nss_builtins_items_235 [] = {
-+static const NSSItem nss_builtins_items_233 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15663,7 +15512,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_236 [] = {
-+static const NSSItem nss_builtins_items_234 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15739,7 +15588,7 @@
- "\011\333\212\101\202\236\146\233\021"
- , (PRUint32)857 }
- };
--static const NSSItem nss_builtins_items_237 [] = {
-+static const NSSItem nss_builtins_items_235 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15762,7 +15611,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_238 [] = {
-+static const NSSItem nss_builtins_items_236 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15845,7 +15694,7 @@
- "\262\033\211\124"
- , (PRUint32)932 }
- };
--static const NSSItem nss_builtins_items_239 [] = {
-+static const NSSItem nss_builtins_items_237 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15869,7 +15718,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_240 [] = {
-+static const NSSItem nss_builtins_items_238 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15969,7 +15818,7 @@
- "\021\055"
- , (PRUint32)1026 }
- };
--static const NSSItem nss_builtins_items_241 [] = {
-+static const NSSItem nss_builtins_items_239 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15999,7 +15848,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_242 [] = {
-+static const NSSItem nss_builtins_items_240 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16073,7 +15922,7 @@
- "\367\130\077\056\162\002\127\243\217\241\024\056"
- , (PRUint32)652 }
- };
--static const NSSItem nss_builtins_items_243 [] = {
-+static const NSSItem nss_builtins_items_241 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16102,7 +15951,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_244 [] = {
-+static const NSSItem nss_builtins_items_242 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16208,7 +16057,7 @@
- "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
- , (PRUint32)1070 }
- };
--static const NSSItem nss_builtins_items_245 [] = {
-+static const NSSItem nss_builtins_items_243 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16240,7 +16089,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_246 [] = {
-+static const NSSItem nss_builtins_items_244 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16319,7 +16168,7 @@
- "\017\212"
- , (PRUint32)690 }
- };
--static const NSSItem nss_builtins_items_247 [] = {
-+static const NSSItem nss_builtins_items_245 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16349,7 +16198,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_248 [] = {
-+static const NSSItem nss_builtins_items_246 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16464,7 +16313,7 @@
- "\354\315\202\141\361\070\346\117\227\230\052\132\215"
- , (PRUint32)1213 }
- };
--static const NSSItem nss_builtins_items_249 [] = {
-+static const NSSItem nss_builtins_items_247 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16496,7 +16345,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_250 [] = {
-+static const NSSItem nss_builtins_items_248 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16594,7 +16443,7 @@
- "\055\247\330\206\052\335\056\020"
- , (PRUint32)904 }
- };
--static const NSSItem nss_builtins_items_251 [] = {
-+static const NSSItem nss_builtins_items_249 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16627,7 +16476,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_252 [] = {
-+static const NSSItem nss_builtins_items_250 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16729,7 +16578,7 @@
- "\330\316\304\143\165\077\131\107\261"
- , (PRUint32)1049 }
- };
--static const NSSItem nss_builtins_items_253 [] = {
-+static const NSSItem nss_builtins_items_251 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16759,7 +16608,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_254 [] = {
-+static const NSSItem nss_builtins_items_252 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16878,7 +16727,7 @@
- "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
- , (PRUint32)1486 }
- };
--static const NSSItem nss_builtins_items_255 [] = {
-+static const NSSItem nss_builtins_items_253 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16903,7 +16752,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_256 [] = {
-+static const NSSItem nss_builtins_items_254 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16993,7 +16842,7 @@
- "\315\345\250"
- , (PRUint32)1043 }
- };
--static const NSSItem nss_builtins_items_257 [] = {
-+static const NSSItem nss_builtins_items_255 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17017,7 +16866,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_258 [] = {
-+static const NSSItem nss_builtins_items_256 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17122,7 +16971,7 @@
- "\115\273\306\104\333\066\313\052\234\216"
- , (PRUint32)1258 }
- };
--static const NSSItem nss_builtins_items_259 [] = {
-+static const NSSItem nss_builtins_items_257 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17147,7 +16996,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_260 [] = {
-+static const NSSItem nss_builtins_items_258 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17223,7 +17072,7 @@
- "\002\153\331\132"
- , (PRUint32)820 }
- };
--static const NSSItem nss_builtins_items_261 [] = {
-+static const NSSItem nss_builtins_items_259 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17247,7 +17096,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_262 [] = {
-+static const NSSItem nss_builtins_items_260 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17329,7 +17178,7 @@
- "\362"
- , (PRUint32)881 }
- };
--static const NSSItem nss_builtins_items_263 [] = {
-+static const NSSItem nss_builtins_items_261 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17354,7 +17203,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_264 [] = {
-+static const NSSItem nss_builtins_items_262 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17470,7 +17319,7 @@
- "\113\076\053\070\007\125\230\136\244"
- , (PRUint32)1465 }
- };
--static const NSSItem nss_builtins_items_265 [] = {
-+static const NSSItem nss_builtins_items_263 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17494,7 +17343,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_266 [] = {
-+static const NSSItem nss_builtins_items_264 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17559,7 +17408,7 @@
- "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133"
- , (PRUint32)576 }
- };
--static const NSSItem nss_builtins_items_267 [] = {
-+static const NSSItem nss_builtins_items_265 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17586,7 +17435,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_268 [] = {
-+static const NSSItem nss_builtins_items_266 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17651,7 +17500,7 @@
- "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220"
- , (PRUint32)576 }
- };
--static const NSSItem nss_builtins_items_269 [] = {
-+static const NSSItem nss_builtins_items_267 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17678,7 +17527,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_270 [] = {
-+static const NSSItem nss_builtins_items_268 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17775,7 +17624,7 @@
- "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
- , (PRUint32)1038 }
- };
--static const NSSItem nss_builtins_items_271 [] = {
-+static const NSSItem nss_builtins_items_269 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17803,7 +17652,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_272 [] = {
-+static const NSSItem nss_builtins_items_270 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17894,7 +17743,7 @@
- "\336\102\343\055\202\361\017\345\372\227"
- , (PRUint32)954 }
- };
--static const NSSItem nss_builtins_items_273 [] = {
-+static const NSSItem nss_builtins_items_271 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17922,7 +17771,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_274 [] = {
-+static const NSSItem nss_builtins_items_272 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18001,7 +17850,7 @@
- "\130\077\137"
- , (PRUint32)867 }
- };
--static const NSSItem nss_builtins_items_275 [] = {
-+static const NSSItem nss_builtins_items_273 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18025,7 +17874,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_276 [] = {
-+static const NSSItem nss_builtins_items_274 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18118,7 +17967,7 @@
- "\045\361\224\264\146"
- , (PRUint32)997 }
- };
--static const NSSItem nss_builtins_items_277 [] = {
-+static const NSSItem nss_builtins_items_275 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18145,7 +17994,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_278 [] = {
-+static const NSSItem nss_builtins_items_276 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18269,7 +18118,7 @@
- "\156\117\022\176\012\074\235\225"
- , (PRUint32)1560 }
- };
--static const NSSItem nss_builtins_items_279 [] = {
-+static const NSSItem nss_builtins_items_277 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18294,7 +18143,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_280 [] = {
-+static const NSSItem nss_builtins_items_278 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18413,7 +18262,7 @@
- "\333\374\046\210\307"
- , (PRUint32)1525 }
- };
--static const NSSItem nss_builtins_items_281 [] = {
-+static const NSSItem nss_builtins_items_279 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18437,7 +18286,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_282 [] = {
-+static const NSSItem nss_builtins_items_280 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18593,7 +18442,7 @@
- "\167\110\320"
- , (PRUint32)1875 }
- };
--static const NSSItem nss_builtins_items_283 [] = {
-+static const NSSItem nss_builtins_items_281 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18624,7 +18473,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_284 [] = {
-+static const NSSItem nss_builtins_items_282 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18777,7 +18626,7 @@
- "\351\233\256\325\124\300\164\200\321\013\102\237\301"
- , (PRUint32)1869 }
- };
--static const NSSItem nss_builtins_items_285 [] = {
-+static const NSSItem nss_builtins_items_283 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18807,7 +18656,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_286 [] = {
-+static const NSSItem nss_builtins_items_284 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18943,7 +18792,7 @@
- "\242\355\264\324\265\145\103\267\223\106\212\323"
- , (PRUint32)1532 }
- };
--static const NSSItem nss_builtins_items_287 [] = {
-+static const NSSItem nss_builtins_items_285 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18973,7 +18822,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_288 [] = {
-+static const NSSItem nss_builtins_items_286 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19124,7 +18973,7 @@
- "\264"
- , (PRUint32)1761 }
- };
--static const NSSItem nss_builtins_items_289 [] = {
-+static const NSSItem nss_builtins_items_287 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19154,7 +19003,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_290 [] = {
-+static const NSSItem nss_builtins_items_288 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19290,7 +19139,7 @@
- "\111\043"
- , (PRUint32)1522 }
- };
--static const NSSItem nss_builtins_items_291 [] = {
-+static const NSSItem nss_builtins_items_289 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19320,7 +19169,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_292 [] = {
-+static const NSSItem nss_builtins_items_290 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19455,7 +19304,7 @@
- "\172\244\047\023\326\117\364\151"
- , (PRUint32)1512 }
- };
--static const NSSItem nss_builtins_items_293 [] = {
-+static const NSSItem nss_builtins_items_291 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19485,7 +19334,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_294 [] = {
-+static const NSSItem nss_builtins_items_292 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19621,7 +19470,7 @@
- "\302\021\254"
- , (PRUint32)1523 }
- };
--static const NSSItem nss_builtins_items_295 [] = {
-+static const NSSItem nss_builtins_items_293 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19651,7 +19500,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_296 [] = {
-+static const NSSItem nss_builtins_items_294 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19787,7 +19636,7 @@
- "\147\024\060"
- , (PRUint32)1523 }
- };
--static const NSSItem nss_builtins_items_297 [] = {
-+static const NSSItem nss_builtins_items_295 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19817,7 +19666,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_298 [] = {
-+static const NSSItem nss_builtins_items_296 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19951,7 +19800,7 @@
- "\217\116\235\306\066\347\134\246\253\022\017\326\317"
- , (PRUint32)1501 }
- };
--static const NSSItem nss_builtins_items_299 [] = {
-+static const NSSItem nss_builtins_items_297 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19981,7 +19830,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_300 [] = {
-+static const NSSItem nss_builtins_items_298 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20115,7 +19964,7 @@
- "\130\113\161\203\237\146\346\254\171\110\376\376\107"
- , (PRUint32)1501 }
- };
--static const NSSItem nss_builtins_items_301 [] = {
-+static const NSSItem nss_builtins_items_299 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20145,7 +19994,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_302 [] = {
-+static const NSSItem nss_builtins_items_300 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20280,7 +20129,7 @@
- "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352"
- , (PRUint32)1520 }
- };
--static const NSSItem nss_builtins_items_303 [] = {
-+static const NSSItem nss_builtins_items_301 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20310,7 +20159,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_304 [] = {
-+static const NSSItem nss_builtins_items_302 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20438,7 +20287,7 @@
- "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221"
- , (PRUint32)1392 }
- };
--static const NSSItem nss_builtins_items_305 [] = {
-+static const NSSItem nss_builtins_items_303 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20468,7 +20317,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_306 [] = {
-+static const NSSItem nss_builtins_items_304 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20561,7 +20410,7 @@
- "\342\342\104\276\134\367\352\034\365"
- , (PRUint32)969 }
- };
--static const NSSItem nss_builtins_items_307 [] = {
-+static const NSSItem nss_builtins_items_305 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20589,7 +20438,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_308 [] = {
-+static const NSSItem nss_builtins_items_306 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20686,7 +20535,7 @@
- "\364"
- , (PRUint32)993 }
- };
--static const NSSItem nss_builtins_items_309 [] = {
-+static const NSSItem nss_builtins_items_307 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20715,7 +20564,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_310 [] = {
-+static const NSSItem nss_builtins_items_308 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20813,7 +20662,7 @@
- "\261\050\272"
- , (PRUint32)1011 }
- };
--static const NSSItem nss_builtins_items_311 [] = {
-+static const NSSItem nss_builtins_items_309 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20842,7 +20691,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_312 [] = {
-+static const NSSItem nss_builtins_items_310 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20919,7 +20768,7 @@
- "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357"
- , (PRUint32)848 }
- };
--static const NSSItem nss_builtins_items_313 [] = {
-+static const NSSItem nss_builtins_items_311 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20943,7 +20792,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_314 [] = {
-+static const NSSItem nss_builtins_items_312 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21020,7 +20869,7 @@
- "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333"
- , (PRUint32)848 }
- };
--static const NSSItem nss_builtins_items_315 [] = {
-+static const NSSItem nss_builtins_items_313 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21044,7 +20893,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_316 [] = {
-+static const NSSItem nss_builtins_items_314 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21153,7 +21002,7 @@
- "\051\340\266\270\011\150\031\034\030\103"
- , (PRUint32)1354 }
- };
--static const NSSItem nss_builtins_items_317 [] = {
-+static const NSSItem nss_builtins_items_315 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21177,7 +21026,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_318 [] = {
-+static const NSSItem nss_builtins_items_316 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21234,7 +21083,7 @@
- "\214\171"
- , (PRUint32)514 }
- };
--static const NSSItem nss_builtins_items_319 [] = {
-+static const NSSItem nss_builtins_items_317 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21258,7 +21107,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_320 [] = {
-+static const NSSItem nss_builtins_items_318 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21348,7 +21197,7 @@
- "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
- , (PRUint32)959 }
- };
--static const NSSItem nss_builtins_items_321 [] = {
-+static const NSSItem nss_builtins_items_319 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21375,7 +21224,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_322 [] = {
-+static const NSSItem nss_builtins_items_320 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21493,7 +21342,7 @@
- "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171"
- , (PRUint32)1440 }
- };
--static const NSSItem nss_builtins_items_323 [] = {
-+static const NSSItem nss_builtins_items_321 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21519,7 +21368,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_324 [] = {
-+static const NSSItem nss_builtins_items_322 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21652,7 +21501,7 @@
- "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303"
- , (PRUint32)1679 }
- };
--static const NSSItem nss_builtins_items_325 [] = {
-+static const NSSItem nss_builtins_items_323 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21678,7 +21527,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_326 [] = {
-+static const NSSItem nss_builtins_items_324 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21772,7 +21621,7 @@
- "\204\232\315"
- , (PRUint32)979 }
- };
--static const NSSItem nss_builtins_items_327 [] = {
-+static const NSSItem nss_builtins_items_325 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21800,7 +21649,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_328 [] = {
-+static const NSSItem nss_builtins_items_326 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21884,7 +21733,7 @@
- "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257"
- , (PRUint32)895 }
- };
--static const NSSItem nss_builtins_items_329 [] = {
-+static const NSSItem nss_builtins_items_327 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -22242,13 +22091,11 @@
- { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
- { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} },
- { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} },
-- { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} },
-- { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} },
-- { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} }
-+ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }
- };
- const PRUint32
- #ifdef DEBUG
-- nss_builtins_nObjects = 329+1;
-+ nss_builtins_nObjects = 327+1;
- #else
-- nss_builtins_nObjects = 329;
-+ nss_builtins_nObjects = 327;
- #endif /* DEBUG */
-Index: security/nss/lib/ckfw/builtins/certdata.txt
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.txt,v
-retrieving revision 1.64.2.10
-retrieving revision 1.64.2.11
-diff -u -r1.64.2.10 -r1.64.2.11
---- security/nss/lib/ckfw/builtins/certdata.txt 1 Aug 2011 06:40:04 -0000 1.64.2.10
-+++ security/nss/lib/ckfw/builtins/certdata.txt 30 Aug 2011 20:04:39 -0000 1.64.2.11
-@@ -34,7 +34,7 @@
- # the terms of any one of the MPL, the GPL or the LGPL.
- #
- # ***** END LICENSE BLOCK *****
--CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $"
-+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.11 $ $Date: 2011/08/30 20:04:39 $"
-
- #
- # certdata.txt
-@@ -12461,161 +12461,6 @@
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
- #
--# Certificate "DigiNotar Root CA"
--#
--CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
--CKA_TOKEN CK_BBOOL CK_TRUE
--CKA_PRIVATE CK_BBOOL CK_FALSE
--CKA_MODIFIABLE CK_BBOOL CK_FALSE
--CKA_LABEL UTF8 "DigiNotar Root CA"
--CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
--CKA_SUBJECT MULTILINE_OCTAL
--\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
--\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
--\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
--\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
--\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
--\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
--\154
--END
--CKA_ID UTF8 "0"
--CKA_ISSUER MULTILINE_OCTAL
--\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
--\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
--\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
--\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
--\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
--\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
--\154
--END
--CKA_SERIAL_NUMBER MULTILINE_OCTAL
--\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
--\074\114
--END
--CKA_VALUE MULTILINE_OCTAL
--\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014
--\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060
--\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137
--\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060
--\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141
--\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151
--\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060
--\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156
--\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060
--\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132
--\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060
--\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022
--\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164
--\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147
--\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040
--\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151
--\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154
--\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
--\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
--\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126
--\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201
--\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300
--\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177
--\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330
--\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213
--\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337
--\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045
--\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123
--\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007
--\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043
--\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042
--\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041
--\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324
--\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313
--\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110
--\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114
--\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376
--\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344
--\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357
--\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346
--\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314
--\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351
--\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154
--\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262
--\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042
--\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077
--\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102
--\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323
--\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176
--\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147
--\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216
--\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035
--\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125
--\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125
--\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153
--\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206
--\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002
--\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004
--\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257
--\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362
--\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203
--\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302
--\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150
--\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307
--\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050
--\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350
--\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013
--\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075
--\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114
--\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313
--\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273
--\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235
--\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146
--\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160
--\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007
--\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351
--\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134
--\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045
--\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113
--\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174
--\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304
--\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012
--\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330
--\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124
--\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163
--\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056
--\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175
--\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163
--\262\345\214\360\206\231\270\345\305\337\204\301\267\353
--END
--
--# Trust for Certificate "DigiNotar Root CA"
--CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
--CKA_TOKEN CK_BBOOL CK_TRUE
--CKA_PRIVATE CK_BBOOL CK_FALSE
--CKA_MODIFIABLE CK_BBOOL CK_FALSE
--CKA_LABEL UTF8 "DigiNotar Root CA"
--CKA_CERT_SHA1_HASH MULTILINE_OCTAL
--\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317
--\201\147\107\214
--END
--CKA_CERT_MD5_HASH MULTILINE_OCTAL
--\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230
--END
--CKA_ISSUER MULTILINE_OCTAL
--\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
--\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
--\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
--\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
--\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
--\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
--\154
--END
--CKA_SERIAL_NUMBER MULTILINE_OCTAL
--\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
--\074\114
--END
--CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
--CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
--CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
--CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
--
--#
- # Certificate "Network Solutions Certificate Authority"
- #
- CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-Index: security/nss/lib/ckfw/builtins/nssckbi.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h,v
-retrieving revision 1.24.2.5
-retrieving revision 1.24.2.6
-diff -u -r1.24.2.5 -r1.24.2.6
---- security/nss/lib/ckfw/builtins/nssckbi.h 1 Aug 2011 06:40:04 -0000 1.24.2.5
-+++ security/nss/lib/ckfw/builtins/nssckbi.h 30 Aug 2011 20:04:40 -0000 1.24.2.6
-@@ -77,8 +77,8 @@
- * of the comment in the CK_VERSION type definition.
- */
- #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
--#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84
--#define NSS_BUILTINS_LIBRARY_VERSION "1.84"
-+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 85
-+#define NSS_BUILTINS_LIBRARY_VERSION "1.85"
-
- /* These version numbers detail the semantic changes to the ckfw engine. */
- #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff --git a/extra/phonon/libqzeitgeist08.patch b/extra/phonon/libqzeitgeist08.patch
deleted file mode 100644
index 7a99101c4..000000000
--- a/extra/phonon/libqzeitgeist08.patch
+++ /dev/null
@@ -1,150 +0,0 @@
---- phonon-4.5.1/phonon/mediaobject.cpp~ 2011-10-29 13:04:16.499027830 +0000
-+++ phonon-4.5.1/phonon/mediaobject.cpp 2011-10-29 13:09:49.222080364 +0000
-@@ -38,12 +38,12 @@
- #include <QtCore/QUrl>
-
- #ifdef HAVE_QZEITGEIST
--#include <QtZeitgeist/DataModel/Event>
--#include <QtZeitgeist/Interpretation>
--#include <QtZeitgeist/Log>
--#include <QtZeitgeist/Manifestation>
--#include <QtZeitgeist/QtZeitgeist>
--#endif
-+#include <QZeitgeist/DataModel/Event>
-+#include <QZeitgeist/Interpretation>
-+#include <QZeitgeist/Log>
-+#include <QZeitgeist/Manifestation>
-+#include <QZeitgeist/QZeitgeist>
-+#endif
-
- #include "phononnamespace_p.h"
- #include "platform_p.h"
-@@ -330,7 +330,7 @@
- const QString &subject_mimetype)
- {
- #ifdef HAVE_QZEITGEIST
-- QtZeitgeist::DataModel::Subject subject;
-+ QZeitgeist::DataModel::Subject subject;
- QString url = subject_uri.toString();
- QString path = url.left(url.lastIndexOf(QLatin1Char('/')));
- subject.setUri(url);
-@@ -340,20 +340,20 @@
- subject.setOrigin(path);
- subject.setMimeType(subject_mimetype);
-
-- QtZeitgeist::DataModel::SubjectList subjects;
-+ QZeitgeist::DataModel::SubjectList subjects;
- subjects << subject;
-
-- QtZeitgeist::DataModel::Event event;
-+ QZeitgeist::DataModel::Event event;
- event.setTimestamp(subject_timestamp);
- event.setInterpretation(event_interpretation);
- event.setManifestation(event_manifestation);
- event.setActor(event_actor);
- event.setSubjects(subjects);
-
-- QtZeitgeist::DataModel::EventList events;
-+ QZeitgeist::DataModel::EventList events;
- events << event;
-
-- QDBusPendingReply<QtZeitgeist::DataModel::EventIdList> reply =
-+ QDBusPendingReply<QZeitgeist::DataModel::EventIdList> reply =
- log->insertEvents(events);
- #else
- Q_UNUSED(event_interpretation)
-@@ -377,11 +377,11 @@
- QString eventInterpretation;
- switch (eventState) {
- case PlayingState:
-- eventInterpretation = QtZeitgeist::Interpretation::Event::ZGAccessEvent;
-+ eventInterpretation = QZeitgeist::Interpretation::Event::ZGAccessEvent;
- break;
- case ErrorState:
- case StoppedState:
-- eventInterpretation = QtZeitgeist::Interpretation::Event::ZGLeaveEvent;
-+ eventInterpretation = QZeitgeist::Interpretation::Event::ZGLeaveEvent;
- break;
- //These states are not signifigant events.
- case LoadingState:
-@@ -409,10 +409,10 @@
- QString mime;
- QString subjectInterpretation;
- if (q->hasVideo()) {
-- subjectInterpretation = QtZeitgeist::Interpretation::Subject::NFOVideo;
-+ subjectInterpretation = QZeitgeist::Interpretation::Subject::NFOVideo;
- mime = "video/raw";
- } else {
-- subjectInterpretation = QtZeitgeist::Interpretation::Subject::NFOAudio;
-+ subjectInterpretation = QZeitgeist::Interpretation::Subject::NFOAudio;
- mime = "audio/raw";
- }
- pDebug() << "Zeitgeist mime type:" << mime;
-@@ -425,20 +425,20 @@
- case MediaSource::Invalid:
- return;
- case MediaSource::Url:
-- subjectType = QtZeitgeist::Manifestation::Subject::NFORemoteDataObject;
-+ subjectType = QZeitgeist::Manifestation::Subject::NFORemoteDataObject;
- break;
- case MediaSource::CaptureDevice:
- case MediaSource::Disc:
- case MediaSource::Stream:
-- subjectType = QtZeitgeist::Manifestation::Subject::NFOMediaStream;
-+ subjectType = QZeitgeist::Manifestation::Subject::NFOMediaStream;
- break;
- case MediaSource::LocalFile:
-- subjectType = QtZeitgeist::Manifestation::Subject::NFOFileDataObject;
-+ subjectType = QZeitgeist::Manifestation::Subject::NFOFileDataObject;
- break;
- }
-
- sendToZeitgeist(eventInterpretation,
-- QtZeitgeist::Manifestation::Event::ZGUserActivity,
-+ QZeitgeist::Manifestation::Event::ZGUserActivity,
- QLatin1Literal("app://" ) % Platform::applicationName() % QLatin1Literal(".desktop"),
- QDateTime::currentDateTime(),
- mediaSource.url(),
---- phonon-4.5.1/phonon/mediaobject_p.h~ 2011-10-29 13:04:34.982530678 +0000
-+++ phonon-4.5.1/phonon/mediaobject_p.h 2011-10-29 15:27:44.679123431 +0000
-@@ -30,8 +30,8 @@
- #include "mediasource.h"
- #include <QtCore/QQueue>
- #ifdef HAVE_QZEITGEIST
--#include <QtZeitgeist/Log>
--#include <QtZeitgeist/QtZeitgeist>
-+#include <QZeitgeist/Log>
-+#include <QZeitgeist/QZeitgeist>
- #endif
-
- QT_BEGIN_NAMESPACE
-@@ -114,8 +114,7 @@
- #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
- {
- #ifdef HAVE_QZEITGEIST
-- QtZeitgeist::init();
-- log = new QtZeitgeist::Log(qObject());
-+ log = new QZeitgeist::Log(qObject());
- #endif
- }
-
-@@ -142,7 +141,7 @@
- MediaSource mediaSource;
- QQueue<MediaSource> sourceQueue;
- #ifdef HAVE_QZEITGEIST
-- QtZeitgeist::Log *log;
-+ QZeitgeist::Log *log;
- #endif
- };
- }
---- phonon-4.5.1/phonon/CMakeLists.txt~ 2011-10-29 15:30:07.640468718 +0000
-+++ phonon-4.5.1/phonon/CMakeLists.txt 2011-10-29 15:30:26.643980831 +0000
-@@ -21,7 +21,7 @@
- endif(GLIB2_FOUND AND PULSEAUDIO_FOUND)
-
- macro_optional_find_package(QZeitgeist)
--macro_log_feature(QZEITGEIST_FOUND "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE)
-+macro_log_feature(QZEITGEIST_FOUND "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE)
- if (QZEITGEIST_FOUND)
- add_definitions(-DHAVE_QZEITGEIST)
- include_directories(${QZEITGEIST_INCLUDE_DIR})
diff --git a/extra/qt/blacklist-diginotar-certs.diff b/extra/qt/blacklist-diginotar-certs.diff
deleted file mode 100644
index 4a50f3b88..000000000
--- a/extra/qt/blacklist-diginotar-certs.diff
+++ /dev/null
@@ -1,89 +0,0 @@
-diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
-index 328c5c2..1ae98f4 100644
---- a/src/network/ssl/qsslcertificate.cpp
-+++ b/src/network/ssl/qsslcertificate.cpp
-@@ -803,22 +803,47 @@ QList<QSslCertificate> QSslCertificatePrivate::certificatesFromDer(const QByteAr
- // These certificates are known to be fraudulent and were created during the comodo
- // compromise. See http://www.comodo.com/Comodo-Fraud-Incident-2011-03-23.html
- static const char *certificate_blacklist[] = {
-- "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e",
-- "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06",
-- "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3",
-- "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29",
-- "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71",
-- "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47",
-- "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43",
-- "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0",
-- "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0",
-+ "04:7e:cb:e9:fc:a5:5f:7b:d0:9e:ae:36:e1:0c:ae:1e", "mail.google.com", // Comodo
-+ "f5:c8:6a:f3:61:62:f1:3a:64:f5:4f:6d:c9:58:7c:06", "www.google.com", // Comodo
-+ "d7:55:8f:da:f5:f1:10:5b:b2:13:28:2b:70:77:29:a3", "login.yahoo.com", // Comodo
-+ "39:2a:43:4f:0e:07:df:1f:8a:a3:05:de:34:e0:c2:29", "login.yahoo.com", // Comodo
-+ "3e:75:ce:d4:6b:69:30:21:21:88:30:ae:86:a8:2a:71", "login.yahoo.com", // Comodo
-+ "e9:02:8b:95:78:e4:15:dc:1a:71:0a:2b:88:15:44:47", "login.skype.com", // Comodo
-+ "92:39:d5:34:8f:40:d1:69:5a:74:54:70:e1:f2:3f:43", "addons.mozilla.org", // Comodo
-+ "b0:b7:13:3e:d0:96:f9:b5:6f:ae:91:c8:74:bd:3a:c0", "login.live.com", // Comodo
-+ "d8:f3:5f:4e:b7:87:2b:2d:ab:06:92:e3:15:38:2f:b0", "global trustee", // Comodo
-+
-+ "05:e2:e6:a4:cd:09:ea:54:d6:65:b0:75:fe:22:a2:56", "*.google.com", // leaf certificate issued by DigiNotar
-+ "0c:76:da:9c:91:0c:4e:2c:9e:fe:15:d0:58:93:3c:4c", "DigiNotar Root CA", // DigiNotar root
-+ "f1:4a:13:f4:87:2b:56:dc:39:df:84:ca:7a:a1:06:49", "DigiNotar Services CA", // DigiNotar intermediate signed by DigiNotar Root
-+ "36:16:71:55:43:42:1b:9d:e6:cb:a3:64:41:df:24:38", "DigiNotar Services 1024 CA", // DigiNotar intermediate signed by DigiNotar Root
-+ "0a:82:bd:1e:14:4e:88:14:d7:5b:1a:55:27:be:bf:3e", "DigiNotar Root CA G2", // other DigiNotar Root CA
-+ "a4:b6:ce:e3:2e:d3:35:46:26:3c:b3:55:3a:a8:92:21", "CertiID Enterprise Certificate Authority", // DigiNotar intermediate signed by "DigiNotar Root CA G2"
-+ "5b:d5:60:9c:64:17:68:cf:21:0e:35:fd:fb:05:ad:41", "DigiNotar Qualified CA", // DigiNotar intermediate signed by DigiNotar Root
-+
-+ "1184640176", "DigiNotar Services 1024 CA", // DigiNotar intermediate cross-signed by Entrust
-+ "120000525", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+ "120000505", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+ "120000515", "DigiNotar Cyber CA", // DigiNotar intermediate cross-signed by CyberTrust
-+ "20015536", "DigiNotar PKIoverheid CA Overheid en Bedrijven", // DigiNotar intermediate cross-signed by the Dutch government
-+ "20001983", "DigiNotar PKIoverheid CA Organisatie - G2", // DigiNotar intermediate cross-signed by the Dutch government
-+ "d6:d0:29:77:f1:49:fd:1a:83:f2:b9:ea:94:8c:5c:b4", "DigiNotar Extended Validation CA", // DigiNotar intermediate signed by DigiNotar EV Root
-+ "1e:7d:7a:53:3d:45:30:41:96:40:0f:71:48:1f:45:04", "DigiNotar Public CA 2025", // DigiNotar intermediate
-+// "(has not been seen in the wild so far)", "DigiNotar Public CA - G2", // DigiNotar intermediate
-+// "(has not been seen in the wild so far)", "Koninklijke Notariele Beroepsorganisatie CA", // compromised during DigiNotar breach
-+// "(has not been seen in the wild so far)", "Stichting TTP Infos CA," // compromised during DigiNotar breach
-+ "1184640175", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
-+ "1184644297", "DigiNotar Root CA", // DigiNotar intermediate cross-signed by Entrust
- 0
- };
-
- bool QSslCertificatePrivate::isBlacklisted(const QSslCertificate &certificate)
- {
- for (int a = 0; certificate_blacklist[a] != 0; a++) {
-- if (certificate.serialNumber() == certificate_blacklist[a])
-+ QString blacklistedCommonName = QString::fromUtf8(certificate_blacklist[(a+1)]);
-+ if (certificate.serialNumber() == certificate_blacklist[a++] &&
-+ (certificate.subjectInfo(QSslCertificate::CommonName) == blacklistedCommonName ||
-+ certificate.issuerInfo(QSslCertificate::CommonName) == blacklistedCommonName))
- return true;
- }
- return false;
-diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp
-index 141d80a..b8e6c4c 100644
---- a/src/network/ssl/qsslsocket_openssl.cpp
-+++ b/src/network/ssl/qsslsocket_openssl.cpp
-@@ -1193,12 +1193,16 @@ bool QSslSocketBackendPrivate::startHandshake()
- X509 *x509 = q_SSL_get_peer_certificate(ssl);
- configuration.peerCertificate = QSslCertificatePrivate::QSslCertificate_from_X509(x509);
- q_X509_free(x509);
-- if (QSslCertificatePrivate::isBlacklisted(configuration.peerCertificate)) {
-- q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-- q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-- emit q->error(QAbstractSocket::SslHandshakeFailedError);
-- plainSocket->disconnectFromHost();
-- return false;
-+
-+ // check the whole chain for blacklisting (including root, as we check for subjectInfo and issuer)
-+ foreach (const QSslCertificate &cert, configuration.peerCertificateChain) {
-+ if (QSslCertificatePrivate::isBlacklisted(cert)) {
-+ q->setErrorString(QSslSocket::tr("The peer certificate is blacklisted"));
-+ q->setSocketError(QAbstractSocket::SslHandshakeFailedError);
-+ emit q->error(QAbstractSocket::SslHandshakeFailedError);
-+ plainSocket->disconnectFromHost();
-+ return false;
-+ }
- }
-
- // Start translating errors.
diff --git a/extra/qtscriptgenerator/qtscriptgenerator-gcc44.patch b/extra/qtscriptgenerator/qtscriptgenerator-gcc44.patch
deleted file mode 100644
index dbb423e5d..000000000
--- a/extra/qtscriptgenerator/qtscriptgenerator-gcc44.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# Patch from upstream bug tracker:
-# http://code.google.com/p/qtscriptgenerator/issues/detail?id=37
-# So far (2009-06-12) this has not been applied at upstream git repo
-
-diff -uNr generator.orig/parser/rpp/pp.h generator/parser/rpp/pp.h
---- generator.orig/parser/rpp/pp.h 2008-12-05 11:01:44.000000000 +0100
-+++ generator/parser/rpp/pp.h 2008-12-13 10:42:22.000000000 +0100
-@@ -30,6 +30,7 @@
- #include <cctype>
-
- #include <fcntl.h>
-+#include <cstdio>
-
- #ifdef HAVE_MMAP
- # include <sys/mman.h>
diff --git a/extra/smplayer/ChangeLog b/extra/smplayer/ChangeLog
deleted file mode 100644
index e8397b3ec..000000000
--- a/extra/smplayer/ChangeLog
+++ /dev/null
@@ -1,74 +0,0 @@
-2010-02-23 Ionut Biru <ibiru@archlinux.org>
- * smplayer 0.6.9-2
- * changed exec argument from %U to %F in smplayer.desktop
-
-2010-02-22 Ionut Biru <ibiru@archlinux.org>
- * smplayer 0.6.9-1
- * Upstream update
-
-2009-07-25 Allan McRae <allan@archlinux.org>
- * smplayer 0.6.8-1
- * Upstream update
-
-2009-03-13 Allan McRae <allan@archlinux.org>
- * smplayer 0.6.7-1
- * Upstream update
-
-2009-01-01 Allan McRae <allan@archlinux.org>
- * smplayer 0.6.6-1
- * Upstream update
-
-2008-11-14 Allan McRae <allan@archlinux.org>
- * smplayer 0.6.5.1-1
- * Upstream update
-
-2008-10-27 Allan McRae <allan@archlinux.org>
- * smplayer 0.6.4-1
- * Upstream update
-
-2008-09-27 Allan McRae <allan@archlinux.org>
- * smplayer 0.6.3-1
- * Upstream update
-
-2008-06-21 Allan McRae <allan@archlinux.org>
-
- * smplayer 0.6.2-1
- * Upstream update
- * Removed install message
-
-2008-06-21 Allan McRae <allan@archlinux.org>
-
- * smplayer 0.6.1-1
- * Upstream update
- * Removed provides/conflicts/replaces
-
-2008-05-23 Eric Belanger <eric@archlinux.org>
-
- * smplayer 0.6.0-1
- * Upstream update
- * Updated .install file
-
-2008-01-32 Varun Acharya <varun@archlinux.org>
-
- * smplayer-0.5.62-1 moved to extra, thanks molok
- * PKGBUILD cleanup
-
-2007-11-27 Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
- * smplayer-0.5.62-1
- * version bump
-
-2007-10-24 Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
- * smplayer-0.5.61-1
- * build against qt4
- * removed post_upgrade message
-
-2007-07-12 Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-
- * smplayer-0.5.21-1
- * version bump
-
-2007-05-30 Alessio 'mOLOk' Bolognino <themolok@gmail.com>
- * smplayer-0.5.0-1
- * version bump
diff --git a/extra/strigi/libstreamanalyzer_pdf.patch b/extra/strigi/libstreamanalyzer_pdf.patch
deleted file mode 100644
index 6871d67fa..000000000
--- a/extra/strigi/libstreamanalyzer_pdf.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-commit 23d5ce636b7897dc3f233a5293f3164dac50566d
-Author: Jos van den Oever <jos@vandenoever.info>
-Date: Sun Jul 31 12:32:44 2011 +0200
-
- Revert patch that breaks parsing of PDF files.
- The offending patch was 672c8b7b3cb4400bc505421f4cc70cf742ed9df0.
-
-diff --git a/lib/pdf/pdfparser.cpp b/lib/pdf/pdfparser.cpp
-index c27f691..df2f7e5 100644
---- a/lib/pdf/pdfparser.cpp
-+++ b/lib/pdf/pdfparser.cpp
-@@ -34,12 +34,13 @@ StreamStatus
- PdfParser::read(int32_t min, int32_t max) {
- int32_t off = (int32_t)(pos-start);
- int32_t d = (int32_t)(stream->position() - bufferStart);
-- bufferStart += off;
-+ min += d;
-+ if (max > 0) max += d;
- stream->reset(bufferStart);
- int32_t n = stream->read(start, min, max);
- // printf("objstart %i %i\n", d, n);
- if (n < min) return stream->status();
-- pos = start;
-+ pos = start + off;
- end = start + n;
- return Ok;
- }
diff --git a/extra/subversion/subversion-perl-bindings.patch b/extra/subversion/subversion-perl-bindings.patch
deleted file mode 100644
index 3c34daa47..000000000
--- a/extra/subversion/subversion-perl-bindings.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in
---- subversion-1.6.17.ori/subversion/bindings/swig/perl/native/Makefile.PL.in 2010-11-24 20:42:16.000000000 +0000
-+++ subversion-1.6.17/subversion/bindings/swig/perl/native/Makefile.PL.in 2011-07-01 20:16:16.520892074 +0000
-@@ -43,7 +43,7 @@
- my %config = (
- ABSTRACT => 'Perl bindings for Subversion',
- DEFINE => $cppflags,
-- CCFLAGS => $cflags,
-+ CCFLAGS => $Config{ccflags},
- INC => join(' ',$apr_cflags, $apu_cflags,
- " -I$swig_srcdir/perl/libsvn_swig_perl",
- " -I$svnlib_srcdir/include",
diff --git a/extra/subversion/subversion.suppress.deprecation.warnings.patch b/extra/subversion/subversion.suppress.deprecation.warnings.patch
deleted file mode 100644
index 94ce89b18..000000000
--- a/extra/subversion/subversion.suppress.deprecation.warnings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN subversion-1.6.9/subversion/bindings/swig/python/svn/core.py subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py
---- subversion-1.6.9/subversion/bindings/swig/python/svn/core.py 2009-02-13 11:22:26.000000000 -0500
-+++ subversion-1.6.9-fixed/subversion/bindings/swig/python/svn/core.py 2010-02-08 07:46:29.000000000 -0500
-@@ -19,6 +19,7 @@
- from libsvn.core import *
- import libsvn.core as _libsvncore
- import atexit as _atexit
-+import warnings
-
- class SubversionException(Exception):
- def __init__(self, message=None, apr_err=None, child=None,
-@@ -44,7 +45,9 @@
- Exception.__init__(self, *args)
-
- self.apr_err = apr_err
-- self.message = message
-+ with warnings.catch_warnings():
-+ warnings.simplefilter("ignore", DeprecationWarning)
-+ self.message = message
- self.child = child
- self.file = file
- self.line = line
diff --git a/extra/tcpdump/ppi.h b/extra/tcpdump/ppi.h
deleted file mode 100644
index be7f5f02e..000000000
--- a/extra/tcpdump/ppi.h
+++ /dev/null
@@ -1,8 +0,0 @@
-typedef struct ppi_header {
-uint8_t ppi_ver;
-uint8_t ppi_flags;
-uint16_t ppi_len;
-uint32_t ppi_dlt;
-} ppi_header_t;
-
-#define PPI_HDRLEN 8
diff --git a/extra/thunar-media-tags-plugin/0001-Switch-to-the-new-tooltip-api-in-gtk-depend-on-gtk-2.patch b/extra/thunar-media-tags-plugin/0001-Switch-to-the-new-tooltip-api-in-gtk-depend-on-gtk-2.patch
deleted file mode 100644
index 4e613ebb1..000000000
--- a/extra/thunar-media-tags-plugin/0001-Switch-to-the-new-tooltip-api-in-gtk-depend-on-gtk-2.patch
+++ /dev/null
@@ -1,177 +0,0 @@
-From d225ada545e196ebd7833103412f4a013f8a44f1 Mon Sep 17 00:00:00 2001
-From: Lionel Le Folgoc <mrpouit@ubuntu.com>
-Date: Mon, 8 Mar 2010 21:25:12 +0100
-Subject: [PATCH] Switch to the new tooltip api in gtk, depend on gtk 2.12, and switch to exo-1
-
----
- configure.in.in | 3 ++-
- thunar-plugin/audio-tags-page.c | 22 +++++++---------------
- thunar-plugin/tag-renamer.c | 16 +++-------------
- 3 files changed, 12 insertions(+), 29 deletions(-)
-
-diff --git a/configure.in.in b/configure.in.in
-index ed3099b..c345c5c 100644
---- a/configure.in.in
-+++ b/configure.in.in
-@@ -64,7 +64,8 @@ XDT_I18N([@LINGUAS@])
- dnl ***********************************
- dnl *** Check for required packages ***
- dnl ***********************************
--XDT_CHECK_PACKAGE([EXO], [exo-0.3], [0.3.1.3])
-+XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.12.0])
-+XDT_CHECK_PACKAGE([EXO], [exo-1], [0.5.0])
- XDT_CHECK_PACKAGE([THUNARX], [thunarx-2], [1.0.1])
- XDT_CHECK_PACKAGE([TAGLIB], [taglib], [1.4])
-
-diff --git a/thunar-plugin/audio-tags-page.c b/thunar-plugin/audio-tags-page.c
-index 7e5dab5..40b226f 100644
---- a/thunar-plugin/audio-tags-page.c
-+++ b/thunar-plugin/audio-tags-page.c
-@@ -89,7 +89,6 @@ struct _AudioTagsPage
- ThunarxPropertyPage __parent__;
-
- /* Widgets */
-- GtkTooltips *tooltips;
- GtkWidget *table;
- GtkWidget *save_button;
- GtkWidget *info_button;
-@@ -281,10 +280,6 @@ audio_tags_page_init (AudioTagsPage *page)
-
- gtk_container_set_border_width (GTK_CONTAINER (page), 8);
-
-- /* Allocate the shared tooltips */
-- page->tooltips = gtk_tooltips_new ();
-- exo_gtk_object_ref_sink (GTK_OBJECT (page->tooltips));
--
- /* Main container */
- vbox = gtk_vbox_new (FALSE, 8);
- gtk_container_add (GTK_CONTAINER (page), vbox);
-@@ -316,7 +311,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Track spin button */
- spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 0.0, 0);
- exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "track");
-- gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the track number here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the track number here."));
- gtk_container_add (GTK_CONTAINER (alignment), spin);
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
- gtk_widget_show (spin);
-@@ -339,7 +334,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Year spin button */
- spin = gtk_spin_button_new (GTK_ADJUSTMENT (adjustment), 1, 0);
- exo_mutual_binding_new (G_OBJECT (adjustment), "value", G_OBJECT (page), "year");
-- gtk_tooltips_set_tip (page->tooltips, spin, _("Enter the release year here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (spin), _("Enter the release year here."));
- gtk_container_add (GTK_CONTAINER (alignment), spin);
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), spin);
- gtk_widget_show (spin);
-@@ -354,7 +349,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Artist entry */
- entry = gtk_entry_new ();
- exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "artist");
-- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the name of the artist or author of this file here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the name of the artist or author of this file here."));
- gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 1, 2, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- gtk_label_set_mnemonic_widget (GTK_LABEL (label), entry);
- gtk_widget_show (entry);
-@@ -369,7 +364,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Title entry */
- entry = gtk_entry_new ();
- exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "title");
-- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the song title here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the song title here."));
- gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 2, 3, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- gtk_widget_show (entry);
-
-@@ -383,7 +378,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Album entry */
- entry = gtk_entry_new ();
- exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "album");
-- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter the album/record title here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter the album/record title here."));
- gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 3, 4, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- gtk_widget_show (entry);
-
-@@ -397,7 +392,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Comment entry */
- entry = gtk_entry_new ();
- exo_mutual_binding_new (G_OBJECT (entry), "text", G_OBJECT (page), "comment");
-- gtk_tooltips_set_tip (page->tooltips, entry, _("Enter your comments here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (entry), _("Enter your comments here."));
- gtk_table_attach (GTK_TABLE (page->table), entry, 1, 4, 4, 5, GTK_EXPAND | GTK_FILL, 0, 0, 0);
- gtk_widget_show (entry);
-
-@@ -411,7 +406,7 @@ audio_tags_page_init (AudioTagsPage *page)
- /* Genre combo box */
- combo = gtk_combo_box_entry_new_text ();
- exo_mutual_binding_new (G_OBJECT (GTK_BIN (combo)->child), "text", G_OBJECT (page), "genre");
-- gtk_tooltips_set_tip (page->tooltips, combo, _("Select or enter the genre of this song here."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (combo), _("Select or enter the genre of this song here."));
- gtk_table_attach (GTK_TABLE (page->table), combo, 1, 4, 5, 6, GTK_FILL, 0, 0, 0);
- gtk_widget_show (combo);
-
-@@ -511,9 +506,6 @@ audio_tags_page_finalize (GObject *object)
- if (G_LIKELY (page->genre != NULL))
- g_free (page->genre);
-
-- /* Release the tooltips */
-- g_object_unref (G_OBJECT (page->tooltips));
--
- (*G_OBJECT_CLASS (audio_tags_page_parent_class)->finalize) (object);
- }
-
-diff --git a/thunar-plugin/tag-renamer.c b/thunar-plugin/tag-renamer.c
-index acb694e..bdbb17c 100644
---- a/thunar-plugin/tag-renamer.c
-+++ b/thunar-plugin/tag-renamer.c
-@@ -132,9 +132,6 @@ struct _TagRenamer
- {
- ThunarxRenamer __parent__;
-
-- /* Widgets */
-- GtkTooltips *tooltips;
--
- /* Properties */
- TagRenamerFormat format;
- gchar *text;
-@@ -238,10 +235,6 @@ tag_renamer_init (TagRenamer *tag_renamer)
- GtkTreeIter iter;
- gint n;
-
-- /* Allocate shared tooltips */
-- tag_renamer->tooltips = gtk_tooltips_new ();
-- exo_gtk_object_ref_sink (GTK_OBJECT (tag_renamer->tooltips));
--
- table = gtk_table_new (2, 4, FALSE);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_table_set_col_spacings (GTK_TABLE (table), 12);
-@@ -320,14 +313,14 @@ tag_renamer_init (TagRenamer *tag_renamer)
-
- button = gtk_check_button_new_with_mnemonic (_("_Underscores"));
- exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "replace-spaces");
-- gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("Activating this option will replace all spaces in the target filename "
-- "with underscores."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("Activating this option will replace all spaces in the target filename "
-+ "with underscores."));
- gtk_table_attach (GTK_TABLE (table), button, 3, 4, 0, 1, GTK_FILL, 0, 0, 0);
- gtk_widget_show (button);
-
- button = gtk_check_button_new_with_mnemonic (_("_Lowercase"));
- exo_mutual_binding_new (G_OBJECT (button), "active", G_OBJECT (tag_renamer), "lowercase");
-- gtk_tooltips_set_tip (tag_renamer->tooltips, button, _("If you activate this, the resulting filename will only contain lowercase letters."), NULL);
-+ gtk_widget_set_tooltip_text (GTK_WIDGET (button), _("If you activate this, the resulting filename will only contain lowercase letters."));
- gtk_table_attach (GTK_TABLE (table), button, 3, 4, 1, 2, GTK_FILL, 0, 0, 0);
- gtk_widget_show (button);
- }
-@@ -341,9 +334,6 @@ tag_renamer_finalize (GObject *object)
- {
- TagRenamer *tag_renamer = TAG_RENAMER (object);
-
-- /* release the tooltips */
-- g_object_unref (G_OBJECT (tag_renamer->tooltips));
--
- /* Free string */
- g_free (tag_renamer->text);
-
---
-1.6.3.3
-
diff --git a/extra/thunar-media-tags-plugin/04_fix-implicit-dso-linking.patch b/extra/thunar-media-tags-plugin/04_fix-implicit-dso-linking.patch
deleted file mode 100644
index abe4ada18..000000000
--- a/extra/thunar-media-tags-plugin/04_fix-implicit-dso-linking.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- thunar-media-tags-plugin-0.1.2.orig/thunar-plugin/Makefile.am
-+++ thunar-media-tags-plugin-0.1.2/thunar-plugin/Makefile.am
-@@ -32,6 +32,7 @@ thunar_media_tags_plugin_la_LDFLAGS =
- -avoid-version \
- -export-dynamic \
- -module \
-+ $(EXO_LIBS) \
- $(THUNARX_LIBS) \
- $(TAGLIB_LIBS) \
- $(TAGLIBC_LIBS) \
diff --git a/extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch b/extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch
deleted file mode 100644
index e63b3f97b..000000000
--- a/extra/vlc/bp-set-channel-map-pulseaudio-1.0.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 15a821886296a8efe5f8b9015b6e9c5ae5e3ae79 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
-Date: Tue, 11 Oct 2011 19:19:21 +0300
-Subject: Set channel map when using PulseAudio 1.0
-
-(cherry picked from commit ca2cb5f01340252a85ad5bed877e84407f092b21)
----
- modules/audio_output/pulse.c | 2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
-index d67dc31..18ee280 100644
---- a/modules/audio_output/pulse.c
-+++ b/modules/audio_output/pulse.c
-@@ -640,6 +640,7 @@ static int Open(vlc_object_t *obj)
- formatv[formatc]->encoding = encoding;
- pa_format_info_set_rate(formatv[formatc], ss.rate);
- pa_format_info_set_channels(formatv[formatc], ss.channels);
-+ pa_format_info_set_channel_map(formatv[formatc], &map);
- formatc++;
- }
-
-@@ -649,6 +650,7 @@ static int Open(vlc_object_t *obj)
- pa_format_info_set_sample_format(formatv[formatc], ss.format);
- pa_format_info_set_rate(formatv[formatc], ss.rate);
- pa_format_info_set_channels(formatv[formatc], ss.channels);
-+ pa_format_info_set_channel_map(formatv[formatc], &map);
- formatc++;
-
- /* Create a playback stream */
---
-1.7.4.1
-
diff --git a/extra/xalan-java/PKGBUILD b/extra/xalan-java/PKGBUILD
deleted file mode 100644
index f7fa0ad7c..000000000
--- a/extra/xalan-java/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Hussam Al-Tayeb <ht990332@gmail.com>
-
-pkgname=xalan-java
-pkgver=2.7.1
-pkgrel=3
-pkgdesc="XSLT processor for transforming XML documents into HTML, text, or other XML document types"
-arch=('any')
-license=('APACHE')
-url="http://xml.apache.org/xalan-j"
-depends=('xerces2-java')
-source=(http://mirror.softaculous.com/apache//xml/xalan-j/xalan-j_${pkgver//./_}-bin-2jars.tar.gz)
-md5sums=('3ccda39bcd08b780436dfd2f22fb23d5')
-
-build() {
- /bin/true
-}
-
-package() {
- cd ${srcdir}/xalan-j_${pkgver//./_}
- install -m755 -d ${pkgdir}/usr/share/java
- install -m644 xalan.jar ${pkgdir}/usr/share/java/ || return 1
- install -m644 xsltc.jar ${pkgdir}/usr/share/java/ || return 1
-}
diff --git a/extra/xerces2-java/PKGBUILD b/extra/xerces2-java/PKGBUILD
deleted file mode 100644
index cccb28bed..000000000
--- a/extra/xerces2-java/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 144863 2011-12-08 20:32:13Z andyrtr $
-
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgname=xerces2-java
-pkgver=2.11.0
-pkgrel=1
-pkgdesc="High performance fully compliant Java XML parser"
-arch=('any')
-url="http://xml.apache.org/xerces2-j"
-license=('APACHE')
-provides=("java-xerces2=${pkgver}")
-conflicts=('java-xerces2')
-replaces=('java-xerces2')
-source=(http://mirror.checkdomain.de/apache//xerces/j/Xerces-J-bin.${pkgver}.tar.gz)
-md5sums=('29d731e0ae57eb3f2e09af6594bc2515')
-
-build() {
- /bin/true
-}
-
-package() {
- cd ${srcdir}/xerces-${pkgver//./_}
- install -m755 -d ${pkgdir}/usr/share/java
- rm -f xercesSamples.jar
- install -m644 *.jar ${pkgdir}/usr/share/java/
-}
diff --git a/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch b/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
deleted file mode 100644
index 8bddb2945..000000000
--- a/extra/xorg-server/Xi-allow-passive-keygrabs-on-the-XIAll-Master-Device.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 97f2af5876dab0dfab06be735416f3fc950ed39e Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 27 Oct 2011 11:03:39 +1000
-Subject: [PATCH] Xi: allow passive keygrabs on the XIAll(Master)Devices fake
- devices
-
-They don't have a KeyClassRec, but we must still allow passive grabs on
-them.
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
-Tested-by: Bastien Nocera <hadess@hadess.net>
----
- Xi/exevents.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Xi/exevents.c b/Xi/exevents.c
-index 053c76f..edf2c39 100644
---- a/Xi/exevents.c
-+++ b/Xi/exevents.c
-@@ -1495,7 +1495,7 @@ GrabKey(ClientPtr client, DeviceIntPtr dev, DeviceIntPtr modifier_device,
- rc = CheckGrabValues(client, param);
- if (rc != Success)
- return rc;
-- if (k == NULL)
-+ if ((dev->id != XIAllDevices && dev->id != XIAllMasterDevices) && k == NULL)
- return BadMatch;
- if (grabtype == GRABTYPE_XI)
- {
---
-1.7.7
-
diff --git a/extra/zsh/modules.patch b/extra/zsh/modules.patch
deleted file mode 100644
index 315d40b98..000000000
--- a/extra/zsh/modules.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Completion/Linux/Command/_modutils
-+++ b/Completion/Linux/Command/_modutils
-@@ -107,7 +107,7 @@ case "$state" in
- ! _retrieve_cache modules-$kver;
- then
- # 2011-01-02 gi1242: Do we need .o files? Or is .ko enough?
-- modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko)(.:t:r) )
-+ modules=( $modules_dir/$kver/(*~(source|build))/**/*.(o|ko|ko.gz)(.:t:r:r) )
- _store_cache modules-$kver modules
- fi
-
diff --git a/kde-unstable/kactivities/fix-activities.patch b/kde-unstable/kactivities/fix-activities.patch
deleted file mode 100644
index 5cf62c48c..000000000
--- a/kde-unstable/kactivities/fix-activities.patch
+++ /dev/null
@@ -1,156 +0,0 @@
---- kactivities-4.7.80/service/ActivityManager.cpp~ 2011-11-24 16:05:52.777981854 +0000
-+++ kactivities-4.7.80/service/ActivityManager.cpp 2011-11-24 16:06:32.721637122 +0000
-@@ -75,14 +75,14 @@
- QHash < WId, SharedInfo::WindowData > & _windows,
- QHash < KUrl, SharedInfo::ResourceData > & _resources
- )
-- : haveSessions(false),
-- config("activitymanagerrc"),
-- windows(_windows),
-- resources(_resources),
-+ : config("activitymanagerrc"),
-+ windows(_windows),
-+ resources(_resources),
- #ifdef HAVE_NEPOMUK
-- m_nepomukInitCalled(false),
-+ m_nepomukInitCalled(false),
- #endif
-- q(parent)
-+ q(parent),
-+ ksmserverInterface(0)
- {
- // Initializing config
- connect(&configSyncTimer, SIGNAL(timeout()),
-@@ -116,20 +116,26 @@
- this, SLOT(activeWindowChanged(WId)));
-
- //listen to ksmserver for starting/stopping
-+ QDBusServiceWatcher *watcher = new QDBusServiceWatcher("org.kde.ksmserver",
-+ QDBusConnection::sessionBus(),
-+ QDBusServiceWatcher::WatchForRegistration);
-+ connect(watcher, SIGNAL(serviceRegistered(QString)), this, SLOT(sessionServiceRegistered()));
-+ sessionServiceRegistered();
-+}
-+
-+void ActivityManagerPrivate::sessionServiceRegistered()
-+{
-+ delete ksmserverInterface;
- ksmserverInterface = new QDBusInterface("org.kde.ksmserver", "/KSMServer", "org.kde.KSMServerInterface");
- if (ksmserverInterface->isValid()) {
- ksmserverInterface->setParent(this);
- connect(ksmserverInterface, SIGNAL(subSessionOpened()), this, SLOT(startCompleted()));
- connect(ksmserverInterface, SIGNAL(subSessionClosed()), this, SLOT(stopCompleted()));
- connect(ksmserverInterface, SIGNAL(subSessionCloseCanceled()), this, SLOT(stopCancelled())); //spelling fail :)
-- haveSessions = true;
- } else {
-- kDebug() << "couldn't connect to ksmserver! session stuff won't work";
-- //note: in theory it's nice to try again later
-- //but in practice, ksmserver is either there or it isn't (killing it logs you out)
-- //so in this case there's no point. :)
-- ksmserverInterface->deleteLater();
-+ delete ksmserverInterface;
- ksmserverInterface = 0;
-+ kDebug() << "couldn't connect to ksmserver! session stuff won't work";
- }
- }
-
-@@ -519,26 +525,24 @@
- {
- bool called = false;
- // start the starting :)
-- if (haveSessions) {
-- QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
-- if (kwin.isValid()) {
-- QDBusMessage reply = kwin.call("startActivity", id);
-- if (reply.type() == QDBusMessage::ErrorMessage) {
-- kDebug() << "dbus error:" << reply.errorMessage();
-+ QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
-+ if (kwin.isValid()) {
-+ QDBusMessage reply = kwin.call("startActivity", id);
-+ if (reply.type() == QDBusMessage::ErrorMessage) {
-+ kDebug() << "dbus error:" << reply.errorMessage();
-+ } else {
-+ QList<QVariant> ret = reply.arguments();
-+ if (ret.length() == 1 && ret.first().toBool()) {
-+ called = true;
- } else {
-- QList<QVariant> ret = reply.arguments();
-- if (ret.length() == 1 && ret.first().toBool()) {
-- called = true;
-- } else {
-- kDebug() << "call returned false; probably ksmserver is busy";
-- setActivityState(transitioningActivity, ActivityManager::Stopped);
-- transitioningActivity.clear();
-- return; //assume we're mid-logout and just don't touch anything
-- }
-+ kDebug() << "call returned false; probably ksmserver is busy";
-+ setActivityState(transitioningActivity, ActivityManager::Stopped);
-+ transitioningActivity.clear();
-+ return; //assume we're mid-logout and just don't touch anything
- }
-- } else {
-- kDebug() << "couldn't get kwin interface";
- }
-+ } else {
-+ kDebug() << "couldn't get kwin interface";
- }
-
- if (!called) {
-@@ -585,25 +589,23 @@
- {
- bool called = false;
- // start the stopping :)
-- if (haveSessions) {
-- QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
-- if (kwin.isValid()) {
-- QDBusMessage reply = kwin.call("stopActivity", id);
-- if (reply.type() == QDBusMessage::ErrorMessage) {
-- kDebug() << "dbus error:" << reply.errorMessage();
-+ QDBusInterface kwin("org.kde.kwin", "/KWin", "org.kde.KWin");
-+ if (kwin.isValid()) {
-+ QDBusMessage reply = kwin.call("stopActivity", id);
-+ if (reply.type() == QDBusMessage::ErrorMessage) {
-+ kDebug() << "dbus error:" << reply.errorMessage();
-+ } else {
-+ QList<QVariant> ret = reply.arguments();
-+ if (ret.length() == 1 && ret.first().toBool()) {
-+ called = true;
- } else {
-- QList<QVariant> ret = reply.arguments();
-- if (ret.length() == 1 && ret.first().toBool()) {
-- called = true;
-- } else {
-- kDebug() << "call returned false; probably ksmserver is busy";
-- stopCancelled();
-- return; //assume we're mid-logout and just don't touch anything
-- }
-+ kDebug() << "call returned false; probably ksmserver is busy";
-+ stopCancelled();
-+ return; //assume we're mid-logout and just don't touch anything
- }
-- } else {
-- kDebug() << "couldn't get kwin interface";
- }
-+ } else {
-+ kDebug() << "couldn't get kwin interface";
- }
-
- if (!called) {
---- kactivities-4.7.80/service/ActivityManager_p.h~ 2011-11-24 16:06:01.618054620 +0000
-+++ kactivities-4.7.80/service/ActivityManager_p.h 2011-11-24 16:06:32.721637122 +0000
-@@ -68,7 +68,6 @@
-
- //opening/closing activity (ksmserver can only handle one at a time)
- QString transitioningActivity;
-- bool haveSessions; //whether ksmserver's available
-
- // Configuration
- QTimer configSyncTimer;
-@@ -106,6 +105,7 @@
-
- void backstoreAvailable();
- void syncActivitiesWithNepomuk();
-+ void sessionServiceRegistered();
-
- private:
- ActivityManager * const q;
diff --git a/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch b/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch
deleted file mode 100644
index 779456b39..000000000
--- a/kde-unstable/kdebase-workspace/kdm-zsh-profile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- " zhome=${ZDOTDIR:-$HOME}\n"
- " # zshenv is always sourced automatically.\n"
--" [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+" [ -f /etc/profile ] && . /etc/profile\n"
- " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- " [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
diff --git a/kde-unstable/kdebindings-smokegen/fix-crash.patch b/kde-unstable/kdebindings-smokegen/fix-crash.patch
deleted file mode 100644
index 5864da3f3..000000000
--- a/kde-unstable/kdebindings-smokegen/fix-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up smokegen-4.7.0/parser/type_compiler.cpp.orig smokegen-4.7.0/parser/type_compiler.cpp
-diff -up smokegen-4.7.0/type_compiler.cpp.orig smokegen-4.7.0/type_compiler.cpp
---- smokegen-4.7.0/type_compiler.cpp.orig 2011-08-02 14:34:08.000000000 +0200
-+++ smokegen-4.7.0/type_compiler.cpp 2011-08-02 14:34:34.000000000 +0200
-@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara
-
- void TypeCompiler::visitPtrOperator(PtrOperatorAST* node)
- {
-+ if ( ! m_session->token_stream ) return;
-+ if ( ! token_text(m_session->token_stream->kind(node->op)) ) return;
- if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
- QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
- pointerDepth.append(cv.first);
diff --git a/kde-unstable/kdeplasma-addons/fix-build.patch b/kde-unstable/kdeplasma-addons/fix-build.patch
deleted file mode 100644
index 79e1d1f8c..000000000
--- a/kde-unstable/kdeplasma-addons/fix-build.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From: Aaron Seigo <aseigo@kde.org>
-Date: Tue, 22 Nov 2011 20:10:45 +0000
-Subject: fix build
-X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&amp;a=commitdiff&amp;h=6967ee53518136651b4fd5d691293a3c866d7a47
----
-fix build
----
-
-
---- a/libs/lancelot-datamodels/OpenDocuments.cpp
-+++ b/libs/lancelot-datamodels/OpenDocuments.cpp
-@@ -66,41 +66,41 @@ OpenDocuments::~OpenDocuments()
- delete d;
- }
-
--void OpenDocuments::Private::connectTask(TaskPtr task)
-+void OpenDocuments::Private::connectTask(::TaskManager::Task *task)
- {
- Q_ASSERT(task);
- connect(
-- task.constData(), SIGNAL(changed(::TaskManager::TaskChanges)),
-+ task, SIGNAL(changed(::TaskManager::TaskChanges)),
- this, SLOT(taskChanged())
- );
- }
-
- void OpenDocuments::load()
- {
-- foreach (TaskPtr task, TaskManager::TaskManager::self()->tasks()) {
-+ foreach (TaskManager::Task *task, TaskManager::TaskManager::self()->tasks()) {
- if (d->setDataForTask(task)) {
- d->connectTask(task);
- }
- }
-
- connect(
-- TaskManager::TaskManager::self(), SIGNAL(taskAdded(TaskPtr)),
-- d, SLOT(taskAdded(TaskPtr))
-+ TaskManager::TaskManager::self(), SIGNAL(taskAdded(::TaskManager::Task*)),
-+ d, SLOT(taskAdded(::TaskManager::Task*))
- );
-
- connect(
-- TaskManager::TaskManager::self(), SIGNAL(taskRemoved(TaskPtr)),
-- d, SLOT(taskRemoved(TaskPtr))
-+ TaskManager::TaskManager::self(), SIGNAL(taskRemoved(::TaskManager::Task*)),
-+ d, SLOT(taskRemoved(::TaskManager::Task*))
- );
- }
-
--void OpenDocuments::Private::taskAdded(TaskPtr task)
-+void OpenDocuments::Private::taskAdded(::TaskManager::Task *task)
- {
- connectTask(task);
- setDataForTask(task);
- }
-
--void OpenDocuments::Private::taskRemoved(TaskPtr task)
-+void OpenDocuments::Private::taskRemoved(::TaskManager::Task *task)
- {
- Q_ASSERT(task);
- int index = indexOf(task->window());
-@@ -115,10 +115,10 @@ void OpenDocuments::Private::taskChanged
- TaskManager::Task* task = qobject_cast<TaskManager::Task*>(sender());
- Q_ASSERT(task);
-
-- setDataForTask(TaskPtr(task));
-+ setDataForTask(task);
- }
-
--bool OpenDocuments::Private::setDataForTask(TaskPtr task)
-+bool OpenDocuments::Private::setDataForTask(::TaskManager::Task *task)
- {
- Q_ASSERT(task);
-
-
---- a/libs/lancelot-datamodels/OpenDocuments.h
-+++ b/libs/lancelot-datamodels/OpenDocuments.h
-@@ -26,8 +26,6 @@
- #include <taskmanager/taskmanager.h>
- #include <QSet>
-
--using TaskManager::TaskPtr;
--
- namespace Lancelot {
- namespace Models {
-
-
---- a/libs/lancelot-datamodels/OpenDocuments_p.h
-+++ b/libs/lancelot-datamodels/OpenDocuments_p.h
-@@ -24,8 +24,6 @@
- #include <taskmanager/taskmanager.h>
- #include <QSet>
-
--using TaskManager::TaskPtr;
--
- namespace Lancelot {
- namespace Models {
-
-@@ -44,16 +42,16 @@ public:
-
- public Q_SLOTS:
- void taskChanged();
-- void taskAdded(TaskPtr task);
-- void taskRemoved(TaskPtr task);
-+ void taskAdded(::TaskManager::Task *task);
-+ void taskRemoved(::TaskManager::Task *task);
-
-- void connectTask(TaskPtr task);
-- bool setDataForTask(TaskPtr task);
-+ void connectTask(::TaskManager::Task *task);
-+ bool setDataForTask(::TaskManager::Task *task);
-
- int indexOf(WId wid);
-
- public:
-- QMap <WId, TaskPtr > tasks;
-+ QMap <WId, TaskManager::Task *> tasks;
- QList <SupportedTask> supportedTasks;
-
- private:
-
-From: Aaron Seigo <aseigo@kde.org>
-Date: Tue, 22 Nov 2011 13:07:59 +0000
-Subject: remove outdated using statements
-X-Git-Url: http://quickgit.kde.org/?p=kdeplasma-addons.git&amp;a=commitdiff&amp;h=b0c70d7fd866efb628036f43978bc791e0485f90
----
-remove outdated using statements
----
-
-
---- a/applets/icontasks/taskitemlayout.h
-+++ b/applets/icontasks/taskitemlayout.h
-@@ -32,9 +32,6 @@ class TaskGroupItem;
- class AbstractTaskItem;
- class LauncherSeparator;
-
--using TaskManager::StartupPtr;
--using TaskManager::TaskPtr;
--
- /**
- * A Layout for the expanded group
- */
-
---- a/applets/icontasks/tasks.h
-+++ b/applets/icontasks/tasks.h
-@@ -54,15 +54,6 @@ namespace TaskManager
- class GroupManager;
- } // namespace TaskManager
-
--using TaskManager::StartupPtr;
--using TaskManager::TaskPtr;
--using TaskManager::StartupPtr;
--using TaskManager::GroupPtr;
--using TaskManager::AbstractGroupableItem;
--using TaskManager::TaskItem;
--using TaskManager::TaskGroup;
--using TaskManager::LauncherItem;
--
- class TaskGroupItem;
- class GroupManager;
-
-
diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config
deleted file mode 100644
index c538b3196..000000000
--- a/libre/kernel26-libre-lts/config
+++ /dev/null
@@ -1,4776 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.32
-# Tue Jun 7 06:41:37 2011
-#
-# CONFIG_64BIT is not set
-CONFIG_X86_32=y
-# CONFIG_X86_64 is not set
-CONFIG_X86=y
-CONFIG_OUTPUT_FORMAT="elf32-i386"
-CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig"
-CONFIG_GENERIC_TIME=y
-CONFIG_GENERIC_CMOS_UPDATE=y
-CONFIG_CLOCKSOURCE_WATCHDOG=y
-CONFIG_GENERIC_CLOCKEVENTS=y
-CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
-CONFIG_LOCKDEP_SUPPORT=y
-CONFIG_STACKTRACE_SUPPORT=y
-CONFIG_HAVE_LATENCYTOP_SUPPORT=y
-CONFIG_MMU=y
-CONFIG_ZONE_DMA=y
-CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
-CONFIG_GENERIC_BUG=y
-CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_GPIO=y
-CONFIG_ARCH_MAY_HAVE_PC_FDC=y
-# CONFIG_RWSEM_GENERIC_SPINLOCK is not set
-CONFIG_RWSEM_XCHGADD_ALGORITHM=y
-CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-# CONFIG_GENERIC_TIME_VSYSCALL is not set
-CONFIG_ARCH_HAS_CPU_RELAX=y
-CONFIG_ARCH_HAS_DEFAULT_IDLE=y
-CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
-CONFIG_HAVE_SETUP_PER_CPU_AREA=y
-CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
-CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
-# CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set
-CONFIG_ARCH_HIBERNATION_POSSIBLE=y
-CONFIG_ARCH_SUSPEND_POSSIBLE=y
-# CONFIG_ZONE_DMA32 is not set
-CONFIG_ARCH_POPULATES_NODE_MAP=y
-# CONFIG_AUDIT_ARCH is not set
-CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y
-CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
-CONFIG_HAVE_INTEL_TXT=y
-CONFIG_GENERIC_HARDIRQS=y
-CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
-CONFIG_GENERIC_IRQ_PROBE=y
-CONFIG_GENERIC_PENDING_IRQ=y
-CONFIG_USE_GENERIC_SMP_HELPERS=y
-CONFIG_X86_32_SMP=y
-CONFIG_X86_HT=y
-CONFIG_X86_TRAMPOLINE=y
-CONFIG_KTIME_SCALAR=y
-CONFIG_ARCH_CPU_PROBE_RELEASE=y
-CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-CONFIG_CONSTRUCTORS=y
-
-#
-# General setup
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-CONFIG_LOCALVERSION="-lts"
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_HAVE_KERNEL_GZIP=y
-CONFIG_HAVE_KERNEL_BZIP2=y
-CONFIG_HAVE_KERNEL_LZMA=y
-# CONFIG_KERNEL_GZIP is not set
-# CONFIG_KERNEL_BZIP2 is not set
-CONFIG_KERNEL_LZMA=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-CONFIG_SYSVIPC_SYSCTL=y
-CONFIG_POSIX_MQUEUE=y
-CONFIG_POSIX_MQUEUE_SYSCTL=y
-CONFIG_BSD_PROCESS_ACCT=y
-CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_TASKSTATS=y
-CONFIG_TASK_DELAY_ACCT=y
-CONFIG_TASK_XACCT=y
-CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
-CONFIG_AUDITSYSCALL=y
-CONFIG_AUDIT_TREE=y
-
-#
-# RCU Subsystem
-#
-CONFIG_TREE_RCU=y
-# CONFIG_TREE_PREEMPT_RCU is not set
-# CONFIG_RCU_TRACE is not set
-CONFIG_RCU_FANOUT=32
-# CONFIG_RCU_FANOUT_EXACT is not set
-# CONFIG_TREE_RCU_TRACE is not set
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=19
-CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
-CONFIG_CGROUPS=y
-# CONFIG_CGROUP_DEBUG is not set
-CONFIG_CGROUP_NS=y
-CONFIG_CGROUP_FREEZER=y
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_CGROUP_CPUACCT=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
-CONFIG_CGROUP_MEM_RES_CTLR_SWAP=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_MM_OWNER=y
-# CONFIG_SYSFS_DEPRECATED_V2 is not set
-CONFIG_RELAY=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_RD_GZIP=y
-CONFIG_RD_BZIP2=y
-CONFIG_RD_LZMA=y
-# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
-CONFIG_SYSCTL=y
-CONFIG_ANON_INODES=y
-# CONFIG_EMBEDDED is not set
-CONFIG_UID16=y
-CONFIG_SYSCTL_SYSCALL=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-CONFIG_KALLSYMS_EXTRA_PASS=y
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_PCSPKR_PLATFORM=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SIGNALFD=y
-CONFIG_TIMERFD=y
-CONFIG_EVENTFD=y
-CONFIG_SHMEM=y
-CONFIG_AIO=y
-CONFIG_HAVE_PERF_EVENTS=y
-
-#
-# Kernel Performance Events And Counters
-#
-CONFIG_PERF_EVENTS=y
-CONFIG_EVENT_PROFILE=y
-CONFIG_PERF_COUNTERS=y
-# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
-CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_PCI_QUIRKS=y
-CONFIG_SLUB_DEBUG=y
-# CONFIG_COMPAT_BRK is not set
-# CONFIG_SLAB is not set
-CONFIG_SLUB=y
-# CONFIG_SLOB is not set
-CONFIG_PROFILING=y
-CONFIG_TRACEPOINTS=y
-CONFIG_OPROFILE=m
-CONFIG_OPROFILE_IBS=y
-# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
-CONFIG_HAVE_OPROFILE=y
-# CONFIG_KPROBES is not set
-CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
-CONFIG_HAVE_IOREMAP_PROT=y
-CONFIG_HAVE_KPROBES=y
-CONFIG_HAVE_KRETPROBES=y
-CONFIG_HAVE_ARCH_TRACEHOOK=y
-CONFIG_HAVE_DMA_ATTRS=y
-CONFIG_HAVE_DMA_API_DEBUG=y
-
-#
-# GCOV-based kernel profiling
-#
-# CONFIG_GCOV_KERNEL is not set
-CONFIG_SLOW_WORK=y
-# CONFIG_SLOW_WORK_DEBUG is not set
-CONFIG_HAVE_GENERIC_DMA_COHERENT=y
-CONFIG_SLABINFO=y
-CONFIG_RT_MUTEXES=y
-CONFIG_BASE_SMALL=0
-CONFIG_MODULES=y
-CONFIG_MODULE_FORCE_LOAD=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_STOP_MACHINE=y
-CONFIG_BLOCK=y
-CONFIG_LBDAF=y
-CONFIG_BLK_DEV_BSG=y
-# CONFIG_BLK_DEV_INTEGRITY is not set
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=y
-CONFIG_IOSCHED_CFQ=y
-# CONFIG_DEFAULT_AS is not set
-CONFIG_DEFAULT_DEADLINE=y
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="deadline"
-CONFIG_PREEMPT_NOTIFIERS=y
-CONFIG_FREEZER=y
-
-#
-# Processor type and features
-#
-CONFIG_TICK_ONESHOT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
-CONFIG_SMP=y
-# CONFIG_SPARSE_IRQ is not set
-CONFIG_X86_MPPARSE=y
-# CONFIG_X86_BIGSMP is not set
-# CONFIG_X86_EXTENDED_PLATFORM is not set
-CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_SCHED_OMIT_FRAME_POINTER=y
-CONFIG_PARAVIRT_GUEST=y
-CONFIG_VMI=y
-CONFIG_KVM_CLOCK=y
-CONFIG_KVM_GUEST=y
-CONFIG_LGUEST_GUEST=y
-CONFIG_PARAVIRT=y
-# CONFIG_PARAVIRT_SPINLOCKS is not set
-CONFIG_PARAVIRT_CLOCK=y
-# CONFIG_PARAVIRT_DEBUG is not set
-# CONFIG_MEMTEST is not set
-# CONFIG_M386 is not set
-# CONFIG_M486 is not set
-# CONFIG_M586 is not set
-# CONFIG_M586TSC is not set
-# CONFIG_M586MMX is not set
-CONFIG_M686=y
-# CONFIG_MPENTIUMII is not set
-# CONFIG_MPENTIUMIII is not set
-# CONFIG_MPENTIUMM is not set
-# CONFIG_MPENTIUM4 is not set
-# CONFIG_MK6 is not set
-# CONFIG_MK7 is not set
-# CONFIG_MK8 is not set
-# CONFIG_MCRUSOE is not set
-# CONFIG_MEFFICEON is not set
-# CONFIG_MWINCHIPC6 is not set
-# CONFIG_MWINCHIP3D is not set
-# CONFIG_MGEODEGX1 is not set
-# CONFIG_MGEODE_LX is not set
-# CONFIG_MCYRIXIII is not set
-# CONFIG_MVIAC3_2 is not set
-# CONFIG_MVIAC7 is not set
-# CONFIG_MPSC is not set
-# CONFIG_MCORE2 is not set
-# CONFIG_MATOM is not set
-# CONFIG_GENERIC_CPU is not set
-CONFIG_X86_GENERIC=y
-CONFIG_X86_CPU=y
-CONFIG_X86_L1_CACHE_BYTES=64
-CONFIG_X86_INTERNODE_CACHE_BYTES=64
-CONFIG_X86_CMPXCHG=y
-CONFIG_X86_L1_CACHE_SHIFT=5
-CONFIG_X86_XADD=y
-# CONFIG_X86_PPRO_FENCE is not set
-CONFIG_X86_WP_WORKS_OK=y
-CONFIG_X86_INVLPG=y
-CONFIG_X86_BSWAP=y
-CONFIG_X86_POPAD_OK=y
-CONFIG_X86_INTEL_USERCOPY=y
-CONFIG_X86_USE_PPRO_CHECKSUM=y
-CONFIG_X86_TSC=y
-CONFIG_X86_CMPXCHG64=y
-CONFIG_X86_CMOV=y
-CONFIG_X86_MINIMUM_CPU_FAMILY=5
-CONFIG_X86_DEBUGCTLMSR=y
-CONFIG_CPU_SUP_INTEL=y
-CONFIG_CPU_SUP_CYRIX_32=y
-CONFIG_CPU_SUP_AMD=y
-CONFIG_CPU_SUP_CENTAUR=y
-CONFIG_CPU_SUP_TRANSMETA_32=y
-CONFIG_CPU_SUP_UMC_32=y
-# CONFIG_X86_DS is not set
-CONFIG_HPET_TIMER=y
-CONFIG_HPET_EMULATE_RTC=y
-CONFIG_DMI=y
-# CONFIG_IOMMU_HELPER is not set
-CONFIG_IOMMU_API=y
-CONFIG_NR_CPUS=8
-CONFIG_SCHED_SMT=y
-CONFIG_SCHED_MC=y
-# CONFIG_IRQ_TIME_ACCOUNTING is not set
-CONFIG_PREEMPT_NONE=y
-# CONFIG_PREEMPT_VOLUNTARY is not set
-# CONFIG_PREEMPT is not set
-CONFIG_X86_LOCAL_APIC=y
-CONFIG_X86_IO_APIC=y
-CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
-CONFIG_X86_MCE=y
-CONFIG_X86_MCE_INTEL=y
-CONFIG_X86_MCE_AMD=y
-# CONFIG_X86_ANCIENT_MCE is not set
-CONFIG_X86_MCE_THRESHOLD=y
-# CONFIG_X86_MCE_INJECT is not set
-CONFIG_X86_THERMAL_VECTOR=y
-CONFIG_VM86=y
-CONFIG_TOSHIBA=m
-CONFIG_I8K=m
-CONFIG_X86_REBOOTFIXUPS=y
-CONFIG_MICROCODE=m
-CONFIG_MICROCODE_INTEL=y
-CONFIG_MICROCODE_AMD=y
-CONFIG_MICROCODE_OLD_INTERFACE=y
-CONFIG_X86_MSR=m
-CONFIG_X86_CPUID=m
-# CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
-CONFIG_PAGE_OFFSET=0xC0000000
-CONFIG_HIGHMEM=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
-CONFIG_ARCH_FLATMEM_ENABLE=y
-CONFIG_ARCH_SPARSEMEM_ENABLE=y
-CONFIG_ARCH_SELECT_MEMORY_MODEL=y
-CONFIG_ILLEGAL_POINTER_VALUE=0
-CONFIG_SELECT_MEMORY_MODEL=y
-CONFIG_FLATMEM_MANUAL=y
-# CONFIG_DISCONTIGMEM_MANUAL is not set
-# CONFIG_SPARSEMEM_MANUAL is not set
-CONFIG_FLATMEM=y
-CONFIG_FLAT_NODE_MEM_MAP=y
-CONFIG_SPARSEMEM_STATIC=y
-CONFIG_PAGEFLAGS_EXTENDED=y
-CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=1
-CONFIG_BOUNCE=y
-CONFIG_VIRT_TO_BUS=y
-CONFIG_HAVE_MLOCK=y
-CONFIG_HAVE_MLOCKED_PAGE_BIT=y
-CONFIG_MMU_NOTIFIER=y
-CONFIG_KSM=y
-CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
-CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
-CONFIG_MEMORY_FAILURE=y
-CONFIG_HWPOISON_INJECT=m
-# CONFIG_HIGHPTE is not set
-CONFIG_X86_CHECK_BIOS_CORRUPTION=y
-CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
-CONFIG_X86_RESERVE_LOW_64K=y
-# CONFIG_MATH_EMULATION is not set
-CONFIG_MTRR=y
-CONFIG_MTRR_SANITIZER=y
-CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0
-CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
-CONFIG_X86_PAT=y
-CONFIG_ARCH_USES_PG_UNCACHED=y
-CONFIG_EFI=y
-CONFIG_SECCOMP=y
-CONFIG_CC_STACKPROTECTOR=y
-CONFIG_HZ_100=y
-# CONFIG_HZ_250 is not set
-# CONFIG_HZ_300 is not set
-# CONFIG_HZ_1000 is not set
-CONFIG_HZ=100
-CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
-# CONFIG_CRASH_DUMP is not set
-# CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-# CONFIG_RELOCATABLE is not set
-CONFIG_PHYSICAL_ALIGN=0x100000
-CONFIG_HOTPLUG_CPU=y
-# CONFIG_COMPAT_VDSO is not set
-# CONFIG_CMDLINE_BOOL is not set
-CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
-
-#
-# Power management and ACPI options
-#
-CONFIG_PM=y
-CONFIG_PM_DEBUG=y
-# CONFIG_PM_VERBOSE is not set
-CONFIG_CAN_PM_TRACE=y
-# CONFIG_PM_TRACE_RTC is not set
-CONFIG_PM_SLEEP_SMP=y
-CONFIG_PM_SLEEP=y
-CONFIG_SUSPEND=y
-# CONFIG_PM_TEST_SUSPEND is not set
-CONFIG_SUSPEND_FREEZER=y
-CONFIG_HIBERNATION_NVS=y
-CONFIG_HIBERNATION=y
-CONFIG_PM_STD_PARTITION=""
-CONFIG_PM_RUNTIME=y
-CONFIG_ACPI=y
-CONFIG_ACPI_SLEEP=y
-CONFIG_ACPI_PROCFS=y
-CONFIG_ACPI_PROCFS_POWER=y
-CONFIG_ACPI_POWER_METER=m
-CONFIG_ACPI_SYSFS_POWER=y
-CONFIG_ACPI_PROC_EVENT=y
-CONFIG_ACPI_AC=m
-CONFIG_ACPI_BATTERY=m
-CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_FAN=m
-CONFIG_ACPI_DOCK=y
-CONFIG_ACPI_PROCESSOR=m
-CONFIG_ACPI_HOTPLUG_CPU=y
-CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
-CONFIG_ACPI_THERMAL=m
-# CONFIG_ACPI_CUSTOM_DSDT is not set
-CONFIG_ACPI_BLACKLIST_YEAR=0
-# CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_PCI_SLOT=m
-CONFIG_X86_PM_TIMER=y
-CONFIG_ACPI_CONTAINER=m
-CONFIG_ACPI_SBS=m
-CONFIG_SFI=y
-CONFIG_X86_APM_BOOT=y
-CONFIG_APM=y
-# CONFIG_APM_IGNORE_USER_SUSPEND is not set
-CONFIG_APM_DO_ENABLE=y
-# CONFIG_APM_CPU_IDLE is not set
-# CONFIG_APM_DISPLAY_BLANK is not set
-# CONFIG_APM_ALLOW_INTS is not set
-
-#
-# CPU Frequency scaling
-#
-CONFIG_CPU_FREQ=y
-CONFIG_CPU_FREQ_TABLE=m
-# CONFIG_CPU_FREQ_DEBUG is not set
-CONFIG_CPU_FREQ_STAT=m
-CONFIG_CPU_FREQ_STAT_DETAILS=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
-# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
-# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
-CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
-CONFIG_CPU_FREQ_GOV_POWERSAVE=m
-CONFIG_CPU_FREQ_GOV_USERSPACE=m
-CONFIG_CPU_FREQ_GOV_ONDEMAND=m
-CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
-
-#
-# CPUFreq processor drivers
-#
-CONFIG_X86_ACPI_CPUFREQ=m
-CONFIG_X86_POWERNOW_K6=m
-CONFIG_X86_POWERNOW_K7=m
-CONFIG_X86_POWERNOW_K7_ACPI=y
-CONFIG_X86_POWERNOW_K8=m
-CONFIG_X86_GX_SUSPMOD=m
-# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
-CONFIG_X86_SPEEDSTEP_ICH=m
-CONFIG_X86_SPEEDSTEP_SMI=m
-CONFIG_X86_P4_CLOCKMOD=m
-CONFIG_X86_CPUFREQ_NFORCE2=m
-CONFIG_X86_LONGRUN=m
-CONFIG_X86_LONGHAUL=m
-CONFIG_X86_E_POWERSAVER=m
-
-#
-# shared options
-#
-CONFIG_X86_SPEEDSTEP_LIB=m
-CONFIG_X86_SPEEDSTEP_RELAXED_CAP_CHECK=y
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_GOV_MENU=y
-
-#
-# Bus options (PCI etc.)
-#
-CONFIG_PCI=y
-# CONFIG_PCI_GOBIOS is not set
-# CONFIG_PCI_GOMMCONFIG is not set
-# CONFIG_PCI_GODIRECT is not set
-# CONFIG_PCI_GOOLPC is not set
-CONFIG_PCI_GOANY=y
-CONFIG_PCI_BIOS=y
-CONFIG_PCI_DIRECT=y
-CONFIG_PCI_MMCONFIG=y
-CONFIG_PCI_OLPC=y
-CONFIG_PCI_DOMAINS=y
-CONFIG_DMAR=y
-# CONFIG_DMAR_DEFAULT_ON is not set
-CONFIG_DMAR_FLOPPY_WA=y
-CONFIG_PCIEPORTBUS=y
-CONFIG_HOTPLUG_PCI_PCIE=m
-CONFIG_PCIEAER=y
-# CONFIG_PCIE_ECRC is not set
-# CONFIG_PCIEAER_INJECT is not set
-CONFIG_PCIEASPM=y
-# CONFIG_PCIEASPM_DEBUG is not set
-CONFIG_ARCH_SUPPORTS_MSI=y
-CONFIG_PCI_MSI=y
-CONFIG_PCI_LEGACY=y
-# CONFIG_PCI_DEBUG is not set
-CONFIG_PCI_STUB=m
-CONFIG_HT_IRQ=y
-CONFIG_PCI_IOV=y
-CONFIG_ISA_DMA_API=y
-CONFIG_ISA=y
-# CONFIG_EISA is not set
-# CONFIG_MCA is not set
-# CONFIG_SCx200 is not set
-CONFIG_OLPC=y
-CONFIG_K8_NB=y
-CONFIG_PCCARD=m
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=m
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
-CONFIG_CARDBUS=y
-
-#
-# PC-card bridges
-#
-CONFIG_YENTA=m
-CONFIG_YENTA_O2=y
-CONFIG_YENTA_RICOH=y
-CONFIG_YENTA_TI=y
-CONFIG_YENTA_ENE_TUNE=y
-CONFIG_YENTA_TOSHIBA=y
-CONFIG_PD6729=m
-CONFIG_I82092=m
-CONFIG_I82365=m
-CONFIG_TCIC=m
-CONFIG_PCMCIA_PROBE=y
-CONFIG_PCCARD_NONSTATIC=m
-CONFIG_HOTPLUG_PCI=m
-CONFIG_HOTPLUG_PCI_FAKE=m
-CONFIG_HOTPLUG_PCI_COMPAQ=m
-# CONFIG_HOTPLUG_PCI_COMPAQ_NVRAM is not set
-CONFIG_HOTPLUG_PCI_IBM=m
-CONFIG_HOTPLUG_PCI_ACPI=m
-CONFIG_HOTPLUG_PCI_ACPI_IBM=m
-CONFIG_HOTPLUG_PCI_CPCI=y
-CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
-CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
-CONFIG_HOTPLUG_PCI_SHPC=m
-
-#
-# Executable file formats / Emulations
-#
-CONFIG_BINFMT_ELF=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_HAVE_AOUT=y
-CONFIG_BINFMT_AOUT=m
-CONFIG_BINFMT_MISC=y
-CONFIG_HAVE_ATOMIC_IOMAP=y
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-CONFIG_PACKET_MMAP=y
-CONFIG_UNIX=y
-CONFIG_XFRM=y
-CONFIG_XFRM_USER=m
-# CONFIG_XFRM_SUB_POLICY is not set
-# CONFIG_XFRM_MIGRATE is not set
-# CONFIG_XFRM_STATISTICS is not set
-CONFIG_XFRM_IPCOMP=m
-CONFIG_NET_KEY=m
-# CONFIG_NET_KEY_MIGRATE is not set
-CONFIG_INET=y
-CONFIG_IP_MULTICAST=y
-CONFIG_IP_ADVANCED_ROUTER=y
-CONFIG_ASK_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_MULTIPLE_TABLES=y
-CONFIG_IP_ROUTE_MULTIPATH=y
-CONFIG_IP_ROUTE_VERBOSE=y
-# CONFIG_IP_PNP is not set
-CONFIG_NET_IPIP=m
-CONFIG_NET_IPGRE=m
-# CONFIG_NET_IPGRE_BROADCAST is not set
-CONFIG_IP_MROUTE=y
-CONFIG_IP_PIMSM_V1=y
-CONFIG_IP_PIMSM_V2=y
-# CONFIG_ARPD is not set
-CONFIG_SYN_COOKIES=y
-CONFIG_INET_AH=m
-CONFIG_INET_ESP=m
-CONFIG_INET_IPCOMP=m
-CONFIG_INET_XFRM_TUNNEL=m
-CONFIG_INET_TUNNEL=m
-CONFIG_INET_XFRM_MODE_TRANSPORT=m
-CONFIG_INET_XFRM_MODE_TUNNEL=m
-CONFIG_INET_XFRM_MODE_BEET=m
-CONFIG_INET_LRO=y
-CONFIG_INET_DIAG=y
-CONFIG_INET_TCP_DIAG=y
-CONFIG_TCP_CONG_ADVANCED=y
-CONFIG_TCP_CONG_BIC=m
-CONFIG_TCP_CONG_CUBIC=y
-CONFIG_TCP_CONG_WESTWOOD=m
-CONFIG_TCP_CONG_HTCP=m
-CONFIG_TCP_CONG_HSTCP=m
-CONFIG_TCP_CONG_HYBLA=m
-CONFIG_TCP_CONG_VEGAS=m
-CONFIG_TCP_CONG_SCALABLE=m
-CONFIG_TCP_CONG_LP=m
-CONFIG_TCP_CONG_VENO=m
-CONFIG_TCP_CONG_YEAH=m
-CONFIG_TCP_CONG_ILLINOIS=m
-# CONFIG_DEFAULT_BIC is not set
-CONFIG_DEFAULT_CUBIC=y
-# CONFIG_DEFAULT_HTCP is not set
-# CONFIG_DEFAULT_VEGAS is not set
-# CONFIG_DEFAULT_WESTWOOD is not set
-# CONFIG_DEFAULT_RENO is not set
-CONFIG_DEFAULT_TCP_CONG="cubic"
-# CONFIG_TCP_MD5SIG is not set
-CONFIG_IPV6=m
-CONFIG_IPV6_PRIVACY=y
-CONFIG_IPV6_ROUTER_PREF=y
-CONFIG_IPV6_ROUTE_INFO=y
-CONFIG_IPV6_OPTIMISTIC_DAD=y
-CONFIG_INET6_AH=m
-CONFIG_INET6_ESP=m
-CONFIG_INET6_IPCOMP=m
-CONFIG_IPV6_MIP6=m
-CONFIG_INET6_XFRM_TUNNEL=m
-CONFIG_INET6_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_TRANSPORT=m
-CONFIG_INET6_XFRM_MODE_TUNNEL=m
-CONFIG_INET6_XFRM_MODE_BEET=m
-CONFIG_INET6_XFRM_MODE_ROUTEOPTIMIZATION=m
-CONFIG_IPV6_SIT=m
-CONFIG_IPV6_NDISC_NODETYPE=y
-CONFIG_IPV6_TUNNEL=m
-CONFIG_IPV6_MULTIPLE_TABLES=y
-CONFIG_IPV6_SUBTREES=y
-# CONFIG_IPV6_MROUTE is not set
-CONFIG_NETLABEL=y
-CONFIG_NETWORK_SECMARK=y
-CONFIG_NETFILTER=y
-# CONFIG_NETFILTER_DEBUG is not set
-CONFIG_NETFILTER_ADVANCED=y
-CONFIG_BRIDGE_NETFILTER=y
-
-#
-# Core Netfilter Configuration
-#
-CONFIG_NETFILTER_NETLINK=m
-CONFIG_NETFILTER_NETLINK_QUEUE=m
-CONFIG_NETFILTER_NETLINK_LOG=m
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CT_ACCT=y
-CONFIG_NF_CONNTRACK_MARK=y
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_GRE=m
-CONFIG_NF_CT_PROTO_SCTP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NF_CT_NETLINK=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XTABLES=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_HL=m
-CONFIG_NETFILTER_XT_TARGET_LED=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
-CONFIG_NETFILTER_XT_TARGET_RATEEST=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_HL=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_RECENT_PROC_COMPAT=y
-CONFIG_NETFILTER_XT_MATCH_SCTP=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_IP_VS=m
-# CONFIG_IP_VS_IPV6 is not set
-# CONFIG_IP_VS_DEBUG is not set
-CONFIG_IP_VS_TAB_BITS=12
-
-#
-# IPVS transport protocol load balancing support
-#
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_AH_ESP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-
-#
-# IPVS scheduler
-#
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_DH=m
-CONFIG_IP_VS_SH=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-
-#
-# IPVS application helper
-#
-CONFIG_IP_VS_FTP=m
-
-#
-# IP: Netfilter Configuration
-#
-CONFIG_NF_DEFRAG_IPV4=m
-CONFIG_NF_CONNTRACK_IPV4=m
-CONFIG_NF_CONNTRACK_PROC_COMPAT=y
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_IP_NF_TARGET_REJECT=m
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_NF_NAT=m
-CONFIG_NF_NAT_NEEDED=y
-CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
-CONFIG_IP_NF_TARGET_REDIRECT=m
-CONFIG_NF_NAT_SNMP_BASIC=m
-CONFIG_NF_NAT_PROTO_DCCP=m
-CONFIG_NF_NAT_PROTO_GRE=m
-CONFIG_NF_NAT_PROTO_UDPLITE=m
-CONFIG_NF_NAT_PROTO_SCTP=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_NAT_IRC=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_NAT_AMANDA=m
-CONFIG_NF_NAT_PPTP=m
-CONFIG_NF_NAT_H323=m
-CONFIG_NF_NAT_SIP=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_CLUSTERIP=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-
-#
-# IPv6: Netfilter Configuration
-#
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
-CONFIG_IP_DCCP=m
-CONFIG_INET_DCCP_DIAG=m
-
-#
-# DCCP CCIDs Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_DCCP_CCID2_DEBUG is not set
-CONFIG_IP_DCCP_CCID3=y
-# CONFIG_IP_DCCP_CCID3_DEBUG is not set
-CONFIG_IP_DCCP_CCID3_RTO=100
-CONFIG_IP_DCCP_TFRC_LIB=y
-
-#
-# DCCP Kernel Hacking
-#
-# CONFIG_IP_DCCP_DEBUG is not set
-CONFIG_IP_SCTP=m
-# CONFIG_SCTP_DBG_MSG is not set
-# CONFIG_SCTP_DBG_OBJCNT is not set
-# CONFIG_SCTP_HMAC_NONE is not set
-CONFIG_SCTP_HMAC_SHA1=y
-# CONFIG_SCTP_HMAC_MD5 is not set
-# CONFIG_RDS is not set
-# CONFIG_TIPC is not set
-CONFIG_ATM=m
-CONFIG_ATM_CLIP=m
-# CONFIG_ATM_CLIP_NO_ICMP is not set
-CONFIG_ATM_LANE=m
-CONFIG_ATM_MPOA=m
-CONFIG_ATM_BR2684=m
-# CONFIG_ATM_BR2684_IPFILTER is not set
-CONFIG_STP=m
-CONFIG_BRIDGE=m
-# CONFIG_NET_DSA is not set
-CONFIG_VLAN_8021Q=m
-# CONFIG_VLAN_8021Q_GVRP is not set
-# CONFIG_DECNET is not set
-CONFIG_LLC=m
-CONFIG_LLC2=m
-CONFIG_IPX=m
-# CONFIG_IPX_INTERN is not set
-CONFIG_ATALK=m
-CONFIG_DEV_APPLETALK=m
-CONFIG_LTPC=m
-CONFIG_COPS=m
-CONFIG_COPS_DAYNA=y
-CONFIG_COPS_TANGENT=y
-CONFIG_IPDDP=m
-CONFIG_IPDDP_ENCAP=y
-CONFIG_IPDDP_DECAP=y
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-CONFIG_PHONET=m
-CONFIG_IEEE802154=m
-CONFIG_NET_SCHED=y
-
-#
-# Queueing/Scheduling
-#
-CONFIG_NET_SCH_CBQ=m
-CONFIG_NET_SCH_HTB=m
-CONFIG_NET_SCH_HFSC=m
-CONFIG_NET_SCH_ATM=m
-CONFIG_NET_SCH_PRIO=m
-CONFIG_NET_SCH_MULTIQ=m
-CONFIG_NET_SCH_RED=m
-CONFIG_NET_SCH_SFQ=m
-CONFIG_NET_SCH_TEQL=m
-CONFIG_NET_SCH_TBF=m
-CONFIG_NET_SCH_GRED=m
-CONFIG_NET_SCH_DSMARK=m
-CONFIG_NET_SCH_NETEM=m
-CONFIG_NET_SCH_DRR=m
-CONFIG_NET_SCH_INGRESS=m
-
-#
-# Classification
-#
-CONFIG_NET_CLS=y
-CONFIG_NET_CLS_BASIC=m
-CONFIG_NET_CLS_TCINDEX=m
-CONFIG_NET_CLS_ROUTE4=m
-CONFIG_NET_CLS_ROUTE=y
-CONFIG_NET_CLS_FW=m
-CONFIG_NET_CLS_U32=m
-# CONFIG_CLS_U32_PERF is not set
-# CONFIG_CLS_U32_MARK is not set
-CONFIG_NET_CLS_RSVP=m
-CONFIG_NET_CLS_RSVP6=m
-CONFIG_NET_CLS_FLOW=m
-CONFIG_NET_CLS_CGROUP=y
-# CONFIG_NET_EMATCH is not set
-CONFIG_NET_CLS_ACT=y
-CONFIG_NET_ACT_POLICE=m
-CONFIG_NET_ACT_GACT=m
-CONFIG_GACT_PROB=y
-CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
-CONFIG_NET_ACT_NAT=m
-CONFIG_NET_ACT_PEDIT=m
-CONFIG_NET_ACT_SIMP=m
-CONFIG_NET_ACT_SKBEDIT=m
-CONFIG_NET_CLS_IND=y
-CONFIG_NET_SCH_FIFO=y
-# CONFIG_DCB is not set
-
-#
-# Network testing
-#
-CONFIG_NET_PKTGEN=m
-CONFIG_NET_DROP_MONITOR=y
-# CONFIG_HAMRADIO is not set
-# CONFIG_CAN is not set
-CONFIG_IRDA=m
-
-#
-# IrDA protocols
-#
-CONFIG_IRLAN=m
-CONFIG_IRNET=m
-CONFIG_IRCOMM=m
-CONFIG_IRDA_ULTRA=y
-
-#
-# IrDA options
-#
-CONFIG_IRDA_CACHE_LAST_LSAP=y
-CONFIG_IRDA_FAST_RR=y
-# CONFIG_IRDA_DEBUG is not set
-
-#
-# Infrared-port device drivers
-#
-
-#
-# SIR device drivers
-#
-CONFIG_IRTTY_SIR=m
-
-#
-# Dongle support
-#
-CONFIG_DONGLE=y
-CONFIG_ESI_DONGLE=m
-CONFIG_ACTISYS_DONGLE=m
-CONFIG_TEKRAM_DONGLE=m
-CONFIG_TOIM3232_DONGLE=m
-CONFIG_LITELINK_DONGLE=m
-CONFIG_MA600_DONGLE=m
-CONFIG_GIRBIL_DONGLE=m
-CONFIG_MCP2120_DONGLE=m
-CONFIG_OLD_BELKIN_DONGLE=m
-CONFIG_ACT200L_DONGLE=m
-CONFIG_KINGSUN_DONGLE=m
-CONFIG_KSDAZZLE_DONGLE=m
-CONFIG_KS959_DONGLE=m
-
-#
-# FIR device drivers
-#
-CONFIG_USB_IRDA=m
-CONFIG_SIGMATEL_FIR=m
-CONFIG_NSC_FIR=m
-CONFIG_WINBOND_FIR=m
-CONFIG_TOSHIBA_FIR=m
-CONFIG_SMC_IRCC_FIR=m
-CONFIG_ALI_FIR=m
-CONFIG_VLSI_FIR=m
-CONFIG_VIA_FIR=m
-CONFIG_MCS_FIR=m
-CONFIG_BT=m
-CONFIG_BT_L2CAP=m
-CONFIG_BT_SCO=m
-CONFIG_BT_RFCOMM=m
-CONFIG_BT_RFCOMM_TTY=y
-CONFIG_BT_BNEP=m
-# CONFIG_BT_BNEP_MC_FILTER is not set
-# CONFIG_BT_BNEP_PROTO_FILTER is not set
-# CONFIG_BT_CMTP is not set
-CONFIG_BT_HIDP=m
-
-#
-# Bluetooth device drivers
-#
-CONFIG_BT_HCIBTUSB=m
-CONFIG_BT_HCIBTSDIO=m
-CONFIG_BT_HCIUART=m
-CONFIG_BT_HCIUART_H4=y
-CONFIG_BT_HCIUART_BCSP=y
-CONFIG_BT_HCIUART_LL=y
-CONFIG_BT_HCIBCM203X=m
-CONFIG_BT_HCIBPA10X=m
-CONFIG_BT_HCIBFUSB=m
-CONFIG_BT_HCIDTL1=m
-CONFIG_BT_HCIBT3C=m
-CONFIG_BT_HCIBLUECARD=m
-CONFIG_BT_HCIBTUART=m
-CONFIG_BT_HCIVHCI=m
-CONFIG_BT_MRVL=m
-CONFIG_BT_MRVL_SDIO=m
-CONFIG_AF_RXRPC=m
-# CONFIG_AF_RXRPC_DEBUG is not set
-CONFIG_RXKAD=m
-CONFIG_FIB_RULES=y
-CONFIG_WIRELESS=y
-CONFIG_CFG80211=m
-# CONFIG_NL80211_TESTMODE is not set
-# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
-# CONFIG_CFG80211_REG_DEBUG is not set
-CONFIG_CFG80211_DEFAULT_PS=y
-CONFIG_CFG80211_DEFAULT_PS_VALUE=1
-# CONFIG_CFG80211_DEBUGFS is not set
-# CONFIG_WIRELESS_OLD_REGULATORY is not set
-CONFIG_WIRELESS_EXT=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_LIB80211=m
-CONFIG_LIB80211_CRYPT_WEP=m
-CONFIG_LIB80211_CRYPT_CCMP=m
-CONFIG_LIB80211_CRYPT_TKIP=m
-# CONFIG_LIB80211_DEBUG is not set
-CONFIG_MAC80211=m
-CONFIG_MAC80211_HAS_RC=y
-CONFIG_MAC80211_RC_MINSTREL=y
-# CONFIG_MAC80211_RC_DEFAULT_PID is not set
-CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
-CONFIG_MAC80211_RC_DEFAULT="minstrel"
-CONFIG_MAC80211_MESH=y
-CONFIG_MAC80211_LEDS=y
-# CONFIG_MAC80211_DEBUGFS is not set
-# CONFIG_MAC80211_DEBUG_MENU is not set
-CONFIG_WIMAX=m
-CONFIG_WIMAX_DEBUG_LEVEL=8
-CONFIG_RFKILL=m
-CONFIG_RFKILL_LEDS=y
-CONFIG_RFKILL_INPUT=y
-CONFIG_NET_9P=m
-CONFIG_NET_9P_VIRTIO=m
-# CONFIG_NET_9P_DEBUG is not set
-
-#
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_UEVENT_HELPER_PATH=""
-CONFIG_DEVTMPFS=y
-# CONFIG_DEVTMPFS_MOUNT is not set
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-CONFIG_FW_LOADER=y
-CONFIG_FIRMWARE_IN_KERNEL=y
-CONFIG_EXTRA_FIRMWARE=""
-# CONFIG_DEBUG_DRIVER is not set
-# CONFIG_DEBUG_DEVRES is not set
-# CONFIG_SYS_HYPERVISOR is not set
-CONFIG_CONNECTOR=m
-CONFIG_MTD=m
-# CONFIG_MTD_DEBUG is not set
-CONFIG_MTD_TESTS=m
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-# CONFIG_MTD_AR7_PARTS is not set
-
-#
-# User Modules And Translation Layers
-#
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-# CONFIG_MTD_BLOCK_RO is not set
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
-# CONFIG_RFD_FTL is not set
-# CONFIG_SSFDC is not set
-# CONFIG_MTD_OOPS is not set
-
-#
-# RAM/ROM/Flash chip drivers
-#
-# CONFIG_MTD_CFI is not set
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_RAM=m
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-
-#
-# Mapping drivers for chip access
-#
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_TS5500 is not set
-# CONFIG_MTD_INTEL_VR_NOR is not set
-CONFIG_MTD_PLATRAM=m
-
-#
-# Self-contained MTD device drivers
-#
-# CONFIG_MTD_PMC551 is not set
-# CONFIG_MTD_DATAFLASH is not set
-# CONFIG_MTD_M25P80 is not set
-CONFIG_MTD_SST25L=m
-CONFIG_MTD_SLRAM=m
-CONFIG_MTD_PHRAM=m
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLOCK2MTD is not set
-
-#
-# Disk-On-Chip Device Drivers
-#
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
-# CONFIG_MTD_NAND is not set
-# CONFIG_MTD_ONENAND is not set
-
-#
-# LPDDR flash memory drivers
-#
-# CONFIG_MTD_LPDDR is not set
-
-#
-# UBI - Unsorted block images
-#
-# CONFIG_MTD_UBI is not set
-CONFIG_PARPORT=m
-CONFIG_PARPORT_PC=m
-CONFIG_PARPORT_SERIAL=m
-CONFIG_PARPORT_PC_FIFO=y
-CONFIG_PARPORT_PC_SUPERIO=y
-CONFIG_PARPORT_PC_PCMCIA=m
-# CONFIG_PARPORT_GSC is not set
-CONFIG_PARPORT_AX88796=m
-CONFIG_PARPORT_1284=y
-CONFIG_PARPORT_NOT_PC=y
-CONFIG_PNP=y
-# CONFIG_PNP_DEBUG_MESSAGES is not set
-
-#
-# Protocols
-#
-CONFIG_ISAPNP=y
-# CONFIG_PNPBIOS is not set
-CONFIG_PNPACPI=y
-CONFIG_BLK_DEV=y
-CONFIG_BLK_DEV_FD=m
-# CONFIG_BLK_DEV_XD is not set
-# CONFIG_PARIDE is not set
-CONFIG_BLK_CPQ_DA=m
-CONFIG_BLK_CPQ_CISS_DA=m
-# CONFIG_CISS_SCSI_TAPE is not set
-CONFIG_BLK_DEV_DAC960=m
-# CONFIG_BLK_DEV_UMEM is not set
-# CONFIG_BLK_DEV_COW_COMMON is not set
-CONFIG_BLK_DEV_LOOP=m
-CONFIG_BLK_DEV_CRYPTOLOOP=m
-CONFIG_BLK_DEV_NBD=m
-CONFIG_BLK_DEV_OSD=m
-CONFIG_BLK_DEV_SX8=m
-# CONFIG_BLK_DEV_UB is not set
-CONFIG_BLK_DEV_RAM=m
-CONFIG_BLK_DEV_RAM_COUNT=16
-CONFIG_BLK_DEV_RAM_SIZE=16384
-# CONFIG_BLK_DEV_XIP is not set
-CONFIG_CDROM_PKTCDVD=m
-CONFIG_CDROM_PKTCDVD_BUFFERS=8
-# CONFIG_CDROM_PKTCDVD_WCACHE is not set
-CONFIG_ATA_OVER_ETH=m
-CONFIG_VIRTIO_BLK=m
-# CONFIG_BLK_DEV_HD is not set
-CONFIG_MISC_DEVICES=y
-# CONFIG_IBM_ASM is not set
-CONFIG_PHANTOM=m
-CONFIG_SGI_IOC4=m
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
-CONFIG_ICS932S401=m
-CONFIG_ENCLOSURE_SERVICES=m
-CONFIG_HP_ILO=m
-CONFIG_DELL_LAPTOP=m
-CONFIG_ISL29003=m
-CONFIG_C2PORT=m
-CONFIG_C2PORT_DURAMAR_2150=m
-
-#
-# EEPROM support
-#
-CONFIG_EEPROM_AT24=m
-CONFIG_EEPROM_AT25=m
-CONFIG_EEPROM_LEGACY=m
-CONFIG_EEPROM_MAX6875=m
-CONFIG_EEPROM_93CX6=m
-CONFIG_CB710_CORE=m
-# CONFIG_CB710_DEBUG is not set
-CONFIG_CB710_DEBUG_ASSUMPTIONS=y
-CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
-
-#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-CONFIG_IDE_LEGACY=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_CS5536=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=m
-CONFIG_BLK_DEV_ALI14XX=m
-CONFIG_BLK_DEV_DTC2278=m
-CONFIG_BLK_DEV_HT6560B=m
-CONFIG_BLK_DEV_QD65XX=m
-CONFIG_BLK_DEV_UMC8672=m
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
-# SCSI device support
-#
-CONFIG_RAID_ATTRS=m
-CONFIG_SCSI=m
-CONFIG_SCSI_DMA=y
-CONFIG_SCSI_TGT=m
-CONFIG_SCSI_NETLINK=y
-CONFIG_SCSI_PROC_FS=y
-
-#
-# SCSI support type (disk, tape, CD-ROM)
-#
-CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
-CONFIG_CHR_DEV_OSST=m
-CONFIG_BLK_DEV_SR=m
-CONFIG_BLK_DEV_SR_VENDOR=y
-CONFIG_CHR_DEV_SG=m
-CONFIG_CHR_DEV_SCH=m
-CONFIG_SCSI_ENCLOSURE=m
-CONFIG_SCSI_MULTI_LUN=y
-# CONFIG_SCSI_CONSTANTS is not set
-# CONFIG_SCSI_LOGGING is not set
-# CONFIG_SCSI_SCAN_ASYNC is not set
-CONFIG_SCSI_WAIT_SCAN=m
-
-#
-# SCSI Transports
-#
-CONFIG_SCSI_SPI_ATTRS=m
-CONFIG_SCSI_FC_ATTRS=m
-# CONFIG_SCSI_FC_TGT_ATTRS is not set
-CONFIG_SCSI_ISCSI_ATTRS=m
-CONFIG_SCSI_SAS_ATTRS=m
-CONFIG_SCSI_SAS_LIBSAS=m
-CONFIG_SCSI_SAS_ATA=y
-CONFIG_SCSI_SAS_HOST_SMP=y
-# CONFIG_SCSI_SAS_LIBSAS_DEBUG is not set
-CONFIG_SCSI_SRP_ATTRS=m
-CONFIG_SCSI_SRP_TGT_ATTRS=y
-CONFIG_SCSI_LOWLEVEL=y
-CONFIG_ISCSI_TCP=m
-CONFIG_SCSI_CXGB3_ISCSI=m
-CONFIG_SCSI_BNX2_ISCSI=m
-CONFIG_BE2ISCSI=m
-CONFIG_BLK_DEV_3W_XXXX_RAID=m
-CONFIG_SCSI_3W_9XXX=m
-CONFIG_SCSI_7000FASST=m
-CONFIG_SCSI_ACARD=m
-CONFIG_SCSI_AHA152X=m
-CONFIG_SCSI_AHA1542=m
-CONFIG_SCSI_AACRAID=m
-CONFIG_SCSI_AIC7XXX=m
-CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
-CONFIG_AIC7XXX_RESET_DELAY_MS=15000
-# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
-CONFIG_AIC7XXX_DEBUG_MASK=0
-CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
-# CONFIG_SCSI_AIC7XXX_OLD is not set
-CONFIG_SCSI_AIC79XX=m
-CONFIG_AIC79XX_CMDS_PER_DEVICE=32
-CONFIG_AIC79XX_RESET_DELAY_MS=15000
-# CONFIG_AIC79XX_DEBUG_ENABLE is not set
-CONFIG_AIC79XX_DEBUG_MASK=0
-CONFIG_AIC79XX_REG_PRETTY_PRINT=y
-CONFIG_SCSI_AIC94XX=m
-# CONFIG_AIC94XX_DEBUG is not set
-CONFIG_SCSI_MVSAS=m
-# CONFIG_SCSI_MVSAS_DEBUG is not set
-CONFIG_SCSI_DPT_I2O=m
-CONFIG_SCSI_ADVANSYS=m
-CONFIG_SCSI_IN2000=m
-CONFIG_SCSI_ARCMSR=m
-CONFIG_SCSI_ARCMSR_AER=y
-CONFIG_MEGARAID_NEWGEN=y
-CONFIG_MEGARAID_MM=m
-CONFIG_MEGARAID_MAILBOX=m
-CONFIG_MEGARAID_LEGACY=m
-CONFIG_MEGARAID_SAS=m
-CONFIG_SCSI_MPT2SAS=m
-CONFIG_SCSI_MPT2SAS_MAX_SGE=128
-# CONFIG_SCSI_MPT2SAS_LOGGING is not set
-CONFIG_SCSI_HPTIOP=m
-CONFIG_SCSI_BUSLOGIC=m
-# CONFIG_SCSI_FLASHPOINT is not set
-CONFIG_LIBFC=m
-CONFIG_LIBFCOE=m
-CONFIG_FCOE=m
-CONFIG_FCOE_FNIC=m
-CONFIG_SCSI_DMX3191D=m
-CONFIG_SCSI_DTC3280=m
-CONFIG_SCSI_EATA=m
-# CONFIG_SCSI_EATA_TAGGED_QUEUE is not set
-# CONFIG_SCSI_EATA_LINKED_COMMANDS is not set
-CONFIG_SCSI_EATA_MAX_TAGS=16
-CONFIG_SCSI_FUTURE_DOMAIN=m
-CONFIG_SCSI_GDTH=m
-CONFIG_SCSI_GENERIC_NCR5380=m
-CONFIG_SCSI_GENERIC_NCR5380_MMIO=m
-CONFIG_SCSI_GENERIC_NCR53C400=y
-CONFIG_SCSI_IPS=m
-CONFIG_SCSI_INITIO=m
-CONFIG_SCSI_INIA100=m
-CONFIG_SCSI_PPA=m
-CONFIG_SCSI_IMM=m
-# CONFIG_SCSI_IZIP_EPP16 is not set
-# CONFIG_SCSI_IZIP_SLOW_CTR is not set
-CONFIG_SCSI_NCR53C406A=m
-CONFIG_SCSI_STEX=m
-CONFIG_SCSI_SYM53C8XX_2=m
-CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
-CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
-CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
-CONFIG_SCSI_SYM53C8XX_MMIO=y
-CONFIG_SCSI_IPR=m
-# CONFIG_SCSI_IPR_TRACE is not set
-# CONFIG_SCSI_IPR_DUMP is not set
-CONFIG_SCSI_PAS16=m
-CONFIG_SCSI_QLOGIC_FAS=m
-CONFIG_SCSI_QLOGIC_1280=m
-CONFIG_SCSI_QLA_FC=m
-CONFIG_SCSI_QLA_ISCSI=m
-CONFIG_SCSI_LPFC=m
-# CONFIG_SCSI_LPFC_DEBUG_FS is not set
-CONFIG_SCSI_SYM53C416=m
-CONFIG_SCSI_DC395x=m
-CONFIG_SCSI_DC390T=m
-CONFIG_SCSI_T128=m
-CONFIG_SCSI_U14_34F=m
-# CONFIG_SCSI_U14_34F_TAGGED_QUEUE is not set
-# CONFIG_SCSI_U14_34F_LINKED_COMMANDS is not set
-CONFIG_SCSI_U14_34F_MAX_TAGS=8
-CONFIG_SCSI_ULTRASTOR=m
-CONFIG_SCSI_NSP32=m
-# CONFIG_SCSI_DEBUG is not set
-CONFIG_SCSI_PMCRAID=m
-CONFIG_SCSI_SRP=m
-CONFIG_SCSI_BFA_FC=m
-CONFIG_SCSI_LOWLEVEL_PCMCIA=y
-CONFIG_PCMCIA_AHA152X=m
-CONFIG_PCMCIA_FDOMAIN=m
-CONFIG_PCMCIA_NINJA_SCSI=m
-CONFIG_PCMCIA_QLOGIC=m
-CONFIG_PCMCIA_SYM53C500=m
-CONFIG_SCSI_DH=m
-CONFIG_SCSI_DH_RDAC=m
-CONFIG_SCSI_DH_HP_SW=m
-CONFIG_SCSI_DH_EMC=m
-CONFIG_SCSI_DH_ALUA=m
-CONFIG_SCSI_OSD_INITIATOR=m
-CONFIG_SCSI_OSD_ULD=m
-CONFIG_SCSI_OSD_DPRINT_SENSE=0
-# CONFIG_SCSI_OSD_DEBUG is not set
-CONFIG_ATA=m
-# CONFIG_ATA_NONSTANDARD is not set
-CONFIG_ATA_VERBOSE_ERROR=y
-CONFIG_ATA_ACPI=y
-CONFIG_SATA_PMP=y
-CONFIG_SATA_AHCI=m
-CONFIG_SATA_SIL24=m
-CONFIG_ATA_SFF=y
-CONFIG_SATA_SVW=m
-CONFIG_ATA_PIIX=m
-CONFIG_SATA_MV=m
-CONFIG_SATA_NV=m
-CONFIG_PDC_ADMA=m
-CONFIG_SATA_QSTOR=m
-CONFIG_SATA_PROMISE=m
-CONFIG_SATA_SX4=m
-CONFIG_SATA_SIL=m
-CONFIG_SATA_SIS=m
-CONFIG_SATA_ULI=m
-CONFIG_SATA_VIA=m
-CONFIG_SATA_VITESSE=m
-CONFIG_SATA_INIC162X=m
-CONFIG_PATA_ACPI=m
-CONFIG_PATA_ALI=m
-CONFIG_PATA_AMD=m
-CONFIG_PATA_ARTOP=m
-CONFIG_PATA_ATP867X=m
-CONFIG_PATA_ATIIXP=m
-CONFIG_PATA_CMD640_PCI=m
-CONFIG_PATA_CMD64X=m
-CONFIG_PATA_CS5520=m
-CONFIG_PATA_CS5530=m
-CONFIG_PATA_CS5535=m
-CONFIG_PATA_CS5536=m
-CONFIG_PATA_CYPRESS=m
-CONFIG_PATA_EFAR=m
-CONFIG_ATA_GENERIC=m
-CONFIG_PATA_HPT366=m
-CONFIG_PATA_HPT37X=m
-CONFIG_PATA_HPT3X2N=m
-CONFIG_PATA_HPT3X3=m
-# CONFIG_PATA_HPT3X3_DMA is not set
-CONFIG_PATA_ISAPNP=m
-CONFIG_PATA_IT821X=m
-CONFIG_PATA_IT8213=m
-CONFIG_PATA_JMICRON=m
-CONFIG_PATA_LEGACY=m
-CONFIG_PATA_TRIFLEX=m
-CONFIG_PATA_MARVELL=m
-CONFIG_PATA_MPIIX=m
-CONFIG_PATA_OLDPIIX=m
-CONFIG_PATA_NETCELL=m
-CONFIG_PATA_NINJA32=m
-CONFIG_PATA_NS87410=m
-CONFIG_PATA_NS87415=m
-CONFIG_PATA_OPTI=m
-CONFIG_PATA_OPTIDMA=m
-CONFIG_PATA_PCMCIA=m
-CONFIG_PATA_PDC_OLD=m
-CONFIG_PATA_QDI=m
-CONFIG_PATA_RADISYS=m
-CONFIG_PATA_RDC=m
-CONFIG_PATA_RZ1000=m
-CONFIG_PATA_SC1200=m
-CONFIG_PATA_SERVERWORKS=m
-CONFIG_PATA_PDC2027X=m
-CONFIG_PATA_SIL680=m
-CONFIG_PATA_SIS=m
-CONFIG_PATA_VIA=m
-CONFIG_PATA_WINBOND=m
-CONFIG_PATA_WINBOND_VLB=m
-CONFIG_PATA_SCH=m
-CONFIG_MD=y
-CONFIG_BLK_DEV_MD=m
-CONFIG_MD_LINEAR=m
-CONFIG_MD_RAID0=m
-CONFIG_MD_RAID1=m
-CONFIG_MD_RAID10=m
-CONFIG_MD_RAID456=m
-# CONFIG_MULTICORE_RAID456 is not set
-CONFIG_MD_RAID6_PQ=m
-CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_MD_MULTIPATH=m
-CONFIG_MD_FAULTY=m
-CONFIG_BLK_DEV_DM=m
-# CONFIG_DM_DEBUG is not set
-CONFIG_DM_CRYPT=m
-CONFIG_DM_SNAPSHOT=m
-CONFIG_DM_MIRROR=m
-CONFIG_DM_LOG_USERSPACE=m
-CONFIG_DM_ZERO=m
-CONFIG_DM_MULTIPATH=m
-CONFIG_DM_MULTIPATH_QL=m
-CONFIG_DM_MULTIPATH_ST=m
-CONFIG_DM_DELAY=m
-CONFIG_DM_UEVENT=y
-CONFIG_FUSION=y
-CONFIG_FUSION_SPI=m
-CONFIG_FUSION_FC=m
-CONFIG_FUSION_SAS=m
-CONFIG_FUSION_MAX_SGE=128
-CONFIG_FUSION_CTL=m
-# CONFIG_FUSION_LOGGING is not set
-
-#
-# IEEE 1394 (FireWire) support
-#
-
-#
-# You can enable one or both FireWire driver stacks.
-#
-
-#
-# See the help texts for more information.
-#
-CONFIG_FIREWIRE=m
-CONFIG_FIREWIRE_OHCI=m
-CONFIG_FIREWIRE_OHCI_DEBUG=y
-CONFIG_FIREWIRE_SBP2=m
-CONFIG_FIREWIRE_NET=m
-# CONFIG_IEEE1394 is not set
-CONFIG_I2O=m
-CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
-CONFIG_I2O_EXT_ADAPTEC=y
-CONFIG_I2O_CONFIG=m
-CONFIG_I2O_CONFIG_OLD_IOCTL=y
-CONFIG_I2O_BUS=m
-CONFIG_I2O_BLOCK=m
-CONFIG_I2O_SCSI=m
-CONFIG_I2O_PROC=m
-CONFIG_MACINTOSH_DRIVERS=y
-CONFIG_MAC_EMUMOUSEBTN=y
-CONFIG_NETDEVICES=y
-CONFIG_IFB=m
-CONFIG_DUMMY=m
-CONFIG_BONDING=m
-CONFIG_MACVLAN=m
-CONFIG_EQUALIZER=m
-CONFIG_TUN=m
-CONFIG_VETH=m
-CONFIG_NET_SB1000=m
-# CONFIG_ARCNET is not set
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-# CONFIG_MDIO_BITBANG is not set
-CONFIG_NET_ETHERNET=y
-CONFIG_MII=m
-CONFIG_HAPPYMEAL=m
-CONFIG_SUNGEM=m
-CONFIG_CASSINI=m
-CONFIG_NET_VENDOR_3COM=y
-CONFIG_EL1=m
-CONFIG_EL2=m
-CONFIG_ELPLUS=m
-CONFIG_EL16=m
-CONFIG_EL3=m
-CONFIG_3C515=m
-CONFIG_VORTEX=m
-CONFIG_TYPHOON=m
-CONFIG_LANCE=m
-CONFIG_NET_VENDOR_SMC=y
-CONFIG_WD80x3=m
-CONFIG_ULTRA=m
-CONFIG_SMC9194=m
-CONFIG_ENC28J60=m
-# CONFIG_ENC28J60_WRITEVERIFY is not set
-CONFIG_ETHOC=m
-CONFIG_NET_VENDOR_RACAL=y
-CONFIG_NI52=m
-CONFIG_NI65=m
-CONFIG_DNET=m
-CONFIG_NET_TULIP=y
-CONFIG_DE2104X=m
-CONFIG_DE2104X_DSL=0
-CONFIG_TULIP=m
-# CONFIG_TULIP_MWI is not set
-# CONFIG_TULIP_MMIO is not set
-# CONFIG_TULIP_NAPI is not set
-CONFIG_DE4X5=m
-CONFIG_WINBOND_840=m
-CONFIG_DM9102=m
-CONFIG_ULI526X=m
-CONFIG_PCMCIA_XIRCOM=m
-CONFIG_AT1700=m
-CONFIG_DEPCA=m
-CONFIG_HP100=m
-CONFIG_NET_ISA=y
-CONFIG_E2100=m
-CONFIG_EWRK3=m
-CONFIG_EEXPRESS=m
-CONFIG_EEXPRESS_PRO=m
-CONFIG_HPLAN_PLUS=m
-CONFIG_HPLAN=m
-CONFIG_LP486E=m
-CONFIG_ETH16I=m
-CONFIG_NE2000=m
-CONFIG_ZNET=m
-CONFIG_SEEQ8005=m
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set
-# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set
-# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set
-CONFIG_NET_PCI=y
-CONFIG_PCNET32=m
-CONFIG_AMD8111_ETH=m
-CONFIG_ADAPTEC_STARFIRE=m
-CONFIG_AC3200=m
-CONFIG_APRICOT=m
-CONFIG_B44=m
-CONFIG_B44_PCI_AUTOSELECT=y
-CONFIG_B44_PCICORE_AUTOSELECT=y
-CONFIG_B44_PCI=y
-CONFIG_FORCEDETH=m
-# CONFIG_FORCEDETH_NAPI is not set
-CONFIG_CS89x0=m
-CONFIG_E100=m
-CONFIG_FEALNX=m
-CONFIG_NATSEMI=m
-CONFIG_NE2K_PCI=m
-CONFIG_8139CP=m
-CONFIG_8139TOO=m
-# CONFIG_8139TOO_PIO is not set
-CONFIG_8139TOO_TUNE_TWISTER=y
-CONFIG_8139TOO_8129=y
-# CONFIG_8139_OLD_RX_RESET is not set
-CONFIG_R6040=m
-CONFIG_SIS900=m
-CONFIG_EPIC100=m
-CONFIG_SMSC9420=m
-CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
-CONFIG_TLAN=m
-CONFIG_KS8842=m
-CONFIG_KS8851=m
-CONFIG_KS8851_MLL=m
-CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
-CONFIG_SC92031=m
-CONFIG_NET_POCKET=y
-CONFIG_ATP=m
-CONFIG_DE600=m
-CONFIG_DE620=m
-CONFIG_ATL2=m
-CONFIG_NETDEV_1000=y
-CONFIG_ACENIC=m
-# CONFIG_ACENIC_OMIT_TIGON_I is not set
-CONFIG_DL2K=m
-CONFIG_E1000=m
-CONFIG_E1000E=m
-CONFIG_IP1000=m
-CONFIG_IGB=m
-CONFIG_IGB_DCA=y
-CONFIG_IGBVF=m
-CONFIG_NS83820=m
-CONFIG_HAMACHI=m
-CONFIG_YELLOWFIN=m
-CONFIG_R8169=m
-# CONFIG_R8169_VLAN is not set
-CONFIG_SIS190=m
-CONFIG_SKGE=m
-# CONFIG_SKGE_DEBUG is not set
-CONFIG_SKY2=m
-# CONFIG_SKY2_DEBUG is not set
-CONFIG_VIA_VELOCITY=m
-CONFIG_TIGON3=m
-CONFIG_BNX2=m
-CONFIG_CNIC=m
-CONFIG_QLA3XXX=m
-CONFIG_ATL1=m
-CONFIG_ATL1E=m
-CONFIG_ATL1C=m
-CONFIG_JME=m
-CONFIG_NETDEV_10000=y
-CONFIG_MDIO=m
-CONFIG_CHELSIO_T1=m
-CONFIG_CHELSIO_T1_1G=y
-CONFIG_CHELSIO_T3_DEPENDS=y
-CONFIG_CHELSIO_T3=m
-CONFIG_ENIC=m
-CONFIG_IXGBE=m
-CONFIG_IXGBE_DCA=y
-CONFIG_IXGB=m
-CONFIG_S2IO=m
-CONFIG_VXGE=m
-# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
-CONFIG_MYRI10GE=m
-CONFIG_MYRI10GE_DCA=y
-CONFIG_NETXEN_NIC=m
-CONFIG_NIU=m
-CONFIG_MLX4_EN=m
-CONFIG_MLX4_CORE=m
-CONFIG_MLX4_DEBUG=y
-CONFIG_TEHUTI=m
-CONFIG_BNX2X=m
-CONFIG_QLGE=m
-CONFIG_SFC=m
-CONFIG_SFC_MTD=y
-CONFIG_BE2NET=m
-# CONFIG_TR is not set
-CONFIG_WLAN=y
-# CONFIG_WLAN_PRE80211 is not set
-CONFIG_WLAN_80211=y
-CONFIG_PCMCIA_RAYCS=m
-CONFIG_LIBERTAS=m
-CONFIG_LIBERTAS_USB=m
-CONFIG_LIBERTAS_CS=m
-CONFIG_LIBERTAS_SDIO=m
-CONFIG_LIBERTAS_SPI=m
-# CONFIG_LIBERTAS_DEBUG is not set
-CONFIG_LIBERTAS_THINFIRM=m
-CONFIG_LIBERTAS_THINFIRM_USB=m
-CONFIG_AIRO=m
-CONFIG_ATMEL=m
-CONFIG_PCI_ATMEL=m
-CONFIG_PCMCIA_ATMEL=m
-CONFIG_AT76C50X_USB=m
-CONFIG_AIRO_CS=m
-CONFIG_PCMCIA_WL3501=m
-CONFIG_PRISM54=m
-CONFIG_USB_ZD1201=m
-CONFIG_USB_NET_RNDIS_WLAN=m
-CONFIG_RTL8180=m
-CONFIG_RTL8187=m
-CONFIG_RTL8187_LEDS=y
-CONFIG_ADM8211=m
-# CONFIG_MAC80211_HWSIM is not set
-CONFIG_MWL8K=m
-CONFIG_P54_COMMON=m
-CONFIG_P54_USB=m
-CONFIG_P54_PCI=m
-CONFIG_P54_SPI=m
-CONFIG_P54_LEDS=y
-CONFIG_ATH_COMMON=m
-CONFIG_ATH5K=m
-# CONFIG_ATH5K_DEBUG is not set
-CONFIG_ATH9K=m
-# CONFIG_ATH9K_DEBUG is not set
-CONFIG_AR9170_USB=m
-CONFIG_AR9170_LEDS=y
-CONFIG_IPW2100=m
-CONFIG_IPW2100_MONITOR=y
-# CONFIG_IPW2100_DEBUG is not set
-CONFIG_IPW2200=m
-CONFIG_IPW2200_MONITOR=y
-CONFIG_IPW2200_RADIOTAP=y
-CONFIG_IPW2200_PROMISCUOUS=y
-CONFIG_IPW2200_QOS=y
-# CONFIG_IPW2200_DEBUG is not set
-CONFIG_LIBIPW=m
-# CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-CONFIG_IWLWIFI_LEDS=y
-CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT=y
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-CONFIG_IWL3945_SPECTRUM_MEASUREMENT=y
-CONFIG_HOSTAP=m
-CONFIG_HOSTAP_FIRMWARE=y
-# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
-CONFIG_HOSTAP_PLX=m
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_CS=m
-CONFIG_B43=m
-CONFIG_B43_PCI_AUTOSELECT=y
-CONFIG_B43_PCICORE_AUTOSELECT=y
-CONFIG_B43_PCMCIA=y
-CONFIG_B43_SDIO=y
-CONFIG_B43_PIO=y
-CONFIG_B43_PHY_LP=y
-CONFIG_B43_LEDS=y
-CONFIG_B43_HWRNG=y
-# CONFIG_B43_DEBUG is not set
-CONFIG_B43LEGACY=m
-CONFIG_B43LEGACY_PCI_AUTOSELECT=y
-CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
-CONFIG_B43LEGACY_LEDS=y
-CONFIG_B43LEGACY_HWRNG=y
-# CONFIG_B43LEGACY_DEBUG is not set
-CONFIG_B43LEGACY_DMA=y
-CONFIG_B43LEGACY_PIO=y
-CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
-# CONFIG_B43LEGACY_DMA_MODE is not set
-# CONFIG_B43LEGACY_PIO_MODE is not set
-CONFIG_ZD1211RW=m
-# CONFIG_ZD1211RW_DEBUG is not set
-CONFIG_RT2X00=m
-CONFIG_RT2400PCI=m
-CONFIG_RT2500PCI=m
-CONFIG_RT61PCI=m
-CONFIG_RT2500USB=m
-CONFIG_RT73USB=m
-CONFIG_RT2800USB=m
-CONFIG_RT2X00_LIB_PCI=m
-CONFIG_RT2X00_LIB_USB=m
-CONFIG_RT2X00_LIB=m
-CONFIG_RT2X00_LIB_HT=y
-CONFIG_RT2X00_LIB_FIRMWARE=y
-CONFIG_RT2X00_LIB_CRYPTO=y
-CONFIG_RT2X00_LIB_LEDS=y
-# CONFIG_RT2X00_DEBUG is not set
-CONFIG_HERMES=m
-CONFIG_HERMES_CACHE_FW_ON_INIT=y
-CONFIG_PLX_HERMES=m
-CONFIG_TMD_HERMES=m
-CONFIG_NORTEL_HERMES=m
-CONFIG_PCI_HERMES=m
-CONFIG_PCMCIA_HERMES=m
-CONFIG_PCMCIA_SPECTRUM=m
-CONFIG_WL12XX=m
-CONFIG_WL1251=m
-CONFIG_WL1251_SPI=m
-CONFIG_WL1251_SDIO=m
-CONFIG_WL1271=m
-CONFIG_IWM=m
-# CONFIG_IWM_DEBUG is not set
-
-#
-# WiMAX Wireless Broadband devices
-#
-CONFIG_WIMAX_I2400M=m
-CONFIG_WIMAX_I2400M_USB=m
-CONFIG_WIMAX_I2400M_SDIO=m
-CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
-
-#
-# USB Network Adapters
-#
-CONFIG_USB_CATC=m
-CONFIG_USB_KAWETH=m
-CONFIG_USB_PEGASUS=m
-CONFIG_USB_RTL8150=m
-CONFIG_USB_USBNET=m
-CONFIG_USB_NET_AX8817X=m
-CONFIG_USB_NET_CDCETHER=m
-CONFIG_USB_NET_CDC_EEM=m
-CONFIG_USB_NET_DM9601=m
-CONFIG_USB_NET_SMSC95XX=m
-CONFIG_USB_NET_GL620A=m
-CONFIG_USB_NET_NET1080=m
-CONFIG_USB_NET_PLUSB=m
-CONFIG_USB_NET_MCS7830=m
-CONFIG_USB_NET_RNDIS_HOST=m
-CONFIG_USB_NET_CDC_SUBSET=m
-CONFIG_USB_ALI_M5632=y
-CONFIG_USB_AN2720=y
-CONFIG_USB_BELKIN=y
-CONFIG_USB_ARMLINUX=y
-CONFIG_USB_EPSON2888=y
-CONFIG_USB_KC2190=y
-CONFIG_USB_NET_ZAURUS=m
-CONFIG_USB_HSO=m
-CONFIG_USB_NET_INT51X1=m
-CONFIG_USB_CDC_PHONET=m
-CONFIG_NET_PCMCIA=y
-CONFIG_PCMCIA_3C589=m
-CONFIG_PCMCIA_3C574=m
-CONFIG_PCMCIA_FMVJ18X=m
-CONFIG_PCMCIA_PCNET=m
-CONFIG_PCMCIA_NMCLAN=m
-CONFIG_PCMCIA_SMC91C92=m
-CONFIG_PCMCIA_XIRC2PS=m
-CONFIG_PCMCIA_AXNET=m
-# CONFIG_WAN is not set
-CONFIG_ATM_DRIVERS=y
-# CONFIG_ATM_DUMMY is not set
-CONFIG_ATM_TCP=m
-CONFIG_ATM_LANAI=m
-CONFIG_ATM_ENI=m
-# CONFIG_ATM_ENI_DEBUG is not set
-# CONFIG_ATM_ENI_TUNE_BURST is not set
-CONFIG_ATM_FIRESTREAM=m
-CONFIG_ATM_ZATM=m
-# CONFIG_ATM_ZATM_DEBUG is not set
-CONFIG_ATM_NICSTAR=m
-# CONFIG_ATM_NICSTAR_USE_SUNI is not set
-# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
-CONFIG_ATM_IDT77252=m
-# CONFIG_ATM_IDT77252_DEBUG is not set
-# CONFIG_ATM_IDT77252_RCV_ALL is not set
-CONFIG_ATM_IDT77252_USE_SUNI=y
-CONFIG_ATM_AMBASSADOR=m
-# CONFIG_ATM_AMBASSADOR_DEBUG is not set
-CONFIG_ATM_HORIZON=m
-# CONFIG_ATM_HORIZON_DEBUG is not set
-CONFIG_ATM_IA=m
-# CONFIG_ATM_IA_DEBUG is not set
-CONFIG_ATM_FORE200E=m
-# CONFIG_ATM_FORE200E_USE_TASKLET is not set
-CONFIG_ATM_FORE200E_TX_RETRY=16
-CONFIG_ATM_FORE200E_DEBUG=0
-CONFIG_ATM_HE=m
-# CONFIG_ATM_HE_USE_SUNI is not set
-CONFIG_ATM_SOLOS=m
-CONFIG_IEEE802154_DRIVERS=m
-CONFIG_IEEE802154_FAKEHARD=m
-# CONFIG_FDDI is not set
-# CONFIG_HIPPI is not set
-CONFIG_PLIP=m
-CONFIG_PPP=m
-CONFIG_PPP_MULTILINK=y
-CONFIG_PPP_FILTER=y
-CONFIG_PPP_ASYNC=m
-CONFIG_PPP_SYNC_TTY=m
-CONFIG_PPP_DEFLATE=m
-CONFIG_PPP_BSDCOMP=m
-CONFIG_PPP_MPPE=m
-CONFIG_PPPOE=m
-CONFIG_PPPOATM=m
-CONFIG_PPPOL2TP=m
-CONFIG_SLIP=m
-# CONFIG_SLIP_COMPRESSED is not set
-CONFIG_SLHC=m
-# CONFIG_SLIP_SMART is not set
-# CONFIG_SLIP_MODE_SLIP6 is not set
-# CONFIG_NET_FC is not set
-CONFIG_NETCONSOLE=m
-CONFIG_NETCONSOLE_DYNAMIC=y
-CONFIG_NETPOLL=y
-# CONFIG_NETPOLL_TRAP is not set
-CONFIG_NET_POLL_CONTROLLER=y
-CONFIG_VIRTIO_NET=m
-CONFIG_VMXNET3=m
-CONFIG_ISDN=y
-CONFIG_ISDN_I4L=m
-CONFIG_MISDN=m
-CONFIG_MISDN_DSP=m
-CONFIG_MISDN_L1OIP=m
-
-#
-# mISDN hardware drivers
-#
-CONFIG_MISDN_HFCPCI=m
-CONFIG_MISDN_HFCMULTI=m
-CONFIG_MISDN_HFCUSB=m
-CONFIG_MISDN_AVMFRITZ=m
-CONFIG_MISDN_SPEEDFAX=m
-CONFIG_MISDN_INFINEON=m
-CONFIG_MISDN_W6692=m
-CONFIG_MISDN_NETJET=m
-CONFIG_MISDN_IPAC=m
-CONFIG_MISDN_ISAR=m
-CONFIG_ISDN_PPP=y
-CONFIG_ISDN_PPP_VJ=y
-CONFIG_ISDN_MPP=y
-CONFIG_IPPP_FILTER=y
-CONFIG_ISDN_PPP_BSDCOMP=m
-CONFIG_ISDN_AUDIO=y
-CONFIG_ISDN_TTY_FAX=y
-
-#
-# ISDN feature submodules
-#
-CONFIG_ISDN_DIVERSION=m
-
-#
-# ISDN4Linux hardware drivers
-#
-
-#
-# Passive cards
-#
-CONFIG_ISDN_DRV_HISAX=m
-
-#
-# D-channel protocol features
-#
-CONFIG_HISAX_EURO=y
-CONFIG_DE_AOC=y
-# CONFIG_HISAX_NO_SENDCOMPLETE is not set
-# CONFIG_HISAX_NO_LLC is not set
-# CONFIG_HISAX_NO_KEYPAD is not set
-CONFIG_HISAX_1TR6=y
-CONFIG_HISAX_NI1=y
-CONFIG_HISAX_MAX_CARDS=8
-
-#
-# HiSax supported cards
-#
-CONFIG_HISAX_16_0=y
-CONFIG_HISAX_16_3=y
-CONFIG_HISAX_TELESPCI=y
-CONFIG_HISAX_S0BOX=y
-CONFIG_HISAX_AVM_A1=y
-CONFIG_HISAX_FRITZPCI=y
-CONFIG_HISAX_AVM_A1_PCMCIA=y
-CONFIG_HISAX_ELSA=y
-CONFIG_HISAX_IX1MICROR2=y
-CONFIG_HISAX_DIEHLDIVA=y
-CONFIG_HISAX_ASUSCOM=y
-CONFIG_HISAX_TELEINT=y
-CONFIG_HISAX_HFCS=y
-CONFIG_HISAX_SEDLBAUER=y
-CONFIG_HISAX_SPORTSTER=y
-CONFIG_HISAX_MIC=y
-CONFIG_HISAX_NETJET=y
-CONFIG_HISAX_NETJET_U=y
-CONFIG_HISAX_NICCY=y
-CONFIG_HISAX_ISURF=y
-CONFIG_HISAX_HSTSAPHIR=y
-CONFIG_HISAX_BKM_A4T=y
-CONFIG_HISAX_SCT_QUADRO=y
-CONFIG_HISAX_GAZEL=y
-CONFIG_HISAX_HFC_PCI=y
-CONFIG_HISAX_W6692=y
-CONFIG_HISAX_HFC_SX=y
-CONFIG_HISAX_ENTERNOW_PCI=y
-# CONFIG_HISAX_DEBUG is not set
-
-#
-# HiSax PCMCIA card service modules
-#
-CONFIG_HISAX_SEDLBAUER_CS=m
-CONFIG_HISAX_ELSA_CS=m
-CONFIG_HISAX_AVM_A1_CS=m
-CONFIG_HISAX_TELES_CS=m
-
-#
-# HiSax sub driver modules
-#
-CONFIG_HISAX_ST5481=m
-CONFIG_HISAX_HFCUSB=m
-CONFIG_HISAX_HFC4S8S=m
-CONFIG_HISAX_FRITZ_PCIPNP=m
-
-#
-# Active cards
-#
-CONFIG_ISDN_DRV_ICN=m
-CONFIG_ISDN_DRV_PCBIT=m
-CONFIG_ISDN_DRV_SC=m
-CONFIG_ISDN_DRV_ACT2000=m
-CONFIG_HYSDN=m
-CONFIG_HYSDN_CAPI=y
-CONFIG_ISDN_HDLC=m
-CONFIG_ISDN_CAPI=m
-CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON=y
-CONFIG_CAPI_TRACE=y
-CONFIG_ISDN_CAPI_MIDDLEWARE=y
-CONFIG_ISDN_CAPI_CAPI20=m
-CONFIG_ISDN_CAPI_CAPIFS_BOOL=y
-CONFIG_ISDN_CAPI_CAPIFS=m
-CONFIG_ISDN_CAPI_CAPIDRV=m
-
-#
-# CAPI hardware drivers
-#
-CONFIG_CAPI_AVM=y
-CONFIG_ISDN_DRV_AVMB1_B1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCI=m
-CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
-CONFIG_ISDN_DRV_AVMB1_T1ISA=m
-CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
-CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
-CONFIG_ISDN_DRV_AVMB1_T1PCI=m
-CONFIG_ISDN_DRV_AVMB1_C4=m
-CONFIG_CAPI_EICON=y
-CONFIG_ISDN_DIVAS=m
-CONFIG_ISDN_DIVAS_BRIPCI=y
-CONFIG_ISDN_DIVAS_PRIPCI=y
-CONFIG_ISDN_DIVAS_DIVACAPI=m
-CONFIG_ISDN_DIVAS_USERIDI=m
-CONFIG_ISDN_DIVAS_MAINT=m
-CONFIG_ISDN_DRV_GIGASET=m
-CONFIG_GIGASET_BASE=m
-CONFIG_GIGASET_M105=m
-CONFIG_GIGASET_M101=m
-# CONFIG_GIGASET_DEBUG is not set
-# CONFIG_PHONE is not set
-
-#
-# Input device support
-#
-CONFIG_INPUT=y
-CONFIG_INPUT_FF_MEMLESS=m
-CONFIG_INPUT_POLLDEV=m
-
-#
-# Userland interfaces
-#
-CONFIG_INPUT_MOUSEDEV=y
-CONFIG_INPUT_MOUSEDEV_PSAUX=y
-CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
-CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
-CONFIG_INPUT_JOYDEV=m
-CONFIG_INPUT_EVDEV=m
-# CONFIG_INPUT_EVBUG is not set
-
-#
-# Input Device Drivers
-#
-CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ADP5588=m
-CONFIG_KEYBOARD_ATKBD=y
-CONFIG_QT2160=m
-# CONFIG_KEYBOARD_LKKBD is not set
-CONFIG_KEYBOARD_GPIO=m
-CONFIG_KEYBOARD_MATRIX=m
-# CONFIG_KEYBOARD_LM8323 is not set
-# CONFIG_KEYBOARD_MAX7359 is not set
-# CONFIG_KEYBOARD_NEWTON is not set
-# CONFIG_KEYBOARD_OPENCORES is not set
-# CONFIG_KEYBOARD_STOWAWAY is not set
-# CONFIG_KEYBOARD_SUNKBD is not set
-# CONFIG_KEYBOARD_XTKBD is not set
-CONFIG_INPUT_MOUSE=y
-CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_ALPS=y
-CONFIG_MOUSE_PS2_LOGIPS2PP=y
-CONFIG_MOUSE_PS2_SYNAPTICS=y
-CONFIG_MOUSE_PS2_LIFEBOOK=y
-CONFIG_MOUSE_PS2_TRACKPOINT=y
-CONFIG_MOUSE_PS2_ELANTECH=y
-CONFIG_MOUSE_PS2_SENTELIC=y
-# CONFIG_MOUSE_PS2_TOUCHKIT is not set
-CONFIG_MOUSE_PS2_OLPC=y
-CONFIG_MOUSE_SERIAL=y
-CONFIG_MOUSE_APPLETOUCH=m
-CONFIG_MOUSE_BCM5974=m
-CONFIG_MOUSE_INPORT=m
-# CONFIG_MOUSE_ATIXL is not set
-CONFIG_MOUSE_LOGIBM=m
-CONFIG_MOUSE_PC110PAD=m
-CONFIG_MOUSE_VSXXXAA=m
-CONFIG_MOUSE_GPIO=m
-CONFIG_MOUSE_SYNAPTICS_I2C=m
-CONFIG_INPUT_JOYSTICK=y
-CONFIG_JOYSTICK_ANALOG=m
-CONFIG_JOYSTICK_A3D=m
-CONFIG_JOYSTICK_ADI=m
-CONFIG_JOYSTICK_COBRA=m
-CONFIG_JOYSTICK_GF2K=m
-CONFIG_JOYSTICK_GRIP=m
-CONFIG_JOYSTICK_GRIP_MP=m
-CONFIG_JOYSTICK_GUILLEMOT=m
-CONFIG_JOYSTICK_INTERACT=m
-CONFIG_JOYSTICK_SIDEWINDER=m
-CONFIG_JOYSTICK_TMDC=m
-CONFIG_JOYSTICK_IFORCE=m
-CONFIG_JOYSTICK_IFORCE_USB=y
-CONFIG_JOYSTICK_IFORCE_232=y
-CONFIG_JOYSTICK_WARRIOR=m
-CONFIG_JOYSTICK_MAGELLAN=m
-CONFIG_JOYSTICK_SPACEORB=m
-CONFIG_JOYSTICK_SPACEBALL=m
-CONFIG_JOYSTICK_STINGER=m
-CONFIG_JOYSTICK_TWIDJOY=m
-CONFIG_JOYSTICK_ZHENHUA=m
-CONFIG_JOYSTICK_DB9=m
-CONFIG_JOYSTICK_GAMECON=m
-CONFIG_JOYSTICK_TURBOGRAFX=m
-CONFIG_JOYSTICK_JOYDUMP=m
-CONFIG_JOYSTICK_XPAD=m
-CONFIG_JOYSTICK_XPAD_FF=y
-CONFIG_JOYSTICK_XPAD_LEDS=y
-CONFIG_JOYSTICK_WALKERA0701=m
-CONFIG_INPUT_TABLET=y
-CONFIG_TABLET_USB_ACECAD=m
-CONFIG_TABLET_USB_AIPTEK=m
-CONFIG_TABLET_USB_GTCO=m
-CONFIG_TABLET_USB_KBTAB=m
-CONFIG_TABLET_USB_WACOM=m
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_ADS7846=m
-CONFIG_TOUCHSCREEN_AD7877=m
-CONFIG_TOUCHSCREEN_AD7879_I2C=m
-CONFIG_TOUCHSCREEN_AD7879=m
-CONFIG_TOUCHSCREEN_EETI=m
-CONFIG_TOUCHSCREEN_FUJITSU=m
-CONFIG_TOUCHSCREEN_GUNZE=m
-CONFIG_TOUCHSCREEN_ELO=m
-CONFIG_TOUCHSCREEN_WACOM_W8001=m
-CONFIG_TOUCHSCREEN_MCS5000=m
-CONFIG_TOUCHSCREEN_MTOUCH=m
-CONFIG_TOUCHSCREEN_INEXIO=m
-CONFIG_TOUCHSCREEN_MK712=m
-CONFIG_TOUCHSCREEN_HTCPEN=m
-CONFIG_TOUCHSCREEN_PENMOUNT=m
-CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
-CONFIG_TOUCHSCREEN_TOUCHWIN=m
-CONFIG_TOUCHSCREEN_UCB1400=m
-CONFIG_TOUCHSCREEN_WM97XX=m
-CONFIG_TOUCHSCREEN_WM9705=y
-CONFIG_TOUCHSCREEN_WM9712=y
-CONFIG_TOUCHSCREEN_WM9713=y
-CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
-CONFIG_TOUCHSCREEN_USB_EGALAX=y
-CONFIG_TOUCHSCREEN_USB_PANJIT=y
-CONFIG_TOUCHSCREEN_USB_3M=y
-CONFIG_TOUCHSCREEN_USB_ITM=y
-CONFIG_TOUCHSCREEN_USB_ETURBO=y
-CONFIG_TOUCHSCREEN_USB_GUNZE=y
-CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
-CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
-CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
-CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
-CONFIG_TOUCHSCREEN_USB_GOTOP=y
-CONFIG_TOUCHSCREEN_USB_JASTEC=y
-CONFIG_TOUCHSCREEN_USB_E2I=y
-CONFIG_TOUCHSCREEN_TOUCHIT213=m
-CONFIG_TOUCHSCREEN_TSC2007=m
-CONFIG_TOUCHSCREEN_PCAP=m
-CONFIG_INPUT_MISC=y
-CONFIG_INPUT_PCSPKR=m
-CONFIG_INPUT_APANEL=m
-CONFIG_INPUT_WISTRON_BTNS=m
-CONFIG_INPUT_ATLAS_BTNS=m
-CONFIG_INPUT_ATI_REMOTE=m
-CONFIG_INPUT_ATI_REMOTE2=m
-CONFIG_INPUT_KEYSPAN_REMOTE=m
-CONFIG_INPUT_POWERMATE=m
-CONFIG_INPUT_YEALINK=m
-CONFIG_INPUT_CM109=m
-CONFIG_INPUT_UINPUT=m
-CONFIG_INPUT_WINBOND_CIR=m
-CONFIG_INPUT_PCF50633_PMU=m
-CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
-CONFIG_INPUT_WM831X_ON=m
-# CONFIG_INPUT_PCAP is not set
-
-#
-# Hardware I/O ports
-#
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
-CONFIG_SERIO_SERPORT=m
-CONFIG_SERIO_CT82C710=m
-CONFIG_SERIO_PARKBD=m
-CONFIG_SERIO_PCIPS2=m
-CONFIG_SERIO_LIBPS2=y
-CONFIG_SERIO_RAW=m
-CONFIG_GAMEPORT=m
-CONFIG_GAMEPORT_NS558=m
-CONFIG_GAMEPORT_L4=m
-CONFIG_GAMEPORT_EMU10K1=m
-CONFIG_GAMEPORT_FM801=m
-
-#
-# Character devices
-#
-CONFIG_VT=y
-CONFIG_CONSOLE_TRANSLATIONS=y
-CONFIG_VT_CONSOLE=y
-CONFIG_HW_CONSOLE=y
-CONFIG_VT_HW_CONSOLE_BINDING=y
-# CONFIG_DEVKMEM is not set
-CONFIG_SERIAL_NONSTANDARD=y
-# CONFIG_COMPUTONE is not set
-CONFIG_ROCKETPORT=m
-CONFIG_CYCLADES=m
-# CONFIG_CYZ_INTR is not set
-# CONFIG_DIGIEPCA is not set
-# CONFIG_MOXA_INTELLIO is not set
-# CONFIG_MOXA_SMARTIO is not set
-# CONFIG_ISI is not set
-CONFIG_SYNCLINK=m
-CONFIG_SYNCLINKMP=m
-# CONFIG_SYNCLINK_GT is not set
-CONFIG_N_HDLC=m
-# CONFIG_RISCOM8 is not set
-# CONFIG_SPECIALIX is not set
-# CONFIG_STALDRV is not set
-CONFIG_NOZOMI=m
-
-#
-# Serial drivers
-#
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_SERIAL_8250_PCI=y
-CONFIG_SERIAL_8250_PNP=y
-CONFIG_SERIAL_8250_CS=m
-CONFIG_SERIAL_8250_NR_UARTS=32
-CONFIG_SERIAL_8250_RUNTIME_UARTS=4
-# CONFIG_SERIAL_8250_EXTENDED is not set
-
-#
-# Non-8250 serial port support
-#
-CONFIG_SERIAL_MAX3100=m
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_JSM=m
-CONFIG_UNIX98_PTYS=y
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
-# CONFIG_LEGACY_PTYS is not set
-CONFIG_PRINTER=m
-# CONFIG_LP_CONSOLE is not set
-CONFIG_PPDEV=m
-CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_IPMI_HANDLER=m
-# CONFIG_IPMI_PANIC_EVENT is not set
-CONFIG_IPMI_DEVICE_INTERFACE=m
-CONFIG_IPMI_SI=m
-CONFIG_IPMI_WATCHDOG=m
-CONFIG_IPMI_POWEROFF=m
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_TIMERIOMEM=m
-CONFIG_HW_RANDOM_INTEL=m
-CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_GEODE=m
-CONFIG_HW_RANDOM_VIA=m
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_NVRAM=m
-CONFIG_DTLK=m
-CONFIG_R3964=m
-CONFIG_APPLICOM=m
-CONFIG_SONYPI=m
-
-#
-# PCMCIA character devices
-#
-CONFIG_SYNCLINK_CS=m
-CONFIG_CARDMAN_4000=m
-CONFIG_CARDMAN_4040=m
-CONFIG_IPWIRELESS=m
-CONFIG_MWAVE=m
-CONFIG_PC8736x_GPIO=m
-CONFIG_NSC_GPIO=m
-CONFIG_CS5535_GPIO=m
-# CONFIG_RAW_DRIVER is not set
-CONFIG_HPET=y
-CONFIG_HPET_MMAP=y
-CONFIG_HANGCHECK_TIMER=m
-CONFIG_TCG_TPM=m
-CONFIG_TCG_TIS=m
-CONFIG_TCG_NSC=m
-CONFIG_TCG_ATMEL=m
-CONFIG_TCG_INFINEON=m
-CONFIG_TELCLOCK=m
-CONFIG_DEVPORT=y
-CONFIG_I2C=m
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_COMPAT=y
-CONFIG_I2C_CHARDEV=m
-CONFIG_I2C_HELPER_AUTO=y
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-
-#
-# PC SMBus host controller drivers
-#
-CONFIG_I2C_ALI1535=m
-CONFIG_I2C_ALI1563=m
-CONFIG_I2C_ALI15X3=m
-CONFIG_I2C_AMD756=m
-CONFIG_I2C_AMD756_S4882=m
-CONFIG_I2C_AMD8111=m
-CONFIG_I2C_I801=m
-CONFIG_I2C_ISCH=m
-CONFIG_I2C_PIIX4=m
-CONFIG_I2C_NFORCE2=m
-CONFIG_I2C_NFORCE2_S4985=m
-CONFIG_I2C_SIS5595=m
-CONFIG_I2C_SIS630=m
-CONFIG_I2C_SIS96X=m
-CONFIG_I2C_VIA=m
-CONFIG_I2C_VIAPRO=m
-
-#
-# ACPI drivers
-#
-CONFIG_I2C_SCMI=m
-
-#
-# I2C system bus drivers (mostly embedded / system-on-chip)
-#
-CONFIG_I2C_GPIO=m
-CONFIG_I2C_OCORES=m
-CONFIG_I2C_SIMTEC=m
-
-#
-# External I2C/SMBus adapter drivers
-#
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-CONFIG_I2C_TAOS_EVM=m
-CONFIG_I2C_TINY_USB=m
-
-#
-# Graphics adapter I2C/DDC channel drivers
-#
-# CONFIG_I2C_VOODOO3 is not set
-
-#
-# Other I2C/SMBus bus drivers
-#
-CONFIG_I2C_PCA_ISA=m
-CONFIG_I2C_PCA_PLATFORM=m
-# CONFIG_I2C_STUB is not set
-CONFIG_SCx200_ACB=m
-
-#
-# Miscellaneous I2C Chip support
-#
-CONFIG_DS1682=m
-CONFIG_SENSORS_TSL2550=m
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
-CONFIG_SPI=y
-# CONFIG_SPI_DEBUG is not set
-CONFIG_SPI_MASTER=y
-
-#
-# SPI Master Controller Drivers
-#
-CONFIG_SPI_BITBANG=m
-CONFIG_SPI_BUTTERFLY=m
-CONFIG_SPI_GPIO=m
-CONFIG_SPI_LM70_LLP=m
-
-#
-# SPI Protocol Masters
-#
-CONFIG_SPI_SPIDEV=m
-CONFIG_SPI_TLE62X0=m
-
-#
-# PPS support
-#
-CONFIG_PPS=m
-# CONFIG_PPS_DEBUG is not set
-CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_GPIOLIB=y
-# CONFIG_DEBUG_GPIO is not set
-CONFIG_GPIO_SYSFS=y
-
-#
-# Memory mapped GPIO expanders:
-#
-
-#
-# I2C GPIO expanders:
-#
-CONFIG_GPIO_MAX732X=m
-CONFIG_GPIO_PCA953X=m
-CONFIG_GPIO_PCF857X=m
-CONFIG_GPIO_WM831X=m
-
-#
-# PCI GPIO expanders:
-#
-CONFIG_GPIO_LANGWELL=y
-
-#
-# SPI GPIO expanders:
-#
-CONFIG_GPIO_MAX7301=m
-CONFIG_GPIO_MCP23S08=m
-CONFIG_GPIO_MC33880=m
-
-#
-# AC97 GPIO expanders:
-#
-CONFIG_GPIO_UCB1400=y
-CONFIG_W1=m
-CONFIG_W1_CON=y
-
-#
-# 1-wire Bus Masters
-#
-CONFIG_W1_MASTER_MATROX=m
-CONFIG_W1_MASTER_DS2490=m
-CONFIG_W1_MASTER_DS2482=m
-CONFIG_W1_MASTER_GPIO=m
-
-#
-# 1-wire Slaves
-#
-CONFIG_W1_SLAVE_THERM=m
-CONFIG_W1_SLAVE_SMEM=m
-CONFIG_W1_SLAVE_DS2431=m
-CONFIG_W1_SLAVE_DS2433=m
-# CONFIG_W1_SLAVE_DS2433_CRC is not set
-CONFIG_W1_SLAVE_DS2760=m
-CONFIG_W1_SLAVE_BQ27000=m
-CONFIG_POWER_SUPPLY=y
-# CONFIG_POWER_SUPPLY_DEBUG is not set
-CONFIG_PDA_POWER=m
-CONFIG_WM831X_POWER=m
-CONFIG_WM8350_POWER=m
-CONFIG_BATTERY_DS2760=m
-CONFIG_BATTERY_DS2782=m
-CONFIG_BATTERY_OLPC=m
-CONFIG_BATTERY_BQ27x00=m
-CONFIG_BATTERY_MAX17040=m
-CONFIG_CHARGER_PCF50633=m
-CONFIG_HWMON=y
-CONFIG_HWMON_VID=m
-# CONFIG_HWMON_DEBUG_CHIP is not set
-
-#
-# Native drivers
-#
-CONFIG_SENSORS_ABITUGURU=m
-CONFIG_SENSORS_ABITUGURU3=m
-CONFIG_SENSORS_AD7414=m
-CONFIG_SENSORS_AD7418=m
-CONFIG_SENSORS_ADCXX=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1029=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ADM9240=m
-CONFIG_SENSORS_ADT7462=m
-CONFIG_SENSORS_ADT7470=m
-CONFIG_SENSORS_ADT7473=m
-CONFIG_SENSORS_ADT7475=m
-CONFIG_SENSORS_K8TEMP=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_ATXP1=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_I5K_AMB=m
-CONFIG_SENSORS_F71805F=m
-CONFIG_SENSORS_F71882FG=m
-CONFIG_SENSORS_F75375S=m
-CONFIG_SENSORS_FSCHMD=m
-CONFIG_SENSORS_G760A=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_GL520SM=m
-CONFIG_SENSORS_CORETEMP=m
-CONFIG_SENSORS_IBMAEM=m
-CONFIG_SENSORS_IBMPEX=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM70=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_LM92=m
-CONFIG_SENSORS_LM93=m
-CONFIG_SENSORS_LTC4215=m
-CONFIG_SENSORS_LTC4245=m
-CONFIG_SENSORS_LM95241=m
-CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_MAX6650=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_PC87427=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_SHT15=m
-CONFIG_SENSORS_SIS5595=m
-CONFIG_SENSORS_DME1737=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_SMSC47M192=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_ADS7828=m
-CONFIG_SENSORS_THMC50=m
-CONFIG_SENSORS_TMP401=m
-CONFIG_SENSORS_TMP421=m
-CONFIG_SENSORS_VIA686A=m
-CONFIG_SENSORS_VT1211=m
-CONFIG_SENSORS_VT8231=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83791D=m
-CONFIG_SENSORS_W83792D=m
-CONFIG_SENSORS_W83793=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83L786NG=m
-CONFIG_SENSORS_W83627HF=m
-CONFIG_SENSORS_W83627EHF=m
-CONFIG_SENSORS_WM831X=m
-CONFIG_SENSORS_WM8350=m
-CONFIG_SENSORS_HDAPS=m
-CONFIG_SENSORS_APPLESMC=m
-
-#
-# ACPI drivers
-#
-CONFIG_SENSORS_ATK0110=m
-CONFIG_SENSORS_LIS3LV02D=m
-CONFIG_THERMAL=y
-CONFIG_THERMAL_HWMON=y
-CONFIG_WATCHDOG=y
-# CONFIG_WATCHDOG_NOWAYOUT is not set
-
-#
-# Watchdog Device Drivers
-#
-CONFIG_SOFT_WATCHDOG=m
-CONFIG_WM831X_WATCHDOG=m
-CONFIG_WM8350_WATCHDOG=m
-CONFIG_ACQUIRE_WDT=m
-CONFIG_ADVANTECH_WDT=m
-CONFIG_ALIM1535_WDT=m
-CONFIG_ALIM7101_WDT=m
-CONFIG_SC520_WDT=m
-CONFIG_SBC_FITPC2_WATCHDOG=m
-CONFIG_EUROTECH_WDT=m
-CONFIG_IB700_WDT=m
-CONFIG_IBMASR=m
-CONFIG_WAFER_WDT=m
-CONFIG_I6300ESB_WDT=m
-CONFIG_ITCO_WDT=m
-CONFIG_ITCO_VENDOR_SUPPORT=y
-CONFIG_IT8712F_WDT=m
-CONFIG_IT87_WDT=m
-CONFIG_HP_WATCHDOG=m
-CONFIG_SC1200_WDT=m
-CONFIG_PC87413_WDT=m
-CONFIG_60XX_WDT=m
-CONFIG_SBC8360_WDT=m
-CONFIG_SBC7240_WDT=m
-CONFIG_CPU5_WDT=m
-CONFIG_SMSC_SCH311X_WDT=m
-CONFIG_SMSC37B787_WDT=m
-CONFIG_W83627HF_WDT=m
-CONFIG_W83697HF_WDT=m
-CONFIG_W83697UG_WDT=m
-CONFIG_W83877F_WDT=m
-CONFIG_W83977F_WDT=m
-CONFIG_MACHZ_WDT=m
-CONFIG_SBC_EPX_C3_WATCHDOG=m
-
-#
-# ISA-based Watchdog Cards
-#
-CONFIG_PCWATCHDOG=m
-CONFIG_MIXCOMWD=m
-CONFIG_WDT=m
-
-#
-# PCI-based Watchdog Cards
-#
-CONFIG_PCIPCWATCHDOG=m
-CONFIG_WDTPCI=m
-
-#
-# USB-based Watchdog Cards
-#
-CONFIG_USBPCWATCHDOG=m
-CONFIG_SSB_POSSIBLE=y
-
-#
-# Sonics Silicon Backplane
-#
-CONFIG_SSB=m
-CONFIG_SSB_SPROM=y
-CONFIG_SSB_BLOCKIO=y
-CONFIG_SSB_PCIHOST_POSSIBLE=y
-CONFIG_SSB_PCIHOST=y
-CONFIG_SSB_B43_PCI_BRIDGE=y
-CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
-CONFIG_SSB_PCMCIAHOST=y
-CONFIG_SSB_SDIOHOST_POSSIBLE=y
-CONFIG_SSB_SDIOHOST=y
-# CONFIG_SSB_DEBUG is not set
-CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
-CONFIG_SSB_DRIVER_PCICORE=y
-
-#
-# Multifunction device drivers
-#
-CONFIG_MFD_CORE=m
-CONFIG_MFD_SM501=m
-CONFIG_MFD_SM501_GPIO=y
-CONFIG_HTC_PASIC3=m
-CONFIG_UCB1400_CORE=m
-CONFIG_TPS65010=m
-# CONFIG_MFD_TMIO is not set
-CONFIG_MFD_WM8400=m
-CONFIG_MFD_WM831X=m
-CONFIG_MFD_WM8350=m
-CONFIG_MFD_WM8350_I2C=m
-CONFIG_MFD_PCF50633=m
-CONFIG_MFD_MC13783=m
-CONFIG_PCF50633_ADC=m
-CONFIG_PCF50633_GPIO=m
-CONFIG_AB3100_CORE=m
-CONFIG_AB3100_OTP=m
-CONFIG_EZX_PCAP=y
-# CONFIG_REGULATOR is not set
-CONFIG_MEDIA_SUPPORT=m
-
-#
-# Multimedia core support
-#
-CONFIG_VIDEO_DEV=m
-CONFIG_VIDEO_V4L2_COMMON=m
-CONFIG_VIDEO_ALLOW_V4L1=y
-CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_DVB_CORE=m
-CONFIG_VIDEO_MEDIA=m
-
-#
-# Multimedia drivers
-#
-CONFIG_VIDEO_SAA7146=m
-CONFIG_VIDEO_SAA7146_VV=m
-CONFIG_MEDIA_ATTACH=y
-CONFIG_MEDIA_TUNER=m
-# CONFIG_MEDIA_TUNER_CUSTOMISE is not set
-CONFIG_MEDIA_TUNER_SIMPLE=m
-CONFIG_MEDIA_TUNER_TDA8290=m
-CONFIG_MEDIA_TUNER_TDA827X=m
-CONFIG_MEDIA_TUNER_TDA18271=m
-CONFIG_MEDIA_TUNER_TDA9887=m
-CONFIG_MEDIA_TUNER_TEA5761=m
-CONFIG_MEDIA_TUNER_TEA5767=m
-CONFIG_MEDIA_TUNER_MT20XX=m
-CONFIG_MEDIA_TUNER_MT2060=m
-CONFIG_MEDIA_TUNER_MT2266=m
-CONFIG_MEDIA_TUNER_MT2131=m
-CONFIG_MEDIA_TUNER_QT1010=m
-CONFIG_MEDIA_TUNER_XC2028=m
-CONFIG_MEDIA_TUNER_XC5000=m
-CONFIG_MEDIA_TUNER_MXL5005S=m
-CONFIG_MEDIA_TUNER_MXL5007T=m
-CONFIG_MEDIA_TUNER_MC44S803=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L1=m
-CONFIG_VIDEOBUF_GEN=m
-CONFIG_VIDEOBUF_DMA_SG=m
-CONFIG_VIDEOBUF_VMALLOC=m
-CONFIG_VIDEOBUF_DVB=m
-CONFIG_VIDEO_BTCX=m
-CONFIG_VIDEO_IR=m
-CONFIG_VIDEO_TVEEPROM=m
-CONFIG_VIDEO_TUNER=m
-CONFIG_VIDEO_CAPTURE_DRIVERS=y
-# CONFIG_VIDEO_ADV_DEBUG is not set
-# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
-# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set
-CONFIG_VIDEO_IR_I2C=m
-
-#
-# Encoders/decoders and other helper chips
-#
-
-#
-# Audio decoders
-#
-CONFIG_VIDEO_TVAUDIO=m
-CONFIG_VIDEO_TDA7432=m
-CONFIG_VIDEO_TDA9840=m
-CONFIG_VIDEO_TDA9875=m
-CONFIG_VIDEO_TEA6415C=m
-CONFIG_VIDEO_TEA6420=m
-CONFIG_VIDEO_MSP3400=m
-CONFIG_VIDEO_CS5345=m
-CONFIG_VIDEO_CS53L32A=m
-CONFIG_VIDEO_M52790=m
-CONFIG_VIDEO_TLV320AIC23B=m
-CONFIG_VIDEO_WM8775=m
-CONFIG_VIDEO_WM8739=m
-CONFIG_VIDEO_VP27SMPX=m
-
-#
-# RDS decoders
-#
-CONFIG_VIDEO_SAA6588=m
-
-#
-# Video decoders
-#
-CONFIG_VIDEO_ADV7180=m
-CONFIG_VIDEO_BT819=m
-CONFIG_VIDEO_BT856=m
-CONFIG_VIDEO_BT866=m
-CONFIG_VIDEO_KS0127=m
-CONFIG_VIDEO_OV7670=m
-CONFIG_VIDEO_MT9V011=m
-CONFIG_VIDEO_TCM825X=m
-CONFIG_VIDEO_SAA7110=m
-CONFIG_VIDEO_SAA711X=m
-CONFIG_VIDEO_SAA717X=m
-CONFIG_VIDEO_SAA7191=m
-CONFIG_VIDEO_TVP514X=m
-CONFIG_VIDEO_TVP5150=m
-CONFIG_VIDEO_VPX3220=m
-
-#
-# Video and audio decoders
-#
-CONFIG_VIDEO_CX25840=m
-
-#
-# MPEG video encoders
-#
-CONFIG_VIDEO_CX2341X=m
-
-#
-# Video encoders
-#
-CONFIG_VIDEO_SAA7127=m
-CONFIG_VIDEO_SAA7185=m
-CONFIG_VIDEO_ADV7170=m
-CONFIG_VIDEO_ADV7175=m
-CONFIG_VIDEO_THS7303=m
-CONFIG_VIDEO_ADV7343=m
-
-#
-# Video improvement chips
-#
-CONFIG_VIDEO_UPD64031A=m
-CONFIG_VIDEO_UPD64083=m
-CONFIG_VIDEO_VIVI=m
-CONFIG_VIDEO_BT848=m
-CONFIG_VIDEO_BT848_DVB=y
-CONFIG_VIDEO_PMS=m
-CONFIG_VIDEO_BWQCAM=m
-CONFIG_VIDEO_CQCAM=m
-CONFIG_VIDEO_W9966=m
-CONFIG_VIDEO_CPIA=m
-CONFIG_VIDEO_CPIA_PP=m
-CONFIG_VIDEO_CPIA_USB=m
-CONFIG_VIDEO_CPIA2=m
-CONFIG_VIDEO_SAA5246A=m
-CONFIG_VIDEO_SAA5249=m
-CONFIG_VIDEO_STRADIS=m
-CONFIG_VIDEO_ZORAN=m
-CONFIG_VIDEO_ZORAN_DC30=m
-CONFIG_VIDEO_ZORAN_ZR36060=m
-CONFIG_VIDEO_ZORAN_BUZ=m
-CONFIG_VIDEO_ZORAN_DC10=m
-CONFIG_VIDEO_ZORAN_LML33=m
-CONFIG_VIDEO_ZORAN_LML33R10=m
-CONFIG_VIDEO_ZORAN_AVS6EYES=m
-CONFIG_VIDEO_MEYE=m
-CONFIG_VIDEO_SAA7134=m
-CONFIG_VIDEO_SAA7134_ALSA=m
-CONFIG_VIDEO_SAA7134_DVB=m
-CONFIG_VIDEO_MXB=m
-CONFIG_VIDEO_HEXIUM_ORION=m
-CONFIG_VIDEO_HEXIUM_GEMINI=m
-CONFIG_VIDEO_CX88=m
-CONFIG_VIDEO_CX88_ALSA=m
-CONFIG_VIDEO_CX88_BLACKBIRD=m
-CONFIG_VIDEO_CX88_DVB=m
-CONFIG_VIDEO_CX88_MPEG=m
-CONFIG_VIDEO_CX88_VP3054=m
-CONFIG_VIDEO_CX23885=m
-CONFIG_VIDEO_AU0828=m
-CONFIG_VIDEO_IVTV=m
-CONFIG_VIDEO_FB_IVTV=m
-CONFIG_VIDEO_CX18=m
-CONFIG_VIDEO_SAA7164=m
-CONFIG_VIDEO_CAFE_CCIC=m
-CONFIG_SOC_CAMERA=m
-CONFIG_SOC_CAMERA_MT9M001=m
-CONFIG_SOC_CAMERA_MT9M111=m
-CONFIG_SOC_CAMERA_MT9T031=m
-CONFIG_SOC_CAMERA_MT9V022=m
-CONFIG_SOC_CAMERA_TW9910=m
-CONFIG_SOC_CAMERA_PLATFORM=m
-CONFIG_SOC_CAMERA_OV772X=m
-CONFIG_V4L_USB_DRIVERS=y
-CONFIG_USB_VIDEO_CLASS=m
-CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
-CONFIG_USB_GSPCA=m
-CONFIG_USB_M5602=m
-CONFIG_USB_STV06XX=m
-CONFIG_USB_GL860=m
-CONFIG_USB_GSPCA_CONEX=m
-CONFIG_USB_GSPCA_ETOMS=m
-CONFIG_USB_GSPCA_FINEPIX=m
-CONFIG_USB_GSPCA_JEILINJ=m
-CONFIG_USB_GSPCA_MARS=m
-CONFIG_USB_GSPCA_MR97310A=m
-CONFIG_USB_GSPCA_OV519=m
-CONFIG_USB_GSPCA_OV534=m
-CONFIG_USB_GSPCA_PAC207=m
-CONFIG_USB_GSPCA_PAC7311=m
-CONFIG_USB_GSPCA_SN9C20X=m
-CONFIG_USB_GSPCA_SN9C20X_EVDEV=y
-CONFIG_USB_GSPCA_SONIXB=m
-CONFIG_USB_GSPCA_SONIXJ=m
-CONFIG_USB_GSPCA_SPCA500=m
-CONFIG_USB_GSPCA_SPCA501=m
-CONFIG_USB_GSPCA_SPCA505=m
-CONFIG_USB_GSPCA_SPCA506=m
-CONFIG_USB_GSPCA_SPCA508=m
-CONFIG_USB_GSPCA_SPCA561=m
-CONFIG_USB_GSPCA_SQ905=m
-CONFIG_USB_GSPCA_SQ905C=m
-CONFIG_USB_GSPCA_STK014=m
-CONFIG_USB_GSPCA_SUNPLUS=m
-CONFIG_USB_GSPCA_T613=m
-CONFIG_USB_GSPCA_TV8532=m
-CONFIG_USB_GSPCA_VC032X=m
-CONFIG_USB_GSPCA_ZC3XX=m
-CONFIG_VIDEO_PVRUSB2=m
-CONFIG_VIDEO_PVRUSB2_SYSFS=y
-CONFIG_VIDEO_PVRUSB2_DVB=y
-# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
-CONFIG_VIDEO_HDPVR=m
-CONFIG_VIDEO_EM28XX=m
-CONFIG_VIDEO_EM28XX_ALSA=m
-CONFIG_VIDEO_EM28XX_DVB=m
-CONFIG_VIDEO_CX231XX=m
-CONFIG_VIDEO_CX231XX_ALSA=m
-CONFIG_VIDEO_CX231XX_DVB=m
-CONFIG_VIDEO_USBVISION=m
-CONFIG_VIDEO_USBVIDEO=m
-CONFIG_USB_VICAM=m
-CONFIG_USB_IBMCAM=m
-CONFIG_USB_KONICAWC=m
-CONFIG_USB_QUICKCAM_MESSENGER=m
-CONFIG_USB_ET61X251=m
-CONFIG_VIDEO_OVCAMCHIP=m
-CONFIG_USB_W9968CF=m
-CONFIG_USB_OV511=m
-CONFIG_USB_SE401=m
-CONFIG_USB_SN9C102=m
-CONFIG_USB_STV680=m
-CONFIG_USB_ZC0301=m
-CONFIG_USB_PWC=m
-# CONFIG_USB_PWC_DEBUG is not set
-CONFIG_USB_PWC_INPUT_EVDEV=y
-CONFIG_USB_ZR364XX=m
-CONFIG_USB_STKWEBCAM=m
-CONFIG_USB_S2255=m
-CONFIG_RADIO_ADAPTERS=y
-CONFIG_RADIO_CADET=m
-CONFIG_RADIO_RTRACK=m
-CONFIG_RADIO_RTRACK2=m
-CONFIG_RADIO_AZTECH=m
-CONFIG_RADIO_GEMTEK=m
-CONFIG_RADIO_GEMTEK_PCI=m
-CONFIG_RADIO_MAXIRADIO=m
-CONFIG_RADIO_MAESTRO=m
-CONFIG_RADIO_SF16FMI=m
-CONFIG_RADIO_SF16FMR2=m
-CONFIG_RADIO_TERRATEC=m
-CONFIG_RADIO_TRUST=m
-CONFIG_RADIO_TYPHOON=m
-CONFIG_RADIO_ZOLTRIX=m
-CONFIG_I2C_SI4713=m
-CONFIG_RADIO_SI4713=m
-CONFIG_USB_DSBR=m
-CONFIG_RADIO_SI470X=y
-CONFIG_USB_SI470X=m
-CONFIG_I2C_SI470X=m
-CONFIG_USB_MR800=m
-CONFIG_RADIO_TEA5764=m
-CONFIG_DVB_MAX_ADAPTERS=8
-# CONFIG_DVB_DYNAMIC_MINORS is not set
-CONFIG_DVB_CAPTURE_DRIVERS=y
-
-#
-# Supported SAA7146 based PCI Adapters
-#
-CONFIG_TTPCI_EEPROM=m
-CONFIG_DVB_AV7110=m
-CONFIG_DVB_AV7110_OSD=y
-CONFIG_DVB_BUDGET_CORE=m
-CONFIG_DVB_BUDGET=m
-CONFIG_DVB_BUDGET_CI=m
-CONFIG_DVB_BUDGET_AV=m
-CONFIG_DVB_BUDGET_PATCH=m
-
-#
-# Supported USB Adapters
-#
-CONFIG_DVB_USB=m
-# CONFIG_DVB_USB_DEBUG is not set
-CONFIG_DVB_USB_A800=m
-CONFIG_DVB_USB_DIBUSB_MB=m
-CONFIG_DVB_USB_DIBUSB_MB_FAULTY=y
-CONFIG_DVB_USB_DIBUSB_MC=m
-CONFIG_DVB_USB_DIB0700=m
-CONFIG_DVB_USB_UMT_010=m
-CONFIG_DVB_USB_CXUSB=m
-CONFIG_DVB_USB_M920X=m
-CONFIG_DVB_USB_GL861=m
-CONFIG_DVB_USB_AU6610=m
-CONFIG_DVB_USB_DIGITV=m
-CONFIG_DVB_USB_VP7045=m
-CONFIG_DVB_USB_VP702X=m
-CONFIG_DVB_USB_GP8PSK=m
-CONFIG_DVB_USB_NOVA_T_USB2=m
-CONFIG_DVB_USB_TTUSB2=m
-CONFIG_DVB_USB_DTT200U=m
-CONFIG_DVB_USB_OPERA1=m
-CONFIG_DVB_USB_AF9005=m
-CONFIG_DVB_USB_AF9005_REMOTE=m
-CONFIG_DVB_USB_DW2102=m
-CONFIG_DVB_USB_CINERGY_T2=m
-CONFIG_DVB_USB_ANYSEE=m
-CONFIG_DVB_USB_DTV5100=m
-CONFIG_DVB_USB_AF9015=m
-CONFIG_DVB_USB_CE6230=m
-CONFIG_DVB_USB_FRIIO=m
-CONFIG_DVB_TTUSB_BUDGET=m
-CONFIG_DVB_TTUSB_DEC=m
-CONFIG_SMS_SIANO_MDTV=m
-
-#
-# Siano module components
-#
-CONFIG_SMS_USB_DRV=m
-CONFIG_SMS_SDIO_DRV=m
-
-#
-# Supported FlexCopII (B2C2) Adapters
-#
-CONFIG_DVB_B2C2_FLEXCOP=m
-CONFIG_DVB_B2C2_FLEXCOP_PCI=m
-CONFIG_DVB_B2C2_FLEXCOP_USB=m
-# CONFIG_DVB_B2C2_FLEXCOP_DEBUG is not set
-
-#
-# Supported BT878 Adapters
-#
-CONFIG_DVB_BT8XX=m
-
-#
-# Supported Pluto2 Adapters
-#
-CONFIG_DVB_PLUTO2=m
-
-#
-# Supported SDMC DM1105 Adapters
-#
-CONFIG_DVB_DM1105=m
-
-#
-# Supported Earthsoft PT1 Adapters
-#
-CONFIG_DVB_PT1=m
-
-#
-# Supported DVB Frontends
-#
-# CONFIG_DVB_FE_CUSTOMISE is not set
-CONFIG_DVB_STB0899=m
-CONFIG_DVB_STB6100=m
-CONFIG_DVB_STV090x=m
-CONFIG_DVB_STV6110x=m
-CONFIG_DVB_CX24110=m
-CONFIG_DVB_CX24123=m
-CONFIG_DVB_MT312=m
-CONFIG_DVB_ZL10036=m
-CONFIG_DVB_ZL10039=m
-CONFIG_DVB_S5H1420=m
-CONFIG_DVB_STV0288=m
-CONFIG_DVB_STB6000=m
-CONFIG_DVB_STV0299=m
-CONFIG_DVB_STV6110=m
-CONFIG_DVB_STV0900=m
-CONFIG_DVB_TDA8083=m
-CONFIG_DVB_TDA10086=m
-CONFIG_DVB_TDA8261=m
-CONFIG_DVB_VES1X93=m
-CONFIG_DVB_TUNER_ITD1000=m
-CONFIG_DVB_TUNER_CX24113=m
-CONFIG_DVB_TDA826X=m
-CONFIG_DVB_TUA6100=m
-CONFIG_DVB_CX24116=m
-CONFIG_DVB_SI21XX=m
-CONFIG_DVB_SP8870=m
-CONFIG_DVB_SP887X=m
-CONFIG_DVB_CX22700=m
-CONFIG_DVB_CX22702=m
-CONFIG_DVB_L64781=m
-CONFIG_DVB_TDA1004X=m
-CONFIG_DVB_NXT6000=m
-CONFIG_DVB_MT352=m
-CONFIG_DVB_ZL10353=m
-CONFIG_DVB_DIB3000MB=m
-CONFIG_DVB_DIB3000MC=m
-CONFIG_DVB_DIB7000M=m
-CONFIG_DVB_DIB7000P=m
-CONFIG_DVB_TDA10048=m
-CONFIG_DVB_AF9013=m
-CONFIG_DVB_VES1820=m
-CONFIG_DVB_TDA10021=m
-CONFIG_DVB_TDA10023=m
-CONFIG_DVB_STV0297=m
-CONFIG_DVB_NXT200X=m
-CONFIG_DVB_OR51211=m
-CONFIG_DVB_OR51132=m
-CONFIG_DVB_BCM3510=m
-CONFIG_DVB_LGDT330X=m
-CONFIG_DVB_LGDT3305=m
-CONFIG_DVB_S5H1409=m
-CONFIG_DVB_AU8522=m
-CONFIG_DVB_S5H1411=m
-CONFIG_DVB_DIB8000=m
-CONFIG_DVB_PLL=m
-CONFIG_DVB_TUNER_DIB0070=m
-CONFIG_DVB_LNBP21=m
-CONFIG_DVB_ISL6405=m
-CONFIG_DVB_ISL6421=m
-CONFIG_DVB_ISL6423=m
-CONFIG_DVB_LGS8GXX=m
-CONFIG_DAB=y
-CONFIG_USB_DABUSB=m
-
-#
-# Graphics support
-#
-CONFIG_AGP=m
-CONFIG_AGP_ALI=m
-CONFIG_AGP_ATI=m
-CONFIG_AGP_AMD=m
-CONFIG_AGP_AMD64=m
-CONFIG_AGP_INTEL=m
-CONFIG_AGP_NVIDIA=m
-CONFIG_AGP_SIS=m
-CONFIG_AGP_SWORKS=m
-CONFIG_AGP_VIA=m
-CONFIG_AGP_EFFICEON=m
-CONFIG_VGA_ARB=y
-CONFIG_DRM=m
-CONFIG_DRM_KMS_HELPER=m
-CONFIG_DRM_TTM=m
-CONFIG_DRM_TDFX=m
-CONFIG_DRM_R128=m
-CONFIG_DRM_RADEON=m
-CONFIG_DRM_I810=m
-CONFIG_DRM_I830=m
-CONFIG_DRM_I915=m
-CONFIG_DRM_I915_KMS=y
-CONFIG_DRM_MGA=m
-CONFIG_DRM_SIS=m
-CONFIG_DRM_VIA=m
-CONFIG_DRM_SAVAGE=m
-CONFIG_VGASTATE=m
-CONFIG_VIDEO_OUTPUT_CONTROL=m
-CONFIG_FB=y
-CONFIG_FIRMWARE_EDID=y
-CONFIG_FB_DDC=m
-CONFIG_FB_BOOT_VESA_SUPPORT=y
-CONFIG_FB_CFB_FILLRECT=y
-CONFIG_FB_CFB_COPYAREA=y
-CONFIG_FB_CFB_IMAGEBLIT=y
-# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set
-CONFIG_FB_SYS_FILLRECT=m
-CONFIG_FB_SYS_COPYAREA=m
-CONFIG_FB_SYS_IMAGEBLIT=m
-# CONFIG_FB_FOREIGN_ENDIAN is not set
-CONFIG_FB_SYS_FOPS=m
-CONFIG_FB_SVGALIB=m
-# CONFIG_FB_MACMODES is not set
-CONFIG_FB_BACKLIGHT=y
-CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
-
-#
-# Frame buffer hardware drivers
-#
-CONFIG_FB_CIRRUS=m
-CONFIG_FB_PM2=m
-CONFIG_FB_PM2_FIFO_DISCONNECT=y
-CONFIG_FB_CYBER2000=m
-# CONFIG_FB_ARC is not set
-# CONFIG_FB_ASILIANT is not set
-# CONFIG_FB_IMSTT is not set
-# CONFIG_FB_VGA16 is not set
-CONFIG_FB_UVESA=m
-CONFIG_FB_VESA=y
-CONFIG_FB_EFI=y
-# CONFIG_FB_N411 is not set
-# CONFIG_FB_HGA is not set
-# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_NVIDIA=m
-CONFIG_FB_NVIDIA_I2C=y
-# CONFIG_FB_NVIDIA_DEBUG is not set
-CONFIG_FB_NVIDIA_BACKLIGHT=y
-CONFIG_FB_RIVA=m
-CONFIG_FB_RIVA_I2C=y
-# CONFIG_FB_RIVA_DEBUG is not set
-CONFIG_FB_RIVA_BACKLIGHT=y
-CONFIG_FB_I810=m
-# CONFIG_FB_I810_GTF is not set
-CONFIG_FB_LE80578=m
-CONFIG_FB_CARILLO_RANCH=m
-# CONFIG_FB_MATROX is not set
-CONFIG_FB_RADEON=m
-CONFIG_FB_RADEON_I2C=y
-CONFIG_FB_RADEON_BACKLIGHT=y
-# CONFIG_FB_RADEON_DEBUG is not set
-CONFIG_FB_ATY128=m
-CONFIG_FB_ATY128_BACKLIGHT=y
-CONFIG_FB_ATY=m
-CONFIG_FB_ATY_CT=y
-CONFIG_FB_ATY_GENERIC_LCD=y
-CONFIG_FB_ATY_GX=y
-CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
-CONFIG_FB_SAVAGE=m
-CONFIG_FB_SAVAGE_I2C=y
-CONFIG_FB_SAVAGE_ACCEL=y
-CONFIG_FB_SIS=m
-CONFIG_FB_SIS_300=y
-CONFIG_FB_SIS_315=y
-CONFIG_FB_VIA=m
-CONFIG_FB_NEOMAGIC=m
-CONFIG_FB_KYRO=m
-CONFIG_FB_3DFX=m
-CONFIG_FB_3DFX_ACCEL=y
-CONFIG_FB_3DFX_I2C=y
-CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
-CONFIG_FB_TRIDENT=m
-# CONFIG_FB_ARK is not set
-# CONFIG_FB_PM3 is not set
-# CONFIG_FB_CARMINE is not set
-# CONFIG_FB_GEODE is not set
-# CONFIG_FB_TMIO is not set
-# CONFIG_FB_SM501 is not set
-# CONFIG_FB_VIRTUAL is not set
-# CONFIG_FB_METRONOME is not set
-# CONFIG_FB_MB862XX is not set
-# CONFIG_FB_BROADSHEET is not set
-CONFIG_BACKLIGHT_LCD_SUPPORT=y
-CONFIG_LCD_CLASS_DEVICE=m
-CONFIG_LCD_LMS283GF05=m
-CONFIG_LCD_LTV350QV=m
-CONFIG_LCD_ILI9320=m
-CONFIG_LCD_TDO24M=m
-CONFIG_LCD_VGG2432A4=m
-CONFIG_LCD_PLATFORM=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_GENERIC=m
-CONFIG_BACKLIGHT_PROGEAR=m
-CONFIG_BACKLIGHT_CARILLO_RANCH=m
-CONFIG_BACKLIGHT_MBP_NVIDIA=m
-CONFIG_BACKLIGHT_SAHARA=m
-CONFIG_BACKLIGHT_WM831X=m
-
-#
-# Display device support
-#
-CONFIG_DISPLAY_SUPPORT=m
-
-#
-# Display hardware drivers
-#
-
-#
-# Console display driver support
-#
-CONFIG_VGA_CONSOLE=y
-# CONFIG_VGACON_SOFT_SCROLLBACK is not set
-# CONFIG_MDA_CONSOLE is not set
-CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
-CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
-CONFIG_FONTS=y
-# CONFIG_FONT_8x8 is not set
-CONFIG_FONT_8x16=y
-# CONFIG_FONT_6x11 is not set
-# CONFIG_FONT_7x14 is not set
-# CONFIG_FONT_PEARL_8x8 is not set
-# CONFIG_FONT_ACORN_8x8 is not set
-# CONFIG_FONT_MINI_4x6 is not set
-# CONFIG_FONT_SUN8x16 is not set
-# CONFIG_FONT_SUN12x22 is not set
-# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
-CONFIG_SOUND=m
-CONFIG_SOUND_OSS_CORE=y
-CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-CONFIG_SND=m
-CONFIG_SND_TIMER=m
-CONFIG_SND_PCM=m
-CONFIG_SND_HWDEP=m
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_JACK=y
-CONFIG_SND_SEQUENCER=m
-CONFIG_SND_SEQ_DUMMY=m
-CONFIG_SND_OSSEMUL=y
-CONFIG_SND_MIXER_OSS=m
-CONFIG_SND_PCM_OSS=m
-CONFIG_SND_PCM_OSS_PLUGINS=y
-CONFIG_SND_SEQUENCER_OSS=y
-CONFIG_SND_HRTIMER=m
-CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
-CONFIG_SND_DYNAMIC_MINORS=y
-CONFIG_SND_SUPPORT_OLD_API=y
-CONFIG_SND_VERBOSE_PROCFS=y
-# CONFIG_SND_VERBOSE_PRINTK is not set
-# CONFIG_SND_DEBUG is not set
-CONFIG_SND_VMASTER=y
-CONFIG_SND_DMA_SGBUF=y
-CONFIG_SND_RAWMIDI_SEQ=m
-CONFIG_SND_OPL3_LIB_SEQ=m
-CONFIG_SND_OPL4_LIB_SEQ=m
-CONFIG_SND_SBAWE_SEQ=m
-CONFIG_SND_EMU10K1_SEQ=m
-CONFIG_SND_MPU401_UART=m
-CONFIG_SND_OPL3_LIB=m
-CONFIG_SND_OPL4_LIB=m
-CONFIG_SND_VX_LIB=m
-CONFIG_SND_AC97_CODEC=m
-CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCSP is not set
-CONFIG_SND_DUMMY=m
-CONFIG_SND_VIRMIDI=m
-CONFIG_SND_MTPAV=m
-CONFIG_SND_MTS64=m
-CONFIG_SND_SERIAL_U16550=m
-CONFIG_SND_MPU401=m
-CONFIG_SND_PORTMAN2X4=m
-CONFIG_SND_AC97_POWER_SAVE=y
-CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
-CONFIG_SND_WSS_LIB=m
-CONFIG_SND_SB_COMMON=m
-CONFIG_SND_SB8_DSP=m
-CONFIG_SND_SB16_DSP=m
-CONFIG_SND_ISA=y
-CONFIG_SND_ADLIB=m
-CONFIG_SND_AD1816A=m
-CONFIG_SND_AD1848=m
-CONFIG_SND_ALS100=m
-CONFIG_SND_AZT2320=m
-CONFIG_SND_CMI8330=m
-CONFIG_SND_CS4231=m
-CONFIG_SND_CS4236=m
-CONFIG_SND_DT019X=m
-CONFIG_SND_ES968=m
-CONFIG_SND_ES1688=m
-CONFIG_SND_ES18XX=m
-CONFIG_SND_SC6000=m
-CONFIG_SND_GUSCLASSIC=m
-CONFIG_SND_GUSEXTREME=m
-CONFIG_SND_GUSMAX=m
-CONFIG_SND_INTERWAVE=m
-CONFIG_SND_INTERWAVE_STB=m
-CONFIG_SND_OPL3SA2=m
-CONFIG_SND_OPTI92X_AD1848=m
-CONFIG_SND_OPTI92X_CS4231=m
-CONFIG_SND_OPTI93X=m
-CONFIG_SND_MIRO=m
-CONFIG_SND_SB8=m
-CONFIG_SND_SB16=m
-CONFIG_SND_SBAWE=m
-CONFIG_SND_SB16_CSP=y
-CONFIG_SND_SGALAXY=m
-CONFIG_SND_SSCAPE=m
-CONFIG_SND_WAVEFRONT=m
-CONFIG_SND_MSND_PINNACLE=m
-CONFIG_SND_MSND_CLASSIC=m
-CONFIG_SND_PCI=y
-CONFIG_SND_AD1889=m
-CONFIG_SND_ALS300=m
-CONFIG_SND_ALS4000=m
-CONFIG_SND_ALI5451=m
-CONFIG_SND_ATIIXP=m
-CONFIG_SND_ATIIXP_MODEM=m
-CONFIG_SND_AU8810=m
-CONFIG_SND_AU8820=m
-CONFIG_SND_AU8830=m
-CONFIG_SND_AW2=m
-CONFIG_SND_AZT3328=m
-CONFIG_SND_BT87X=m
-# CONFIG_SND_BT87X_OVERCLOCK is not set
-CONFIG_SND_CA0106=m
-CONFIG_SND_CMIPCI=m
-CONFIG_SND_OXYGEN_LIB=m
-CONFIG_SND_OXYGEN=m
-CONFIG_SND_CS4281=m
-CONFIG_SND_CS46XX=m
-CONFIG_SND_CS46XX_NEW_DSP=y
-CONFIG_SND_CS5530=m
-CONFIG_SND_CS5535AUDIO=m
-CONFIG_SND_CTXFI=m
-CONFIG_SND_DARLA20=m
-CONFIG_SND_GINA20=m
-CONFIG_SND_LAYLA20=m
-CONFIG_SND_DARLA24=m
-CONFIG_SND_GINA24=m
-CONFIG_SND_LAYLA24=m
-CONFIG_SND_MONA=m
-CONFIG_SND_MIA=m
-CONFIG_SND_ECHO3G=m
-CONFIG_SND_INDIGO=m
-CONFIG_SND_INDIGOIO=m
-CONFIG_SND_INDIGODJ=m
-CONFIG_SND_INDIGOIOX=m
-CONFIG_SND_INDIGODJX=m
-CONFIG_SND_EMU10K1=m
-CONFIG_SND_EMU10K1X=m
-CONFIG_SND_ENS1370=m
-CONFIG_SND_ENS1371=m
-CONFIG_SND_ES1938=m
-CONFIG_SND_ES1968=m
-CONFIG_SND_FM801=m
-CONFIG_SND_FM801_TEA575X_BOOL=y
-CONFIG_SND_FM801_TEA575X=m
-CONFIG_SND_HDA_INTEL=m
-CONFIG_SND_HDA_HWDEP=y
-CONFIG_SND_HDA_RECONFIG=y
-CONFIG_SND_HDA_INPUT_BEEP=y
-CONFIG_SND_HDA_INPUT_JACK=y
-CONFIG_SND_HDA_PATCH_LOADER=y
-CONFIG_SND_HDA_CODEC_REALTEK=y
-CONFIG_SND_HDA_CODEC_ANALOG=y
-CONFIG_SND_HDA_CODEC_SIGMATEL=y
-CONFIG_SND_HDA_CODEC_VIA=y
-CONFIG_SND_HDA_CODEC_ATIHDMI=y
-CONFIG_SND_HDA_CODEC_NVHDMI=y
-CONFIG_SND_HDA_CODEC_INTELHDMI=y
-CONFIG_SND_HDA_ELD=y
-CONFIG_SND_HDA_CODEC_CIRRUS=y
-CONFIG_SND_HDA_CODEC_CONEXANT=y
-CONFIG_SND_HDA_CODEC_CA0110=y
-CONFIG_SND_HDA_CODEC_CMEDIA=y
-CONFIG_SND_HDA_CODEC_SI3054=y
-CONFIG_SND_HDA_GENERIC=y
-CONFIG_SND_HDA_POWER_SAVE=y
-CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
-CONFIG_SND_HDSP=m
-CONFIG_SND_HDSPM=m
-CONFIG_SND_HIFIER=m
-CONFIG_SND_ICE1712=m
-CONFIG_SND_ICE1724=m
-CONFIG_SND_INTEL8X0=m
-CONFIG_SND_INTEL8X0M=m
-CONFIG_SND_KORG1212=m
-CONFIG_SND_LX6464ES=m
-CONFIG_SND_MAESTRO3=m
-CONFIG_SND_MIXART=m
-CONFIG_SND_NM256=m
-CONFIG_SND_PCXHR=m
-CONFIG_SND_RIPTIDE=m
-CONFIG_SND_RME32=m
-CONFIG_SND_RME96=m
-CONFIG_SND_RME9652=m
-CONFIG_SND_SIS7019=m
-CONFIG_SND_SONICVIBES=m
-CONFIG_SND_TRIDENT=m
-CONFIG_SND_VIA82XX=m
-CONFIG_SND_VIA82XX_MODEM=m
-CONFIG_SND_VIRTUOSO=m
-CONFIG_SND_VX222=m
-CONFIG_SND_YMFPCI=m
-CONFIG_SND_SPI=y
-CONFIG_SND_USB=y
-CONFIG_SND_USB_AUDIO=m
-CONFIG_SND_USB_USX2Y=m
-CONFIG_SND_USB_CAIAQ=m
-CONFIG_SND_USB_CAIAQ_INPUT=y
-CONFIG_SND_USB_US122L=m
-CONFIG_SND_PCMCIA=y
-CONFIG_SND_VXPOCKET=m
-CONFIG_SND_PDAUDIOCF=m
-CONFIG_SND_SOC=m
-CONFIG_SND_SOC_I2C_AND_SPI=m
-# CONFIG_SND_SOC_ALL_CODECS is not set
-# CONFIG_SOUND_PRIME is not set
-CONFIG_AC97_BUS=m
-CONFIG_HID_SUPPORT=y
-CONFIG_HID=m
-CONFIG_HIDRAW=y
-
-#
-# USB Input Devices
-#
-CONFIG_USB_HID=m
-CONFIG_HID_PID=y
-CONFIG_USB_HIDDEV=y
-
-#
-# Special HID drivers
-#
-CONFIG_HID_A4TECH=m
-CONFIG_HID_APPLE=m
-CONFIG_HID_BELKIN=m
-CONFIG_HID_CHERRY=m
-CONFIG_HID_CHICONY=m
-CONFIG_HID_CYPRESS=m
-CONFIG_HID_DRAGONRISE=m
-CONFIG_DRAGONRISE_FF=y
-CONFIG_HID_EZKEY=m
-CONFIG_HID_KYE=m
-CONFIG_HID_GYRATION=m
-CONFIG_HID_TWINHAN=m
-CONFIG_HID_KENSINGTON=m
-CONFIG_HID_LOGITECH=m
-CONFIG_LOGITECH_FF=y
-CONFIG_LOGIRUMBLEPAD2_FF=y
-CONFIG_HID_MICROSOFT=m
-CONFIG_HID_MONTEREY=m
-CONFIG_HID_NTRIG=m
-CONFIG_HID_PANTHERLORD=m
-CONFIG_PANTHERLORD_FF=y
-CONFIG_HID_PETALYNX=m
-CONFIG_HID_SAMSUNG=m
-CONFIG_HID_SONY=m
-CONFIG_HID_SUNPLUS=m
-CONFIG_HID_GREENASIA=m
-CONFIG_GREENASIA_FF=y
-CONFIG_HID_SMARTJOYPLUS=m
-CONFIG_SMARTJOYPLUS_FF=y
-CONFIG_HID_TOPSEED=m
-CONFIG_HID_THRUSTMASTER=m
-CONFIG_THRUSTMASTER_FF=y
-CONFIG_HID_WACOM=m
-CONFIG_HID_ZEROPLUS=m
-CONFIG_ZEROPLUS_FF=y
-CONFIG_USB_SUPPORT=y
-CONFIG_USB_ARCH_HAS_HCD=y
-CONFIG_USB_ARCH_HAS_OHCI=y
-CONFIG_USB_ARCH_HAS_EHCI=y
-CONFIG_USB=m
-# CONFIG_USB_DEBUG is not set
-# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
-
-#
-# Miscellaneous USB options
-#
-CONFIG_USB_DEVICEFS=y
-# CONFIG_USB_DEVICE_CLASS is not set
-CONFIG_USB_DYNAMIC_MINORS=y
-CONFIG_USB_SUSPEND=y
-# CONFIG_USB_OTG is not set
-CONFIG_USB_MON=m
-CONFIG_USB_WUSB=m
-CONFIG_USB_WUSB_CBAF=m
-# CONFIG_USB_WUSB_CBAF_DEBUG is not set
-
-#
-# USB Host Controller Drivers
-#
-CONFIG_USB_C67X00_HCD=m
-CONFIG_USB_XHCI_HCD=m
-# CONFIG_USB_XHCI_HCD_DEBUGGING is not set
-CONFIG_USB_EHCI_HCD=m
-CONFIG_USB_EHCI_ROOT_HUB_TT=y
-CONFIG_USB_EHCI_TT_NEWSCHED=y
-CONFIG_USB_OXU210HP_HCD=m
-CONFIG_USB_ISP116X_HCD=m
-CONFIG_USB_ISP1760_HCD=m
-CONFIG_USB_ISP1362_HCD=m
-CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_OHCI_HCD_SSB is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
-# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
-CONFIG_USB_OHCI_LITTLE_ENDIAN=y
-CONFIG_USB_UHCI_HCD=m
-CONFIG_USB_U132_HCD=m
-CONFIG_USB_SL811_HCD=m
-CONFIG_USB_SL811_CS=m
-CONFIG_USB_R8A66597_HCD=m
-CONFIG_USB_WHCI_HCD=m
-CONFIG_USB_HWA_HCD=m
-# CONFIG_USB_GADGET_MUSB_HDRC is not set
-
-#
-# USB Device Class drivers
-#
-CONFIG_USB_ACM=m
-CONFIG_USB_PRINTER=m
-CONFIG_USB_WDM=m
-CONFIG_USB_TMC=m
-
-#
-# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
-#
-
-#
-# also be needed; see USB_STORAGE Help for more info
-#
-CONFIG_USB_STORAGE=m
-# CONFIG_USB_STORAGE_DEBUG is not set
-CONFIG_USB_STORAGE_DATAFAB=m
-CONFIG_USB_STORAGE_FREECOM=m
-CONFIG_USB_STORAGE_ISD200=m
-CONFIG_USB_STORAGE_USBAT=m
-CONFIG_USB_STORAGE_SDDR09=m
-CONFIG_USB_STORAGE_SDDR55=m
-CONFIG_USB_STORAGE_JUMPSHOT=m
-CONFIG_USB_STORAGE_ALAUDA=m
-CONFIG_USB_STORAGE_ONETOUCH=m
-CONFIG_USB_STORAGE_KARMA=m
-CONFIG_USB_STORAGE_CYPRESS_ATACB=m
-# CONFIG_USB_LIBUSUAL is not set
-
-#
-# USB Imaging devices
-#
-CONFIG_USB_MDC800=m
-CONFIG_USB_MICROTEK=m
-
-#
-# USB port drivers
-#
-CONFIG_USB_USS720=m
-CONFIG_USB_SERIAL=m
-CONFIG_USB_EZUSB=y
-CONFIG_USB_SERIAL_GENERIC=y
-CONFIG_USB_SERIAL_AIRCABLE=m
-CONFIG_USB_SERIAL_ARK3116=m
-CONFIG_USB_SERIAL_BELKIN=m
-CONFIG_USB_SERIAL_CH341=m
-CONFIG_USB_SERIAL_WHITEHEAT=m
-CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
-CONFIG_USB_SERIAL_CP210X=m
-CONFIG_USB_SERIAL_CYPRESS_M8=m
-CONFIG_USB_SERIAL_EMPEG=m
-CONFIG_USB_SERIAL_FTDI_SIO=m
-CONFIG_USB_SERIAL_FUNSOFT=m
-CONFIG_USB_SERIAL_VISOR=m
-CONFIG_USB_SERIAL_IPAQ=m
-CONFIG_USB_SERIAL_IR=m
-CONFIG_USB_SERIAL_EDGEPORT=m
-CONFIG_USB_SERIAL_EDGEPORT_TI=m
-CONFIG_USB_SERIAL_GARMIN=m
-CONFIG_USB_SERIAL_IPW=m
-CONFIG_USB_SERIAL_IUU=m
-CONFIG_USB_SERIAL_KEYSPAN_PDA=m
-CONFIG_USB_SERIAL_KEYSPAN=m
-CONFIG_USB_SERIAL_KEYSPAN_MPR=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XA=y
-CONFIG_USB_SERIAL_KEYSPAN_USA28XB=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19=y
-CONFIG_USB_SERIAL_KEYSPAN_USA18X=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QW=y
-CONFIG_USB_SERIAL_KEYSPAN_USA19QI=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49W=y
-CONFIG_USB_SERIAL_KEYSPAN_USA49WLC=y
-CONFIG_USB_SERIAL_KLSI=m
-CONFIG_USB_SERIAL_KOBIL_SCT=m
-CONFIG_USB_SERIAL_MCT_U232=m
-CONFIG_USB_SERIAL_MOS7720=m
-CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
-CONFIG_USB_SERIAL_NAVMAN=m
-CONFIG_USB_SERIAL_PL2303=m
-CONFIG_USB_SERIAL_OTI6858=m
-CONFIG_USB_SERIAL_QUALCOMM=m
-CONFIG_USB_SERIAL_SPCP8X5=m
-CONFIG_USB_SERIAL_HP4X=m
-CONFIG_USB_SERIAL_SAFE=m
-# CONFIG_USB_SERIAL_SAFE_PADDED is not set
-CONFIG_USB_SERIAL_SIEMENS_MPI=m
-CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SYMBOL=m
-CONFIG_USB_SERIAL_TI=m
-CONFIG_USB_SERIAL_CYBERJACK=m
-CONFIG_USB_SERIAL_XIRCOM=m
-CONFIG_USB_SERIAL_OPTION=m
-CONFIG_USB_SERIAL_OMNINET=m
-CONFIG_USB_SERIAL_OPTICON=m
-# CONFIG_USB_SERIAL_DEBUG is not set
-
-#
-# USB Miscellaneous drivers
-#
-CONFIG_USB_EMI62=m
-CONFIG_USB_EMI26=m
-CONFIG_USB_ADUTUX=m
-CONFIG_USB_SEVSEG=m
-CONFIG_USB_RIO500=m
-CONFIG_USB_LEGOTOWER=m
-CONFIG_USB_LCD=m
-CONFIG_USB_BERRY_CHARGE=m
-CONFIG_USB_LED=m
-CONFIG_USB_CYPRESS_CY7C63=m
-CONFIG_USB_CYTHERM=m
-CONFIG_USB_IDMOUSE=m
-CONFIG_USB_FTDI_ELAN=m
-CONFIG_USB_APPLEDISPLAY=m
-CONFIG_USB_SISUSBVGA=m
-# CONFIG_USB_SISUSBVGA_CON is not set
-CONFIG_USB_LD=m
-CONFIG_USB_TRANCEVIBRATOR=m
-CONFIG_USB_IOWARRIOR=m
-CONFIG_USB_TEST=m
-CONFIG_USB_ISIGHTFW=m
-CONFIG_USB_VST=m
-CONFIG_USB_ATM=m
-CONFIG_USB_SPEEDTOUCH=m
-CONFIG_USB_CXACRU=m
-CONFIG_USB_UEAGLEATM=m
-CONFIG_USB_XUSBATM=m
-CONFIG_USB_GADGET=m
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-CONFIG_USB_GADGET_VBUS_DRAW=2
-CONFIG_USB_GADGET_SELECTED=y
-# CONFIG_USB_GADGET_AT91 is not set
-# CONFIG_USB_GADGET_ATMEL_USBA is not set
-# CONFIG_USB_GADGET_FSL_USB2 is not set
-# CONFIG_USB_GADGET_LH7A40X is not set
-# CONFIG_USB_GADGET_OMAP is not set
-# CONFIG_USB_GADGET_PXA25X is not set
-# CONFIG_USB_GADGET_R8A66597 is not set
-# CONFIG_USB_GADGET_PXA27X is not set
-# CONFIG_USB_GADGET_S3C_HSOTG is not set
-# CONFIG_USB_GADGET_IMX is not set
-# CONFIG_USB_GADGET_S3C2410 is not set
-# CONFIG_USB_GADGET_M66592 is not set
-# CONFIG_USB_GADGET_AMD5536UDC is not set
-# CONFIG_USB_GADGET_FSL_QE is not set
-# CONFIG_USB_GADGET_CI13XXX is not set
-CONFIG_USB_GADGET_NET2280=y
-CONFIG_USB_NET2280=m
-# CONFIG_USB_GADGET_GOKU is not set
-# CONFIG_USB_GADGET_LANGWELL is not set
-# CONFIG_USB_GADGET_DUMMY_HCD is not set
-CONFIG_USB_GADGET_DUALSPEED=y
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_AUDIO=m
-CONFIG_USB_ETH=m
-CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_ETH_EEM is not set
-CONFIG_USB_GADGETFS=m
-CONFIG_USB_FILE_STORAGE=m
-# CONFIG_USB_FILE_STORAGE_TEST is not set
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_MIDI_GADGET=m
-CONFIG_USB_G_PRINTER=m
-# CONFIG_USB_CDC_COMPOSITE is not set
-
-#
-# OTG and related infrastructure
-#
-CONFIG_USB_OTG_UTILS=y
-CONFIG_USB_GPIO_VBUS=m
-CONFIG_NOP_USB_XCEIV=m
-CONFIG_UWB=m
-CONFIG_UWB_HWA=m
-CONFIG_UWB_WHCI=m
-CONFIG_UWB_WLP=m
-CONFIG_UWB_I1480U=m
-CONFIG_UWB_I1480U_WLP=m
-CONFIG_MMC=m
-# CONFIG_MMC_DEBUG is not set
-# CONFIG_MMC_UNSAFE_RESUME is not set
-
-#
-# MMC/SD/SDIO Card Drivers
-#
-CONFIG_MMC_BLOCK=m
-CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
-# CONFIG_MMC_TEST is not set
-
-#
-# MMC/SD/SDIO Host Controller Drivers
-#
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
-CONFIG_MMC_RICOH_MMC=m
-CONFIG_MMC_SDHCI_PLTFM=m
-CONFIG_MMC_WBSD=m
-# CONFIG_MMC_AT91 is not set
-# CONFIG_MMC_ATMELMCI is not set
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MEMSTICK=m
-# CONFIG_MEMSTICK_DEBUG is not set
-
-#
-# MemoryStick drivers
-#
-# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
-CONFIG_MSPRO_BLOCK=m
-
-#
-# MemoryStick Host Controller Drivers
-#
-CONFIG_MEMSTICK_TIFM_MS=m
-CONFIG_MEMSTICK_JMICRON_38X=m
-CONFIG_NEW_LEDS=y
-CONFIG_LEDS_CLASS=m
-
-#
-# LED drivers
-#
-# CONFIG_LEDS_ALIX2 is not set
-CONFIG_LEDS_PCA9532=m
-CONFIG_LEDS_GPIO=m
-CONFIG_LEDS_GPIO_PLATFORM=y
-CONFIG_LEDS_LP3944=m
-CONFIG_LEDS_CLEVO_MAIL=m
-CONFIG_LEDS_PCA955X=m
-CONFIG_LEDS_WM831X_STATUS=m
-CONFIG_LEDS_WM8350=m
-CONFIG_LEDS_DAC124S085=m
-CONFIG_LEDS_BD2802=m
-
-#
-# LED Triggers
-#
-CONFIG_LEDS_TRIGGERS=y
-CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
-CONFIG_LEDS_TRIGGER_HEARTBEAT=m
-CONFIG_LEDS_TRIGGER_BACKLIGHT=m
-CONFIG_LEDS_TRIGGER_GPIO=m
-CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
-
-#
-# iptables trigger is under Netfilter config (LED target)
-#
-CONFIG_ACCESSIBILITY=y
-CONFIG_A11Y_BRAILLE_CONSOLE=y
-# CONFIG_INFINIBAND is not set
-CONFIG_EDAC=y
-
-#
-# Reporting subsystems
-#
-# CONFIG_EDAC_DEBUG is not set
-CONFIG_EDAC_DECODE_MCE=m
-CONFIG_EDAC_MM_EDAC=m
-CONFIG_EDAC_AMD76X=m
-CONFIG_EDAC_E7XXX=m
-CONFIG_EDAC_E752X=m
-CONFIG_EDAC_I82875P=m
-CONFIG_EDAC_I82975X=m
-CONFIG_EDAC_I3000=m
-CONFIG_EDAC_I3200=m
-CONFIG_EDAC_X38=m
-CONFIG_EDAC_I5400=m
-CONFIG_EDAC_I82860=m
-CONFIG_EDAC_R82600=m
-CONFIG_EDAC_I5000=m
-CONFIG_EDAC_I5100=m
-CONFIG_RTC_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-# CONFIG_RTC_DEBUG is not set
-
-#
-# RTC interfaces
-#
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_INTF_DEV_UIE_EMUL=y
-CONFIG_RTC_DRV_TEST=m
-
-#
-# I2C RTC drivers
-#
-CONFIG_RTC_DRV_DS1307=m
-CONFIG_RTC_DRV_DS1374=m
-CONFIG_RTC_DRV_DS1672=m
-CONFIG_RTC_DRV_MAX6900=m
-CONFIG_RTC_DRV_RS5C372=m
-CONFIG_RTC_DRV_ISL1208=m
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_DRV_PCF8563=m
-CONFIG_RTC_DRV_PCF8583=m
-CONFIG_RTC_DRV_M41T80=m
-CONFIG_RTC_DRV_M41T80_WDT=y
-CONFIG_RTC_DRV_S35390A=m
-CONFIG_RTC_DRV_FM3130=m
-CONFIG_RTC_DRV_RX8581=m
-CONFIG_RTC_DRV_RX8025=m
-
-#
-# SPI RTC drivers
-#
-CONFIG_RTC_DRV_M41T94=m
-CONFIG_RTC_DRV_DS1305=m
-CONFIG_RTC_DRV_DS1390=m
-CONFIG_RTC_DRV_MAX6902=m
-CONFIG_RTC_DRV_R9701=m
-CONFIG_RTC_DRV_RS5C348=m
-CONFIG_RTC_DRV_DS3234=m
-CONFIG_RTC_DRV_PCF2123=m
-
-#
-# Platform RTC drivers
-#
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_RTC_DRV_DS1286=m
-CONFIG_RTC_DRV_DS1511=m
-CONFIG_RTC_DRV_DS1553=m
-CONFIG_RTC_DRV_DS1742=m
-CONFIG_RTC_DRV_STK17TA8=m
-CONFIG_RTC_DRV_M48T86=m
-CONFIG_RTC_DRV_M48T35=m
-CONFIG_RTC_DRV_M48T59=m
-CONFIG_RTC_DRV_BQ4802=m
-CONFIG_RTC_DRV_V3020=m
-CONFIG_RTC_DRV_WM831X=m
-CONFIG_RTC_DRV_WM8350=m
-CONFIG_RTC_DRV_PCF50633=m
-CONFIG_RTC_DRV_AB3100=m
-
-#
-# on-CPU RTC drivers
-#
-# CONFIG_RTC_DRV_PCAP is not set
-CONFIG_DMADEVICES=y
-
-#
-# DMA Devices
-#
-CONFIG_ASYNC_TX_DISABLE_CHANNEL_SWITCH=y
-CONFIG_INTEL_IOATDMA=m
-CONFIG_DMA_ENGINE=y
-
-#
-# DMA Clients
-#
-CONFIG_NET_DMA=y
-CONFIG_ASYNC_TX_DMA=y
-# CONFIG_DMATEST is not set
-CONFIG_DCA=m
-CONFIG_AUXDISPLAY=y
-CONFIG_KS0108=m
-CONFIG_KS0108_PORT=0x378
-CONFIG_KS0108_DELAY=2
-CONFIG_CFAG12864B=m
-CONFIG_CFAG12864B_RATE=20
-CONFIG_UIO=m
-CONFIG_UIO_CIF=m
-CONFIG_UIO_PDRV=m
-CONFIG_UIO_PDRV_GENIRQ=m
-CONFIG_UIO_SMX=m
-CONFIG_UIO_AEC=m
-CONFIG_UIO_SERCOS3=m
-CONFIG_UIO_PCI_GENERIC=m
-
-#
-# TI VLYNQ
-#
-CONFIG_STAGING=y
-# CONFIG_STAGING_EXCLUDE_BUILD is not set
-CONFIG_ET131X=m
-# CONFIG_ET131X_DEBUG is not set
-CONFIG_SLICOSS=m
-CONFIG_VIDEO_GO7007=m
-CONFIG_VIDEO_GO7007_USB=m
-# CONFIG_VIDEO_GO7007_USB_S2250_BOARD is not set
-CONFIG_VIDEO_GO7007_OV7640=m
-CONFIG_VIDEO_GO7007_SAA7113=m
-CONFIG_VIDEO_GO7007_SAA7115=m
-CONFIG_VIDEO_GO7007_TW9903=m
-CONFIG_VIDEO_GO7007_UDA1342=m
-CONFIG_VIDEO_GO7007_SONY_TUNER=m
-CONFIG_VIDEO_GO7007_TW2804=m
-CONFIG_VIDEO_CX25821=m
-CONFIG_VIDEO_CX25821_ALSA=m
-CONFIG_USB_IP_COMMON=m
-CONFIG_USB_IP_VHCI_HCD=m
-CONFIG_USB_IP_HOST=m
-CONFIG_W35UND=m
-CONFIG_PRISM2_USB=m
-CONFIG_ECHO=m
-CONFIG_POCH=m
-CONFIG_OTUS=m
-CONFIG_RT2860=m
-CONFIG_RT2870=m
-CONFIG_RT3090=m
-CONFIG_COMEDI=m
-# CONFIG_COMEDI_DEBUG is not set
-CONFIG_COMEDI_PCI_DRIVERS=m
-CONFIG_COMEDI_PCMCIA_DRIVERS=m
-CONFIG_COMEDI_USB_DRIVERS=m
-CONFIG_COMEDI_8255=m
-CONFIG_ASUS_OLED=m
-# CONFIG_PANEL is not set
-# CONFIG_ALTERA_PCIE_CHDMA is not set
-CONFIG_RTL8187SE=m
-CONFIG_RTL8192SU=m
-CONFIG_RTL8192E=m
-# CONFIG_TRANZPORT is not set
-
-#
-# Android
-#
-
-#
-# Qualcomm MSM Camera And Video
-#
-
-#
-# Camera Sensor Selection
-#
-CONFIG_INPUT_GPIO=m
-CONFIG_DST=m
-# CONFIG_DST_DEBUG is not set
-CONFIG_POHMELFS=m
-# CONFIG_POHMELFS_DEBUG is not set
-CONFIG_POHMELFS_CRYPTO=y
-CONFIG_B3DFG=m
-CONFIG_IDE_PHISON=m
-CONFIG_PLAN9AUTH=m
-CONFIG_LINE6_USB=m
-# CONFIG_DRM_RADEON_KMS is not set
-CONFIG_USB_SERIAL_QUATECH2=m
-CONFIG_USB_SERIAL_QUATECH_USB2=m
-CONFIG_VT6655=m
-CONFIG_VT6656=m
-CONFIG_FB_UDL=m
-CONFIG_HYPERV=m
-CONFIG_HYPERV_STORAGE=m
-CONFIG_HYPERV_BLOCK=m
-CONFIG_HYPERV_NET=m
-# CONFIG_VME_BUS is not set
-
-#
-# RAR Register Driver
-#
-# CONFIG_RAR_REGISTER is not set
-# CONFIG_IIO is not set
-CONFIG_X86_PLATFORM_DEVICES=y
-CONFIG_ACER_WMI=m
-CONFIG_ACERHDF=m
-CONFIG_ASUS_LAPTOP=m
-CONFIG_DELL_WMI=m
-CONFIG_FUJITSU_LAPTOP=m
-# CONFIG_FUJITSU_LAPTOP_DEBUG is not set
-CONFIG_TC1100_WMI=m
-CONFIG_HP_WMI=m
-CONFIG_MSI_LAPTOP=m
-CONFIG_PANASONIC_LAPTOP=m
-CONFIG_COMPAL_LAPTOP=m
-CONFIG_SONY_LAPTOP=m
-# CONFIG_SONYPI_COMPAT is not set
-CONFIG_THINKPAD_ACPI=m
-# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
-# CONFIG_THINKPAD_ACPI_DEBUG is not set
-# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
-CONFIG_THINKPAD_ACPI_VIDEO=y
-CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
-CONFIG_INTEL_MENLOW=m
-CONFIG_EEEPC_LAPTOP=m
-CONFIG_ACPI_WMI=m
-CONFIG_ACPI_ASUS=m
-CONFIG_TOPSTAR_LAPTOP=m
-CONFIG_ACPI_TOSHIBA=m
-
-#
-# Firmware Drivers
-#
-CONFIG_EDD=m
-# CONFIG_EDD_OFF is not set
-CONFIG_FIRMWARE_MEMMAP=y
-CONFIG_EFI_VARS=m
-CONFIG_DELL_RBU=m
-CONFIG_DCDBAS=m
-CONFIG_DMIID=y
-# CONFIG_ISCSI_IBFT_FIND is not set
-
-#
-# File systems
-#
-CONFIG_EXT2_FS=m
-CONFIG_EXT2_FS_XATTR=y
-CONFIG_EXT2_FS_POSIX_ACL=y
-CONFIG_EXT2_FS_SECURITY=y
-# CONFIG_EXT2_FS_XIP is not set
-CONFIG_EXT3_FS=m
-CONFIG_EXT3_DEFAULTS_TO_ORDERED=y
-CONFIG_EXT3_FS_XATTR=y
-CONFIG_EXT3_FS_POSIX_ACL=y
-CONFIG_EXT3_FS_SECURITY=y
-CONFIG_EXT4_FS=m
-CONFIG_EXT4_FS_XATTR=y
-CONFIG_EXT4_FS_POSIX_ACL=y
-CONFIG_EXT4_FS_SECURITY=y
-# CONFIG_EXT4_DEBUG is not set
-CONFIG_JBD=m
-# CONFIG_JBD_DEBUG is not set
-CONFIG_JBD2=m
-# CONFIG_JBD2_DEBUG is not set
-CONFIG_FS_MBCACHE=m
-CONFIG_REISERFS_FS=m
-# CONFIG_REISERFS_CHECK is not set
-CONFIG_REISERFS_PROC_INFO=y
-CONFIG_REISERFS_FS_XATTR=y
-CONFIG_REISERFS_FS_POSIX_ACL=y
-CONFIG_REISERFS_FS_SECURITY=y
-CONFIG_JFS_FS=m
-CONFIG_JFS_POSIX_ACL=y
-CONFIG_JFS_SECURITY=y
-# CONFIG_JFS_DEBUG is not set
-CONFIG_JFS_STATISTICS=y
-CONFIG_FS_POSIX_ACL=y
-CONFIG_XFS_FS=m
-CONFIG_XFS_QUOTA=y
-CONFIG_XFS_POSIX_ACL=y
-CONFIG_XFS_RT=y
-# CONFIG_XFS_DEBUG is not set
-CONFIG_GFS2_FS=m
-CONFIG_GFS2_FS_LOCKING_DLM=y
-CONFIG_OCFS2_FS=m
-CONFIG_OCFS2_FS_O2CB=m
-CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
-CONFIG_OCFS2_FS_STATS=y
-# CONFIG_OCFS2_DEBUG_MASKLOG is not set
-# CONFIG_OCFS2_DEBUG_FS is not set
-CONFIG_OCFS2_FS_POSIX_ACL=y
-CONFIG_BTRFS_FS=m
-CONFIG_BTRFS_FS_POSIX_ACL=y
-CONFIG_NILFS2_FS=m
-CONFIG_FILE_LOCKING=y
-CONFIG_FSNOTIFY=y
-CONFIG_DNOTIFY=y
-CONFIG_INOTIFY=y
-CONFIG_INOTIFY_USER=y
-CONFIG_QUOTA=y
-CONFIG_QUOTA_NETLINK_INTERFACE=y
-# CONFIG_PRINT_QUOTA_WARNING is not set
-CONFIG_QUOTA_TREE=m
-CONFIG_QFMT_V1=m
-CONFIG_QFMT_V2=m
-CONFIG_QUOTACTL=y
-# CONFIG_AUTOFS_FS is not set
-CONFIG_AUTOFS4_FS=m
-CONFIG_FUSE_FS=m
-CONFIG_CUSE=m
-CONFIG_GENERIC_ACL=y
-
-#
-# Caches
-#
-CONFIG_FSCACHE=m
-CONFIG_FSCACHE_STATS=y
-CONFIG_FSCACHE_HISTOGRAM=y
-# CONFIG_FSCACHE_DEBUG is not set
-# CONFIG_FSCACHE_OBJECT_LIST is not set
-CONFIG_CACHEFILES=m
-# CONFIG_CACHEFILES_DEBUG is not set
-# CONFIG_CACHEFILES_HISTOGRAM is not set
-
-#
-# CD-ROM/DVD Filesystems
-#
-CONFIG_ISO9660_FS=m
-CONFIG_JOLIET=y
-CONFIG_ZISOFS=y
-CONFIG_UDF_FS=m
-CONFIG_UDF_NLS=y
-
-#
-# DOS/FAT/NT Filesystems
-#
-CONFIG_FAT_FS=m
-CONFIG_MSDOS_FS=m
-CONFIG_VFAT_FS=m
-CONFIG_FAT_DEFAULT_CODEPAGE=437
-CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
-CONFIG_NTFS_FS=m
-# CONFIG_NTFS_DEBUG is not set
-CONFIG_NTFS_RW=y
-
-#
-# Pseudo filesystems
-#
-CONFIG_PROC_FS=y
-CONFIG_PROC_KCORE=y
-CONFIG_PROC_SYSCTL=y
-CONFIG_PROC_PAGE_MONITOR=y
-CONFIG_SYSFS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_HUGETLBFS=y
-CONFIG_HUGETLB_PAGE=y
-CONFIG_CONFIGFS_FS=m
-CONFIG_MISC_FILESYSTEMS=y
-# CONFIG_ADFS_FS is not set
-CONFIG_AFFS_FS=m
-CONFIG_ECRYPT_FS=m
-CONFIG_HFS_FS=m
-CONFIG_HFSPLUS_FS=m
-CONFIG_BEFS_FS=m
-# CONFIG_BEFS_DEBUG is not set
-# CONFIG_BFS_FS is not set
-# CONFIG_EFS_FS is not set
-CONFIG_JFFS2_FS=m
-CONFIG_JFFS2_FS_DEBUG=0
-CONFIG_JFFS2_FS_WRITEBUFFER=y
-# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
-# CONFIG_JFFS2_SUMMARY is not set
-# CONFIG_JFFS2_FS_XATTR is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-# CONFIG_JFFS2_LZO is not set
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
-CONFIG_CRAMFS=m
-CONFIG_SQUASHFS=m
-# CONFIG_SQUASHFS_EMBEDDED is not set
-CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
-# CONFIG_VXFS_FS is not set
-# CONFIG_MINIX_FS is not set
-CONFIG_OMFS_FS=m
-# CONFIG_HPFS_FS is not set
-# CONFIG_QNX4FS_FS is not set
-# CONFIG_ROMFS_FS is not set
-# CONFIG_SYSV_FS is not set
-CONFIG_UFS_FS=m
-# CONFIG_UFS_FS_WRITE is not set
-# CONFIG_UFS_DEBUG is not set
-CONFIG_EXOFS_FS=m
-# CONFIG_EXOFS_DEBUG is not set
-CONFIG_NETWORK_FILESYSTEMS=y
-CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
-CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
-# CONFIG_NFS_V4_1 is not set
-CONFIG_NFS_FSCACHE=y
-CONFIG_NFSD=m
-CONFIG_NFSD_V2_ACL=y
-CONFIG_NFSD_V3=y
-CONFIG_NFSD_V3_ACL=y
-CONFIG_NFSD_V4=y
-CONFIG_LOCKD=m
-CONFIG_LOCKD_V4=y
-CONFIG_EXPORTFS=m
-CONFIG_NFS_ACL_SUPPORT=m
-CONFIG_NFS_COMMON=y
-CONFIG_SUNRPC=m
-CONFIG_SUNRPC_GSS=m
-CONFIG_RPCSEC_GSS_KRB5=m
-CONFIG_RPCSEC_GSS_SPKM3=m
-CONFIG_SMB_FS=m
-# CONFIG_SMB_NLS_DEFAULT is not set
-CONFIG_CIFS=m
-CONFIG_CIFS_STATS=y
-# CONFIG_CIFS_STATS2 is not set
-CONFIG_CIFS_WEAK_PW_HASH=y
-CONFIG_CIFS_UPCALL=y
-CONFIG_CIFS_XATTR=y
-CONFIG_CIFS_POSIX=y
-# CONFIG_CIFS_DEBUG2 is not set
-CONFIG_CIFS_DFS_UPCALL=y
-# CONFIG_CIFS_EXPERIMENTAL is not set
-CONFIG_NCP_FS=m
-# CONFIG_NCPFS_PACKET_SIGNING is not set
-# CONFIG_NCPFS_IOCTL_LOCKING is not set
-# CONFIG_NCPFS_STRONG is not set
-CONFIG_NCPFS_NFS_NS=y
-CONFIG_NCPFS_OS2_NS=y
-CONFIG_NCPFS_SMALLDOS=y
-CONFIG_NCPFS_NLS=y
-# CONFIG_NCPFS_EXTRAS is not set
-CONFIG_CODA_FS=m
-CONFIG_AFS_FS=m
-# CONFIG_AFS_DEBUG is not set
-CONFIG_AFS_FSCACHE=y
-CONFIG_9P_FS=m
-CONFIG_9P_FSCACHE=y
-
-#
-# Partition Types
-#
-CONFIG_PARTITION_ADVANCED=y
-# CONFIG_ACORN_PARTITION is not set
-# CONFIG_OSF_PARTITION is not set
-# CONFIG_AMIGA_PARTITION is not set
-# CONFIG_ATARI_PARTITION is not set
-CONFIG_MAC_PARTITION=y
-CONFIG_MSDOS_PARTITION=y
-CONFIG_BSD_DISKLABEL=y
-# CONFIG_MINIX_SUBPARTITION is not set
-CONFIG_SOLARIS_X86_PARTITION=y
-# CONFIG_UNIXWARE_DISKLABEL is not set
-CONFIG_LDM_PARTITION=y
-# CONFIG_LDM_DEBUG is not set
-# CONFIG_SGI_PARTITION is not set
-# CONFIG_ULTRIX_PARTITION is not set
-# CONFIG_SUN_PARTITION is not set
-CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
-# CONFIG_SYSV68_PARTITION is not set
-CONFIG_NLS=y
-CONFIG_NLS_DEFAULT="utf8"
-CONFIG_NLS_CODEPAGE_437=m
-CONFIG_NLS_CODEPAGE_737=m
-CONFIG_NLS_CODEPAGE_775=m
-CONFIG_NLS_CODEPAGE_850=m
-CONFIG_NLS_CODEPAGE_852=m
-CONFIG_NLS_CODEPAGE_855=m
-CONFIG_NLS_CODEPAGE_857=m
-CONFIG_NLS_CODEPAGE_860=m
-CONFIG_NLS_CODEPAGE_861=m
-CONFIG_NLS_CODEPAGE_862=m
-CONFIG_NLS_CODEPAGE_863=m
-CONFIG_NLS_CODEPAGE_864=m
-CONFIG_NLS_CODEPAGE_865=m
-CONFIG_NLS_CODEPAGE_866=m
-CONFIG_NLS_CODEPAGE_869=m
-CONFIG_NLS_CODEPAGE_936=m
-CONFIG_NLS_CODEPAGE_950=m
-CONFIG_NLS_CODEPAGE_932=m
-CONFIG_NLS_CODEPAGE_949=m
-CONFIG_NLS_CODEPAGE_874=m
-CONFIG_NLS_ISO8859_8=m
-CONFIG_NLS_CODEPAGE_1250=m
-CONFIG_NLS_CODEPAGE_1251=m
-CONFIG_NLS_ASCII=m
-CONFIG_NLS_ISO8859_1=y
-CONFIG_NLS_ISO8859_2=m
-CONFIG_NLS_ISO8859_3=m
-CONFIG_NLS_ISO8859_4=m
-CONFIG_NLS_ISO8859_5=m
-CONFIG_NLS_ISO8859_6=m
-CONFIG_NLS_ISO8859_7=m
-CONFIG_NLS_ISO8859_9=m
-CONFIG_NLS_ISO8859_13=m
-CONFIG_NLS_ISO8859_14=m
-CONFIG_NLS_ISO8859_15=m
-CONFIG_NLS_KOI8_R=m
-CONFIG_NLS_KOI8_U=m
-CONFIG_NLS_UTF8=m
-CONFIG_DLM=m
-# CONFIG_DLM_DEBUG is not set
-
-#
-# Kernel hacking
-#
-CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-CONFIG_PRINTK_TIME=y
-CONFIG_ENABLE_WARN_DEPRECATED=y
-# CONFIG_ENABLE_MUST_CHECK is not set
-CONFIG_FRAME_WARN=1024
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_STRIP_ASM_SYMS=y
-CONFIG_UNUSED_SYMBOLS=y
-CONFIG_DEBUG_FS=y
-# CONFIG_HEADERS_CHECK is not set
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_DEBUG_SHIRQ is not set
-CONFIG_DETECT_SOFTLOCKUP=y
-# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
-CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
-CONFIG_DETECT_HUNG_TASK=y
-# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
-CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
-CONFIG_SCHED_DEBUG=y
-# CONFIG_SCHEDSTATS is not set
-CONFIG_TIMER_STATS=y
-# CONFIG_DEBUG_OBJECTS is not set
-# CONFIG_SLUB_DEBUG_ON is not set
-# CONFIG_SLUB_STATS is not set
-# CONFIG_DEBUG_KMEMLEAK is not set
-# CONFIG_DEBUG_RT_MUTEXES is not set
-# CONFIG_RT_MUTEX_TESTER is not set
-# CONFIG_DEBUG_SPINLOCK is not set
-CONFIG_DEBUG_MUTEXES=y
-# CONFIG_DEBUG_LOCK_ALLOC is not set
-# CONFIG_PROVE_LOCKING is not set
-# CONFIG_LOCK_STAT is not set
-# CONFIG_DEBUG_SPINLOCK_SLEEP is not set
-# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
-CONFIG_STACKTRACE=y
-# CONFIG_DEBUG_KOBJECT is not set
-# CONFIG_DEBUG_HIGHMEM is not set
-CONFIG_DEBUG_BUGVERBOSE=y
-# CONFIG_DEBUG_INFO is not set
-# CONFIG_DEBUG_VM is not set
-# CONFIG_DEBUG_VIRTUAL is not set
-# CONFIG_DEBUG_WRITECOUNT is not set
-CONFIG_DEBUG_MEMORY_INIT=y
-# CONFIG_DEBUG_LIST is not set
-# CONFIG_DEBUG_SG is not set
-# CONFIG_DEBUG_NOTIFIERS is not set
-# CONFIG_DEBUG_CREDENTIALS is not set
-CONFIG_ARCH_WANT_FRAME_POINTERS=y
-CONFIG_FRAME_POINTER=y
-# CONFIG_BOOT_PRINTK_DELAY is not set
-# CONFIG_RCU_TORTURE_TEST is not set
-# CONFIG_RCU_CPU_STALL_DETECTOR is not set
-# CONFIG_BACKTRACE_SELF_TEST is not set
-# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
-# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
-# CONFIG_FAULT_INJECTION is not set
-# CONFIG_LATENCYTOP is not set
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-# CONFIG_DEBUG_PAGEALLOC is not set
-CONFIG_USER_STACKTRACE_SUPPORT=y
-CONFIG_NOP_TRACER=y
-CONFIG_HAVE_FTRACE_NMI_ENTER=y
-CONFIG_HAVE_FUNCTION_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
-CONFIG_HAVE_FUNCTION_GRAPH_FP_TEST=y
-CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y
-CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
-CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
-CONFIG_TRACER_MAX_TRACE=y
-CONFIG_RING_BUFFER=y
-CONFIG_FTRACE_NMI_ENTER=y
-CONFIG_EVENT_TRACING=y
-CONFIG_CONTEXT_SWITCH_TRACER=y
-CONFIG_RING_BUFFER_ALLOW_SWAP=y
-CONFIG_TRACING=y
-CONFIG_GENERIC_TRACER=y
-CONFIG_TRACING_SUPPORT=y
-CONFIG_FTRACE=y
-CONFIG_FUNCTION_TRACER=y
-CONFIG_FUNCTION_GRAPH_TRACER=y
-# CONFIG_IRQSOFF_TRACER is not set
-CONFIG_SYSPROF_TRACER=y
-CONFIG_SCHED_TRACER=y
-CONFIG_FTRACE_SYSCALLS=y
-CONFIG_BOOT_TRACER=y
-CONFIG_BRANCH_PROFILE_NONE=y
-# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
-# CONFIG_PROFILE_ALL_BRANCHES is not set
-CONFIG_POWER_TRACER=y
-CONFIG_STACK_TRACER=y
-CONFIG_KMEMTRACE=y
-CONFIG_WORKQUEUE_TRACER=y
-CONFIG_BLK_DEV_IO_TRACE=y
-CONFIG_DYNAMIC_FTRACE=y
-CONFIG_FUNCTION_PROFILER=y
-CONFIG_FTRACE_MCOUNT_RECORD=y
-# CONFIG_FTRACE_STARTUP_TEST is not set
-CONFIG_MMIOTRACE=y
-# CONFIG_MMIOTRACE_TEST is not set
-CONFIG_RING_BUFFER_BENCHMARK=m
-# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
-# CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set
-# CONFIG_DYNAMIC_DEBUG is not set
-# CONFIG_DMA_API_DEBUG is not set
-# CONFIG_SAMPLES is not set
-CONFIG_HAVE_ARCH_KGDB=y
-# CONFIG_KGDB is not set
-CONFIG_HAVE_ARCH_KMEMCHECK=y
-CONFIG_STRICT_DEVMEM=y
-CONFIG_X86_VERBOSE_BOOTUP=y
-CONFIG_EARLY_PRINTK=y
-# CONFIG_EARLY_PRINTK_DBGP is not set
-# CONFIG_DEBUG_STACKOVERFLOW is not set
-# CONFIG_DEBUG_STACK_USAGE is not set
-# CONFIG_DEBUG_PER_CPU_MAPS is not set
-# CONFIG_X86_PTDUMP is not set
-CONFIG_DEBUG_RODATA=y
-# CONFIG_DEBUG_RODATA_TEST is not set
-# CONFIG_DEBUG_NX_TEST is not set
-# CONFIG_4KSTACKS is not set
-CONFIG_DOUBLEFAULT=y
-# CONFIG_IOMMU_STRESS is not set
-CONFIG_HAVE_MMIOTRACE_SUPPORT=y
-CONFIG_IO_DELAY_TYPE_0X80=0
-CONFIG_IO_DELAY_TYPE_0XED=1
-CONFIG_IO_DELAY_TYPE_UDELAY=2
-CONFIG_IO_DELAY_TYPE_NONE=3
-CONFIG_IO_DELAY_0X80=y
-# CONFIG_IO_DELAY_0XED is not set
-# CONFIG_IO_DELAY_UDELAY is not set
-# CONFIG_IO_DELAY_NONE is not set
-CONFIG_DEFAULT_IO_DELAY_TYPE=0
-# CONFIG_DEBUG_BOOT_PARAMS is not set
-# CONFIG_CPA_DEBUG is not set
-# CONFIG_OPTIMIZE_INLINING is not set
-
-#
-# Security options
-#
-CONFIG_KEYS=y
-# CONFIG_KEYS_DEBUG_PROC_KEYS is not set
-CONFIG_SECURITY=y
-CONFIG_SECURITYFS=y
-CONFIG_SECURITY_NETWORK=y
-# CONFIG_SECURITY_NETWORK_XFRM is not set
-CONFIG_SECURITY_PATH=y
-CONFIG_SECURITY_FILE_CAPABILITIES=y
-# CONFIG_INTEL_TXT is not set
-# CONFIG_SECURITY_SELINUX is not set
-# CONFIG_SECURITY_SMACK is not set
-CONFIG_SECURITY_TOMOYO=y
-# CONFIG_IMA is not set
-CONFIG_XOR_BLOCKS=m
-CONFIG_ASYNC_CORE=m
-CONFIG_ASYNC_MEMCPY=m
-CONFIG_ASYNC_XOR=m
-CONFIG_ASYNC_PQ=m
-CONFIG_ASYNC_RAID6_RECOV=m
-CONFIG_ASYNC_TX_DISABLE_PQ_VAL_DMA=y
-CONFIG_ASYNC_TX_DISABLE_XOR_VAL_DMA=y
-CONFIG_CRYPTO=y
-
-#
-# Crypto core or helper
-#
-CONFIG_CRYPTO_FIPS=y
-CONFIG_CRYPTO_ALGAPI=m
-CONFIG_CRYPTO_ALGAPI2=y
-CONFIG_CRYPTO_AEAD=m
-CONFIG_CRYPTO_AEAD2=y
-CONFIG_CRYPTO_BLKCIPHER=m
-CONFIG_CRYPTO_BLKCIPHER2=y
-CONFIG_CRYPTO_HASH=m
-CONFIG_CRYPTO_HASH2=y
-CONFIG_CRYPTO_RNG=m
-CONFIG_CRYPTO_RNG2=y
-CONFIG_CRYPTO_PCOMP=y
-CONFIG_CRYPTO_MANAGER=y
-CONFIG_CRYPTO_MANAGER2=y
-CONFIG_CRYPTO_GF128MUL=m
-CONFIG_CRYPTO_NULL=m
-CONFIG_CRYPTO_WORKQUEUE=y
-CONFIG_CRYPTO_CRYPTD=m
-CONFIG_CRYPTO_AUTHENC=m
-CONFIG_CRYPTO_TEST=m
-
-#
-# Authenticated Encryption with Associated Data
-#
-CONFIG_CRYPTO_CCM=m
-CONFIG_CRYPTO_GCM=m
-CONFIG_CRYPTO_SEQIV=m
-
-#
-# Block modes
-#
-CONFIG_CRYPTO_CBC=m
-CONFIG_CRYPTO_CTR=m
-CONFIG_CRYPTO_CTS=m
-CONFIG_CRYPTO_ECB=m
-CONFIG_CRYPTO_LRW=m
-CONFIG_CRYPTO_PCBC=m
-CONFIG_CRYPTO_XTS=m
-
-#
-# Hash modes
-#
-CONFIG_CRYPTO_HMAC=m
-CONFIG_CRYPTO_XCBC=m
-CONFIG_CRYPTO_VMAC=m
-
-#
-# Digest
-#
-CONFIG_CRYPTO_CRC32C=m
-CONFIG_CRYPTO_CRC32C_INTEL=m
-CONFIG_CRYPTO_GHASH=m
-CONFIG_CRYPTO_MD4=m
-CONFIG_CRYPTO_MD5=m
-CONFIG_CRYPTO_MICHAEL_MIC=m
-CONFIG_CRYPTO_RMD128=m
-CONFIG_CRYPTO_RMD160=m
-CONFIG_CRYPTO_RMD256=m
-CONFIG_CRYPTO_RMD320=m
-CONFIG_CRYPTO_SHA1=m
-CONFIG_CRYPTO_SHA256=m
-CONFIG_CRYPTO_SHA512=m
-CONFIG_CRYPTO_TGR192=m
-CONFIG_CRYPTO_WP512=m
-
-#
-# Ciphers
-#
-CONFIG_CRYPTO_AES=m
-CONFIG_CRYPTO_AES_586=m
-CONFIG_CRYPTO_ANUBIS=m
-CONFIG_CRYPTO_ARC4=m
-CONFIG_CRYPTO_BLOWFISH=m
-CONFIG_CRYPTO_CAMELLIA=m
-CONFIG_CRYPTO_CAST5=m
-CONFIG_CRYPTO_CAST6=m
-CONFIG_CRYPTO_DES=m
-CONFIG_CRYPTO_FCRYPT=m
-CONFIG_CRYPTO_KHAZAD=m
-CONFIG_CRYPTO_SALSA20=m
-CONFIG_CRYPTO_SALSA20_586=m
-CONFIG_CRYPTO_SEED=m
-CONFIG_CRYPTO_SERPENT=m
-CONFIG_CRYPTO_TEA=m
-CONFIG_CRYPTO_TWOFISH=m
-CONFIG_CRYPTO_TWOFISH_COMMON=m
-CONFIG_CRYPTO_TWOFISH_586=m
-
-#
-# Compression
-#
-CONFIG_CRYPTO_DEFLATE=m
-CONFIG_CRYPTO_ZLIB=m
-CONFIG_CRYPTO_LZO=m
-
-#
-# Random Number Generation
-#
-CONFIG_CRYPTO_ANSI_CPRNG=m
-CONFIG_CRYPTO_HW=y
-CONFIG_CRYPTO_DEV_PADLOCK=m
-CONFIG_CRYPTO_DEV_PADLOCK_AES=m
-CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
-CONFIG_CRYPTO_DEV_GEODE=m
-CONFIG_CRYPTO_DEV_HIFN_795X=m
-CONFIG_CRYPTO_DEV_HIFN_795X_RNG=y
-CONFIG_HAVE_KVM=y
-CONFIG_HAVE_KVM_IRQCHIP=y
-CONFIG_HAVE_KVM_EVENTFD=y
-CONFIG_KVM_APIC_ARCHITECTURE=y
-CONFIG_VIRTUALIZATION=y
-CONFIG_KVM=m
-CONFIG_KVM_INTEL=m
-CONFIG_KVM_AMD=m
-CONFIG_LGUEST=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
-CONFIG_VIRTIO_PCI=m
-CONFIG_VIRTIO_BALLOON=m
-CONFIG_BINARY_PRINTF=y
-
-#
-# Library routines
-#
-CONFIG_BITREVERSE=y
-CONFIG_GENERIC_FIND_FIRST_BIT=y
-CONFIG_GENERIC_FIND_NEXT_BIT=y
-CONFIG_GENERIC_FIND_LAST_BIT=y
-CONFIG_CRC_CCITT=m
-CONFIG_CRC16=m
-CONFIG_CRC_T10DIF=m
-CONFIG_CRC_ITU_T=m
-CONFIG_CRC32=y
-CONFIG_CRC7=m
-CONFIG_LIBCRC32C=m
-CONFIG_AUDIT_GENERIC=y
-CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=m
-CONFIG_LZO_COMPRESS=m
-CONFIG_LZO_DECOMPRESS=m
-CONFIG_DECOMPRESS_GZIP=y
-CONFIG_DECOMPRESS_BZIP2=y
-CONFIG_DECOMPRESS_LZMA=y
-CONFIG_TEXTSEARCH=y
-CONFIG_TEXTSEARCH_KMP=m
-CONFIG_TEXTSEARCH_BM=m
-CONFIG_TEXTSEARCH_FSM=m
-CONFIG_HAS_IOMEM=y
-CONFIG_HAS_IOPORT=y
-CONFIG_HAS_DMA=y
-CONFIG_CHECK_SIGNATURE=y
-CONFIG_NLATTR=y
diff --git a/libre/p7zip-libre/unzip b/libre/p7zip-libre/unzip
deleted file mode 100755
index 201dc826c..000000000
--- a/libre/p7zip-libre/unzip
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# unzip replacement written by Henry Jensen <hjensen@gmx.de>
-
-Opts=""
-cm="x"
-while getopts plvtTZ opt
-do
- case $opt in
- p) Opts="$Opts -so";;
- v|l) cm="l";;
- t) cm="t";;
- T|Z) ;;
- \?)break;;
- esac
-done
-shift $((OPTIND-1))
-
-7z $cm $Opts "$@"
diff --git a/libre/thunderbird-libre/thunderbird-3.0-lang.patch b/libre/thunderbird-libre/thunderbird-3.0-lang.patch
deleted file mode 100644
index b9f4a5cde..000000000
--- a/libre/thunderbird-libre/thunderbird-3.0-lang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js 2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector", "chrome://global/locale/intl.properties");
- pref("intl.charset.default", "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis", "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS", false);
-+pref("intl.locale.matchOS", true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
diff --git a/mozilla-testing/icecat/parabola.patch b/mozilla-testing/icecat/parabola.patch
deleted file mode 100644
index b8000c3ea..000000000
--- a/mozilla-testing/icecat/parabola.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ru icecat-9.0.1.orig/browser/app/profile/firefox.js icecat-9.0.1/browser/app/profile/firefox.js
---- icecat-9.0.1.orig/browser/app/profile/firefox.js 2011-12-27 00:11:30.000000000 -0500
-+++ icecat-9.0.1/browser/app/profile/firefox.js 2011-12-27 00:11:39.000000000 -0500
-@@ -48,6 +48,8 @@
- #endif
- #endif
-
-+pref("general.startup.browser", true);
-+
- pref("browser.chromeURL","chrome://browser/content/");
- pref("browser.hiddenWindowChromeURL", "chrome://browser/content/hiddenWindow.xul");
-
-@@ -487,6 +489,9 @@
- pref("browser.gesture.twist.left", "");
- pref("browser.gesture.tap", "cmd_fullZoomReset");
-
-+// Use LANG environment variable to choose locale
-+pref("intl.locale.matchOS", true);
-+
- // 0=lines, 1=pages, 2=history , 3=text size
- #ifdef XP_MACOSX
- // On OS X, if the wheel has one axis only, shift+wheel comes through as a
diff --git a/mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch b/mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch
deleted file mode 100644
index f0f7325a5..000000000
--- a/mozilla-testing/iceweasel-libre/mozilla-firefox-1.0-lang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/browser/app/profile/firefox.js.lang 2005-01-13 15:32:03.509282726 +0100
-+++ mozilla/browser/app/profile/firefox.js 2005-01-13 15:33:40.220914789 +0100
-@@ -253,6 +253,9 @@
- pref("font.language.group", "chrome://global/locale/intl.properties");
- pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
-
-+// Use LANG environment variable to choose locale
-+pref("intl.locale.matchOS", true);
-+
- // 0=lines, 1=pages, 2=history , 3=text size
- pref("mousewheel.withcontrolkey.action",3);
- pref("mousewheel.withshiftkey.action",2);
diff --git a/mozilla-testing/iceweasel/PKGBUILD b/mozilla-testing/iceweasel/PKGBUILD
deleted file mode 100644
index 992476d43..000000000
--- a/mozilla-testing/iceweasel/PKGBUILD
+++ /dev/null
@@ -1,135 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor: Henry Jensen <hjensen@connochaetos.org>
-
-# We're getting this from Debian Sid
-_debname=iceweasel
-_debver=9.0.1
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=iceweasel
-pkgname=iceweasel
-_pkgver=9.0
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-
-pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox."
-arch=('i586' 'i686' 'x86_64' 'mips64el')
-url="http://www.geticeweasel.org/"
-license=('GPL2' 'MPL' 'LGPL')
-depends=(
- 'alsa-lib'
- 'dbus-glib'
- 'desktop-file-utils'
- 'gtk2'
- 'hicolor-icon-theme'
- 'hunspell'
- 'libevent'
- 'libnotify'
- 'libvpx'
- 'libxt'
- 'mime-types'
- 'mozilla-common'
- 'mozilla-searchplugins'
- 'nss'
- 'sqlite3'
- 'startup-notification'
-)
-makedepends=(
- 'autoconf2.13'
- 'diffutils'
- 'libidl2'
- 'mesa'
- 'p7zip-libre'
- 'pkg-config'
- 'python2'
- 'quilt'
- 'wireless_tools'
- 'yasm'
- 'zip'
-)
-options=(!buildflags !distcc)
-install=iceweasel.install
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
- "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
- mozconfig
- libre.patch
- # Default configuration
- mozilla-firefox-1.0-lang.patch
- xulrunner-copy-stub.patch
- region.properties)
-
-build() {
- msg2 "Applying Debian patches..."
- cd "${srcdir}"
- # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
- export QUILT_PATCHES=debian/patches
- export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
- export QUILT_DIFF_ARGS='--no-timestamps'
- mv mozilla-release "${_debname}-${_debver}"
- mv debian "${_debname}-${_debver}"
- cd "${_debname}-${_debver}"
- quilt push -a
- find .pc -name .timestamp -delete # why isn't --no-timestamps doing this?
-
- # This will make life more sane
- cd "${srcdir}"
- ln -s "${_debname}-${_debver}" "${_pkgname}-${pkgver}"
-
- msg2 "Starting normal build..."
- cd "${srcdir}/${_pkgname}-${pkgver}/"
- patch -p1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
- patch -p1 -i "${srcdir}/xulrunner-copy-stub.patch"
- patch -p1 -i "${srcdir}/libre.patch"
-
- cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
-
- msg2 "Starting build..."
-
- cp "${srcdir}/mozconfig" .mozconfig
- #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
- ./configure
- #touch config*
- make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-
- msg2 "Build complete"
-}
-
-package() {
-
- cd "${srcdir}/${_pkgname}-${pkgver}/"
- #make -j1 -f client.mk DESTDIR="${pkgdir}" install
- make install DESTDIR="${pkgdir}"
-
- msg2 "Finishing..."
-
- install -m755 -d ${pkgdir}/usr/share/applications
- install -m755 -d ${pkgdir}/usr/share/pixmaps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/16x16/apps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/64x64/apps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps
-
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/iceweasel.desktop ${pkgdir}/usr/share/applications/ || return 1
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default16.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/iceweasel.png
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/iceweasel.png
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/iceweasel.png
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/iceweasel_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg
-
-
- rm -rf ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins
- ln -sf /usr/lib/mozilla/searchplugins ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins
-
- rm -rvf ${pkgdir}/usr/lib/iceweasel-devel-${_pkgver}
- rm -rvf ${pkgdir}/usr/include
-
-}
-
-md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
- '6cde9fe38df1434fdcc0f3a078b0238e'
- '5e2574eef71ee1437e2f8e7481c67893'
- '9609e77182cc300e3fe9d4b0c7e7efb4'
- 'bd5db57c23c72a02a489592644f18995'
- 'a485a2b5dc544a8a2bd40c985d2e5813'
- 'f1c76e7e244257856a386ca2de69bdf0')
diff --git a/mozilla-testing/iceweasel/iceweasel.install b/mozilla-testing/iceweasel/iceweasel.install
deleted file mode 100644
index 376600ec2..000000000
--- a/mozilla-testing/iceweasel/iceweasel.install
+++ /dev/null
@@ -1,21 +0,0 @@
-#[ "${ICDIR}" = "" ] && ICECATDIR="/usr/lib/icecat"
-post_install () {
- echo -e "\n >>> Please, source /etc/profile or logout and re-login to your desktop session"
- echo -e " >>> If you installed some locale in the past or some stuff in libdir, please remove old /usr/lib/iceweasel* directories"
- update-desktop-database -q
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
-}
-
-#op=$1
-#shift
-
-#$op $*
diff --git a/mozilla-testing/iceweasel/libre.patch b/mozilla-testing/iceweasel/libre.patch
deleted file mode 100644
index e29e22a67..000000000
--- a/mozilla-testing/iceweasel/libre.patch
+++ /dev/null
@@ -1,391 +0,0 @@
-diff -urN iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js
---- iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-21 12:55:22.404066176 +0000
-@@ -57,10 +57,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
- pref("extensions.autoDisableScopes", 15);
-
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -200,7 +200,7 @@
- pref("extensions.update.interval", 86400); // Check for updates to Extensions and
- // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
-+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
- pref("extensions.dss.enabled", false); // Dynamic Skin Switching
- pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
- // restart.
-@@ -235,7 +235,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page", 1);
--pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage", "about:blank");
-
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -325,7 +325,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
-
- // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -564,7 +564,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
-
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js
---- iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 12:55:28.116066178 +0000
-@@ -57,10 +57,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
- pref("extensions.autoDisableScopes", 15);
-
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -200,7 +200,7 @@
- pref("extensions.update.interval", 86400); // Check for updates to Extensions and
- // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
-+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
- pref("extensions.dss.enabled", false); // Dynamic Skin Switching
- pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
- // restart.
-@@ -235,7 +235,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page", 1);
--pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage", "about:blank");
-
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -325,7 +325,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
-
- // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -564,7 +564,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
-
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js
---- iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:35.104062780 +0000
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
- // The first character after a period must be alphabetic.
-
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js
---- iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-16 20:29:37.000000000 +0000
-+++ iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:43.184062783 +0000
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
- // The first character after a period must be alphabetic.
-
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0-orig/browser/app/profile/firefox.js iceweasel-9.0/browser/app/profile/firefox.js
---- iceweasel-9.0-orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000
-@@ -57,10 +57,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
- pref("extensions.autoDisableScopes", 15);
-
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "");
-
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -200,7 +200,7 @@
- pref("extensions.update.interval", 86400); // Check for updates to Extensions and
- // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
-+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
- pref("extensions.dss.enabled", false); // Dynamic Skin Switching
- pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
- // restart.
-@@ -234,7 +234,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page", 1);
--pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage", "about:blank");
-
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -324,7 +324,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
-
- // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -563,7 +563,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
-
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-9.0-orig/browser/base/content/syncSetup.js iceweasel-9.0/browser/base/content/syncSetup.js
---- iceweasel-9.0-orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000
-@@ -59,7 +59,7 @@
- // Broader than we'd like, but after this changed from api-secure.recaptcha.net
- // we had no choice. At least we only do this for the duration of setup.
- // See discussion in Bugs 508112 and 653307.
--const RECAPTCHA_DOMAIN = "https://www.google.com";
-+const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com";
-
- Cu.import("resource://services-sync/main.js");
- Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-diff -urN iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000
-@@ -1,8 +1,8 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
-
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
-+browser.search.order.1=DuckDuckGo
- browser.search.order.2=Yahoo
- browser.search.order.3=Bing
-
-@@ -17,7 +17,7 @@
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=http://duckduck.go.com/?q={searchTerms}
-
- # increment this number when anything gets changed in the list below. This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-diff -urN iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in
---- iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in 2011-12-21 10:24:32.872063067 +0000
-@@ -11,14 +11,12 @@
- <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
- <DD>@bookmarks_toolbarfolder_description@
- <DL><p>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
-- <DT><A HREF="http://fxfeeds.mozilla.com/@AB_CD@/firefox/livebookmarks/" FEEDURL="http://fxfeeds.mozilla.com/@AB_CD@/firefox/headlines.xml" ID="rdf:#$HvPhC3">@latest_headlines@</A>
-+ <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</a>
- </DL><p>
- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
- <DL><p>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
-+ <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A>
-+ <DT><A HREF="http://libreplanet.org/">LibrePlanet</A>
-+ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</a>
- </DL><p>
- </DL><p>
-diff -urN iceweasel-9.0-orig/build/pgo/blueprint/elements.html iceweasel-9.0/build/pgo/blueprint/elements.html
---- iceweasel-9.0-orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000
-@@ -143,7 +143,7 @@
- </p>
- <p>
- <a>&lt;a&gt; anchor</a><br>
-- <a href="http://www.google.com">&lt;a&gt; a + href</a>
-+ <a href="http://www.duckduckgo.com">&lt;a&gt; a + href</a>
- </p>
- <p>
- <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
-diff -urN iceweasel-9.0-orig/dom/ipc/test.xul iceweasel-9.0/dom/ipc/test.xul
---- iceweasel-9.0-orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000
-+++ iceweasel-9.0/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000
-@@ -301,6 +301,6 @@
- oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
- </toolbar>
-
-- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+ <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="page" remote="true"/>
- <label id="messageLog" value="" crop="center"/>
- </window>
-diff -urN iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0/layout/ipc/test-ipcbrowser.xul
---- iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul 2011-12-16 20:29:28.000000000 +0000
-+++ iceweasel-9.0/layout/ipc/test-ipcbrowser.xul 2011-12-21 10:03:06.408062626 +0000
-@@ -69,6 +69,6 @@
- label="setViewportScale"/>
- </toolbar>
-
-- <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+ <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="content"
- remote="true"/>
- </window>
-diff -urN iceweasel-9.0-orig/mobile/app/mobile.js iceweasel-9.0/mobile/app/mobile.js
---- iceweasel-9.0-orig/mobile/app/mobile.js 2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0/mobile/app/mobile.js 2011-12-21 10:04:04.976062646 +0000
-@@ -217,12 +217,13 @@
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-
- /* preference for the locale picker */
- pref("extensions.getLocales.get.url", "");
-@@ -239,7 +240,7 @@
- pref("privacy.popups.showBrowserMessage", true);
-
- pref("keyword.enabled", true);
--pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
-
- pref("accessibility.typeaheadfind", false);
- pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0/mobile/locales/en-US/chrome/region.properties
---- iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties 2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0/mobile/locales/en-US/chrome/region.properties 2011-12-21 09:54:17.560062443 +0000
-@@ -1,8 +1,8 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
-
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
-+browser.search.order.1=DuckDuckGo
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
-@@ -12,7 +12,7 @@
- browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
-
- # Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=http://duckduckgo.com/?q=
-
- # increment this number when anything gets changed in the list below. This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-diff -urN iceweasel-9.0-orig/modules/libpref/src/init/all.js iceweasel-9.0/modules/libpref/src/init/all.js
---- iceweasel-9.0-orig/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/modules/libpref/src/init/all.js 2011-12-21 10:09:17.136062754 +0000
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
- // The first character after a period must be alphabetic.
-
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0-orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0/toolkit/locales/en-US/chrome/global-region/region.properties
---- iceweasel-9.0-orig/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-16 20:29:43.000000000 +0000
-+++ iceweasel-9.0/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-21 12:51:31.188066096 +0000
-@@ -4,10 +4,10 @@
- pluginStartupMessage=Starting Plugin for type
-
- # plug-ins URLs
--more_plugins_label=mozilla.org
--more_plugins_url=https://pfs.mozilla.org/plugins/
--pluginupdates_label=mozilla.com/plugincheck
--pluginupdates_url=http://www.mozilla.com/plugincheck/
--plugindoc_label=plugindoc.mozdev.org
--plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=gnuzilla.gnu.org
-+more_plugins_url=http://www.gnu.org/s/gnuzilla/addons.html
-+pluginupdates_label=gnuzilla.gnu.org
-+pluginupdates_url=http://www.gnu.org/s/gnuzilla/addons.html
-+plugindoc_label=gnuzilla.gnu.org
-+plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html
-
diff --git a/mozilla-testing/iceweasel/mozconfig b/mozilla-testing/iceweasel/mozconfig
deleted file mode 100644
index 8344f6967..000000000
--- a/mozilla-testing/iceweasel/mozconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-#ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-pthreads
-ac_add_options --enable-optimize
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-strip
-ac_add_options --enable-pango
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-libxul
-ac_add_options --disable-crashreporter
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-xprint
-ac_add_options --disable-installer
-ac_add_options --disable-libnotify
-ac_add_options --disable-pedantic
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-mochitest
-ac_add_options --disable-updater
-ac_add_options --with-default-mozilla-five-home=/usr/lib/iceweasel
-
-ac_add_options --with-branding=debian/branding
-ac_add_options --build=i586-pc-linux-gnu
-ac_add_options --host=i586-pc-linux-gnu
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export USE_SHORT_LIBNAME=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options USE_SHORT_LIBNAME=1
diff --git a/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch b/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch
deleted file mode 100644
index f0f7325a5..000000000
--- a/mozilla-testing/iceweasel/mozilla-firefox-1.0-lang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/browser/app/profile/firefox.js.lang 2005-01-13 15:32:03.509282726 +0100
-+++ mozilla/browser/app/profile/firefox.js 2005-01-13 15:33:40.220914789 +0100
-@@ -253,6 +253,9 @@
- pref("font.language.group", "chrome://global/locale/intl.properties");
- pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
-
-+// Use LANG environment variable to choose locale
-+pref("intl.locale.matchOS", true);
-+
- // 0=lines, 1=pages, 2=history , 3=text size
- pref("mousewheel.withcontrolkey.action",3);
- pref("mousewheel.withshiftkey.action",2);
diff --git a/mozilla-testing/iceweasel/region.properties b/mozilla-testing/iceweasel/region.properties
deleted file mode 100644
index 2e980987e..000000000
--- a/mozilla-testing/iceweasel/region.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Default search engine
-browser.search.defaultenginename=Duck Duck Go (SSL)
-
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Duck Duck Go (SSL)
-browser.search.order.2=Duck Duck Go (Lite)
-
-
-# Keyword URL (for location bar searches)
-keyword.URL=https://duckduckgo.com/?q=
-
-# URL for site-specific search engines
-# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
-# to be searched and the user's search query. Place them in the appropriate location
-# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms}
-
-# increment this number when anything gets changed in the list below. This will
-# cause Firefox to re-read these prefs and inject any new handlers into the
-# profile database. Note that "new" is defined as "has a different URL"; this
-# means that it's not possible to update the name of existing handler, so
-# don't make any spelling errors here.
-#gecko.handlerService.defaultHandlersVersion=3
diff --git a/mozilla-testing/iceweasel/xulrunner-copy-stub.patch b/mozilla-testing/iceweasel/xulrunner-copy-stub.patch
deleted file mode 100644
index e3b8e9376..000000000
--- a/mozilla-testing/iceweasel/xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iceweasel-9.0.1/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500
-+++ iceweasel-9.0.1/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500
-@@ -257,7 +257,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
-- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX)
- endif
- endif
-
diff --git a/multilib-testing/binutils-multilib/PKGBUILD b/multilib-testing/binutils-multilib/PKGBUILD
deleted file mode 100644
index bb3bab55d..000000000
--- a/multilib-testing/binutils-multilib/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 61270 2011-12-27 21:42:32Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils-multilib
-pkgver=2.22
-pkgrel=4
-_date=20111227
-pkgdesc="A set of programs to assemble and manipulate binary and object files for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('multilib-devel')
-provides=("binutils=$pkgver-$pkgrel")
-conflicts=('binutils')
-depends=('glibc>=2.14' 'zlib')
-makedepends=('dejagnu' 'gcc-multilib') # Make sure we compile this with gcc-multilib
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(http://mirrors.kernel.org/archlinux/other/binutils/binutils-${pkgver}_${_date}.tar.bz2)
-md5sums=('c2377089c15bb1a1bfaeca8d0e59dd4d')
-
-build() {
- cd ${srcdir}
- mkdir binutils-build && cd binutils-build
-
- ${srcdir}/binutils/configure --prefix=/usr \
- --enable-ld=default --enable-gold \
- --enable-plugins --enable-threads \
- --enable-shared \
- --enable-64-bit-bfd --enable-multilib
-
- # check the host environment and makes sure all the necessary tools are available
- make configure-host
-
- make tooldir=${pkgdir}/usr
-
- # Rebuild libiberty.a with -fPIC
- cp -a libiberty libiberty-pic
- make -C libiberty-pic clean
- make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
-
- # Rebuild libbfd.a with -fPIC
- # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
- cp -a bfd bfd-pic
- make -C bfd-pic clean
- make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
-}
-
-check() {
- cd ${srcdir}/binutils-build
-
- # do not abort on errors - manually check log files
- make -k -j1 check || true
-}
-
-package() {
- cd ${srcdir}/binutils-build
- make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-
- # Add some useful headers
- install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
- install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
-
- # install libraries rebuilt with -fPIC
- install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
- install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
-
- # Remove Windows/Novell specific man pages
- rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
-
- # Remove these symlinks, they are not ABI stable.
- # Programs should compile static to the .a file.
- rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
- echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
- echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
-}
diff --git a/multilib-testing/binutils-multilib/binutils.install b/multilib-testing/binutils-multilib/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/multilib-testing/binutils-multilib/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
-
-post_upgrade() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
diff --git a/multilib-testing/gcc-multilib/PKGBUILD b/multilib-testing/gcc-multilib/PKGBUILD
deleted file mode 100644
index 18b7d8c1a..000000000
--- a/multilib-testing/gcc-multilib/PKGBUILD
+++ /dev/null
@@ -1,303 +0,0 @@
-# $Id: PKGBUILD 61271 2011-12-27 21:56:13Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgbase='gcc-multilib'
-pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib')
-pkgver=4.6.2
-pkgrel=5
-_snapshot=4.6-20111223
-_libstdcppmanver=20111215
-pkgdesc="The GNU Compiler Collection for multilib"
-arch=('x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada-multilib'
- 'lib32-glibc>=2.14')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
- gcc_pure64.patch
- gcc-hash-style-both.patch)
-md5sums=('4755b9f6ac0abecbaa2097ed9738406a'
- '450772ce32daed97d7383199f8797f33'
- '4030ee1c08dd1e843c0225b772360e76'
- '4df25b623799b148a0703eaeec8fdf3f')
-
-if [ -n "${_snapshot}" ]; then
- _basedir="${srcdir}/gcc-${_snapshot}"
-else
- _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
- cd ${_basedir}
-
- # Do not install libiberty
- sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
- # Do not run fixincludes
- sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
- patch -Np1 -i ${srcdir}/gcc_pure64.patch
- patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
- echo ${pkgver} > gcc/BASE-VER
-
- cd ${srcdir}
- mkdir gcc-build && cd gcc-build
-
- ${_basedir}/configure --prefix=/usr \
- --libdir=/usr/lib --libexecdir=/usr/lib \
- --mandir=/usr/share/man --infodir=/usr/share/info \
- --with-bugurl=https://bugs.archlinux.org/ \
- --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
- --enable-shared --enable-threads=posix \
- --with-system-zlib --enable-__cxa_atexit \
- --disable-libunwind-exceptions --enable-clocale=gnu \
- --enable-gnu-unique-object --enable-linker-build-id \
- --with-ppl --enable-cloog-backend=isl \
- --enable-lto --enable-gold --enable-ld=default \
- --enable-plugin --with-plugin-ld=ld.gold \
- --enable-multilib --disable-libssp --disable-libstdcxx-pch \
- --enable-checking=release --with-fpmath=sse
- make
-}
-
-check() {
- cd gcc-build
-
- # increase stack size to prevent test failures
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
- ulimit -s 32768
-
- # do not abort on error as some are "expected"
- make -k check || true
- ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs-multilib()
-{
- pkgdesc="Runtime libraries shipped by GCC for multilib"
- depends=('glibc>=2.14' "lib32-gcc-libs=$pkgver-$pkgrel")
- provides=("gcc-libs=$pkgver-$pkgrel")
- conflicts=('gcc-libs')
- install=gcc-libs.install
-
- cd gcc-build
- make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
- for lib in libmudflap libgomp libstdc++-v3/src; do
- make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
- done
- make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
- make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=${pkgdir} install-target-libgfortran
- make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
- # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
- rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
- # remove stuff in lib32-gcc-libs
- rm -rf ${pkgdir}/usr/lib32
-
- # remove static libraries
- find ${pkgdir} -name *.a -delete
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-libs-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_lib32-gcc-libs()
-{
- pkgdesc="Runtime libraries shipped by GCC (32-bit)"
- depends=('lib32-glibc>=2.14' "gcc-libs>=$pkgver")
-
- cd gcc-build
- make -j1 -C $CHOST/32/libgcc DESTDIR=${pkgdir} install-shared
- for lib in libmudflap libgomp libstdc++-v3/src; do
- make -j1 -C $CHOST/32/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
- done
-
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=${pkgdir} install-target-libgfortran
- make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
- # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
- rm ${pkgdir}/usr/lib32/libgfortran.spec
-
- # remove stuff in gcc-libs-multilib
- rm -rf ${pkgdir}/usr/lib
- rm -rf ${pkgdir}/usr/share/info
-
- # remove static libraries
- find ${pkgdir} -name *.a -delete
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/lib32-gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-multilib()
-{
- pkgdesc="The GNU Compiler Collection - C and C++ frontends for multilib"
- depends=("gcc-libs-multilib=$pkgver-$pkgrel" 'binutils-multilib>=2.22' 'libmpc' 'cloog' 'ppl')
- groups=('multilib-devel')
- provides=("gcc=$pkgver-$pkgrel")
- conflicts=('gcc')
- install=gcc.install
-
- cd gcc-build
-
- # unfortunately it is much, much easier to install the lot and clean-up the mess...
- make -j1 DESTDIR=${pkgdir} install
- rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
- rm $pkgdir/usr/lib{,32}/*.so*
- rm $pkgdir/usr/lib{,32}/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
- rm $pkgdir/usr/lib{,32}/libgfortran.spec
- rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{{,32/}ada{include,lib},finclude,include/objc}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,{,32/}libgfortranbegin.a}
- rm -r $pkgdir/usr/lib{,32}/go
- rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
- rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
- rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
- rm $pkgdir/usr/share/man/man3/ffi*
-
- # many packages require these symlinks
- install -dm755 ${pkgdir}/lib
- ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
- ln -sf gcc ${pkgdir}/usr/bin/cc
- ln -sf g++ ${pkgdir}/usr/bin/c++
-
- # install gengtype for plugin support
- install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
- install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
- # POSIX conformance launcher scripts for c89 and c99
- cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
- case "$opt" in
- -ansi|-std=c89|-std=iso9899:1990) fl="";;
- -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
- case "$opt" in
- -std=c99|-std=iso9899:1999) fl="";;
- -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- chmod 755 $pkgdir/usr/bin/c{8,9}9
-
- # install the libstdc++ man pages
- install -dm755 ${pkgdir}/usr/share/man/man3
- install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran-multilib()
-{
- pkgdesc="Fortran front-end for GCC for multilib"
- depends=("gcc-multilib=$pkgver-$pkgrel")
- provides=("gcc-fortran=$pkgver-$pkgrel")
- conflicts=('gcc-fortran')
- install=gcc-fortran.install
-
- cd gcc-build
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=$pkgdir install-target-libgfortran
- make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
- make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
- install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib{,32}/lib{gfortran,quadmath}.so*
- rm ${pkgdir}/usr/share/info/libquadmath.info
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-fortran-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc-multilib()
-{
- pkgdesc="Objective-C front-end for GCC for multilib"
- depends=("gcc-multilib=$pkgver-$pkgrel")
- provides=("gcc-objc=$pkgver-$pkgrel")
- conflicts=('gcc-objc')
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libobjc
- install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
- install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib{,32}/libobjc.so*
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-objc-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada-multilib()
-{
- pkgdesc="Ada front-end for GCC (GNAT) for multilib"
- depends=("gcc-multilib=$pkgver-$pkgrel")
- provides=("gcc-ada=$pkgver-$pkgrel")
- conflicts=('gcc-ada')
- install=gcc-ada.install
-
- cd gcc-build/gcc
- make -j1 DESTDIR=$pkgdir ada.install-{common,info}
- install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
- cd ../$CHOST/32/libada
- make -j1 DESTDIR=${pkgdir} INSTALL="install" \
- INSTALL_DATA="install -m644" install-gnatlib
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-ada-multilib/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go-multilib()
-{
- pkgdesc="Go front-end for GCC for multilib"
- depends=("gcc-multilib=$pkgver-$pkgrel")
- provides=("gcc-go=$pkgver-$pkgrel")
- conflicts=('gcc-go')
- install=gcc-go.install
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libgo
- make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
- install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/multilib-testing/gcc-multilib/gcc-ada.install b/multilib-testing/gcc-multilib/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/multilib-testing/gcc-multilib/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-fortran.install b/multilib-testing/gcc-multilib/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/multilib-testing/gcc-multilib/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/multilib-testing/gcc-multilib/gcc-go.install b/multilib-testing/gcc-multilib/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/multilib-testing/gcc-multilib/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch b/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/multilib-testing/gcc-multilib/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
-
- #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER
-
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \
- %{O*:-O3} %{!O*:-O1} \
- %{shared:-shared} \
- %{!shared: \
---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
- %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
-
- #undef LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
- { "dynamic_linker", LINUX_DYNAMIC_LINKER }
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-
-
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
-
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
-
---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
-
---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
-
- #undef LINK_SPEC
- #define LINK_SPEC \
-- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{static:-static} \
---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
- { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
- { "link_arch", LINK_ARCH_SPEC },
-
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
- %{static:-static}} \
- "
-
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
- %{!mno-relax:%{!r:-relax}} \
- %{!shared: \
- %{!static: \
diff --git a/multilib-testing/gcc-multilib/gcc-libs.install b/multilib-testing/gcc-multilib/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/multilib-testing/gcc-multilib/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/multilib-testing/gcc-multilib/gcc.install b/multilib-testing/gcc-multilib/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/multilib-testing/gcc-multilib/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/multilib-testing/gcc-multilib/gcc_pure64.patch b/multilib-testing/gcc-multilib/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/multilib-testing/gcc-multilib/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
- When the -shared link option is used a final link is not being
- done. */
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
-
- #undef LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
-
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
-
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD
deleted file mode 100644
index 2f6bd0943..000000000
--- a/multilib-testing/lib32-glibc/PKGBUILD
+++ /dev/null
@@ -1,176 +0,0 @@
-# $Id: PKGBUILD 61422 2011-12-30 16:00:33Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each major glibc version
-
-_pkgbasename=glibc
-pkgname=lib32-$_pkgbasename
-pkgver=2.15
-pkgrel=3
-_glibcdate=20111227
-pkgdesc="GNU C Library for multilib"
-arch=('x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-depends=("glibc>=$pkgver")
-makedepends=('gcc-multilib>=4.6')
-options=('!strip' '!emptydirs')
-source=(ftp://ftp.archlinux.org/other/glibc/${_pkgbasename}-${pkgver}_${_glibcdate}.tar.xz
- glibc-2.10-dont-build-timezone.patch
- glibc-2.10-bz4781.patch
- glibc-__i686.patch
- glibc-2.12.2-ignore-origin-of-privileged-program.patch
- glibc-2.14-libdl-crash.patch
- glibc-2.14-revert-4768ae77.patch
- glibc-2.14-reexport-rpc-interface.patch
- glibc-2.14-reinstall-nis-rpc-headers.patch
- glibc-2.15-lddebug-scopes.patch
- glibc-2.15-revert-c5a0802a.patch
- glibc-2.15-math64crash.patch
- lib32-glibc.conf)
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
- '4dadb9203b69a3210d53514bb46f41c3'
- '0c5540efc51c0b93996c51b57a8540ae'
- '40cd342e21f71f5e49e32622b25acc52'
- 'b042647ea7d6f22ad319e12e796bd13e'
- '6970bcfeb3bf88913436d5112d16f588'
- '7da8c554a3b591c7401d7023b1928afc'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- '3c219ddfb619b6df903cac4cc42c611d'
- '7ae3e426251ae33e73dbad71f9c91378'
- 'dc7550e659ddd685bd78a930d15a01f2'
- 'a8f4549c716cd37244fbf1ed059497f8')
-
-build() {
- cd ${srcdir}/glibc
-
- # timezone data is in separate package (tzdata)
- patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
- # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
- patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
- # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
- # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
- patch -Np1 -i ${srcdir}/glibc-__i686.patch
-
- # http://www.exploit-db.com/exploits/15274/
- # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
- # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
- patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
- # Revert commit causing issues with crappy DNS servers...
- # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
- # Note that both these patches appear not to fix the issue completely:
- # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
-
- # re-export RPC interface until libtirpc is ready as a replacement
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
-
- # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
-
- # revert commit c5a0802a - causes various hangs
- # https://bugzilla.redhat.com/show_bug.cgi?id=769421
- patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
-
- # revert optimized math routines that can cause crashes (FS#27736, FS#27743)
- # obviously not a real fix...
- patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch
-
- cd ${srcdir}
- mkdir glibc-build
- cd glibc-build
-
- export CC="gcc -m32"
-
- # Hack to fix NPTL issues with Xen, only required on 32bit platforms
- export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
-
- echo "slibdir=/lib32" >> configparms
-
- # remove hardening options from CFLAGS for building libraries
- CFLAGS=${CFLAGS/-fstack-protector/}
- CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
- ${srcdir}/glibc/configure --prefix=/usr \
- --libdir=/usr/lib32 --libexecdir=/usr/lib32 \
- --with-headers=/usr/include \
- --enable-add-ons=nptl,libidn \
- --enable-kernel=2.6.27 \
- --with-tls --with-__thread \
- --enable-bind-now --without-gd \
- --without-cvs --disable-profile \
- --enable-multi-arch i686-unknown-linux-gnu
-
- # build libraries with hardening disabled
- echo "build-programs=no" >> configparms
- make
-
- # re-enable hardening for programs
- sed -i "s#=no#=yes#" configparms
- echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
- echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
- make
-
- # remove harding in preparation to run test-suite
- sed -i '2,4d' configparms
-}
-
-check() {
- cd ${srcdir}/glibc-build
-
- # some errors are expected - manually check log files
- make -k check || true
-}
-
-package() {
- cd ${srcdir}/glibc-build
- make install_root=${pkgdir} install
-
- rm -rf ${pkgdir}/{etc,sbin,usr/{bin,sbin,share},var}
-
- # We need one 32 bit specific header file
- find ${pkgdir}/usr/include -type f -not -name stubs-32.h -delete
-
- # Do not strip the following files for improved debugging support
- # ("improved" as in not breaking gdb and valgrind...):
- # ld-${pkgver}.so
- # libc-${pkgver}.so
- # libpthread-${pkgver}.so
- # libthread_db-1.0.so
-
- cd $pkgdir
- strip $STRIP_BINARIES usr/lib32/getconf/*
-
- strip $STRIP_STATIC usr/lib32/*.a
-
- strip $STRIP_SHARED lib32/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
- lib32/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
- lib32/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
- lib32/{libmemusage,libpcprofile,libSegFault}.so \
- usr/lib32/{pt_chown,{audit,gconv}/*.so}
-
- # Dynamic linker
- mkdir ${pkgdir}/lib
- ln -s ../lib32/ld-linux.so.2 ${pkgdir}/lib/
-
- # Add lib32 paths to the default library search path
- install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf"
-
- # Symlink /usr/lib32/locale to /usr/lib/locale
- ln -s ../lib/locale "$pkgdir/usr/lib32/locale"
-}
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch b/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (eip);
- /* Note: %esi is zero. */
- movl %esi,%ebp /* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- jmp L(haspid)
- .previous
- #endif
-- cfi_endproc;
-
- cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (rip);
- /* Clear the frame pointer. The ABI suggests this be done, to mark
- the outermost frame obviously. */
- xorl %ebp, %ebp
-@@ -116,7 +113,6 @@
- /* Call exit with return value from function call. */
- movq %rax, %rdi
- call HIDDEN_JUMPTARGET (_exit)
-- cfi_endproc;
-
- cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch b/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.10-dont-build-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
---- glibc-2.4/Makeconfig
-+++ glibc-2.4/Makeconfig
-@@ -931,7 +931,7 @@
- stdlib stdio-common libio malloc string wcsmbs time dirent \
- grp pwd posix io termios resource misc socket sysvipc gmon \
- gnulib iconv iconvdata wctype manual shadow gshadow po argp \
-- crypt nss localedata timezone rt conform debug \
-+ crypt nss localedata rt conform debug \
- $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
-
- ifndef avoid-generated
diff --git a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch
deleted file mode 100644
index e84754279..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
-@@ -28,7 +28,7 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
-+#if 0 && defined __ASSUME_AT_PAGESIZE
- assert (GLRO(dl_pagesize) != 0);
- return GLRO(dl_pagesize);
- #else
diff --git a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog | 5 +++++
- elf/dl-object.c | 3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 22a1635..7674d49 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
- out:
- new->l_origin = origin;
- }
-+ else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+ /* The origin of a privileged program cannot be trusted. */
-+ new->l_origin = (char *) -1;
-
- return new;
- }
---
-1.7.2
diff --git a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch b/multilib-testing/lib32-glibc/glibc-2.13-futex.patch
deleted file mode 100644
index 9b9c3ac45..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.13-futex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
-
- 7: movq %rdx, %rax
-
--#ifndef __ASSUME_PRIVATE_FUTEX
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- addq $16, %rsp
- cfi_adjust_cfa_offset(-16)
- popq %r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch b/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
-- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
- if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
- || dl_close_state != not_pending)
- {
-- if (map->l_direct_opencount == 0)
-- {
-- if (map->l_type == lt_loaded)
-- dl_close_state = rerun;
-- else if (map->l_type == lt_library)
-- {
-- struct link_map **oldp = map->l_initfini;
-- map->l_initfini = map->l_orig_initfini;
-- _dl_scope_free (oldp);
-- }
-- }
-+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+ dl_close_state = rerun;
-
- /* There are still references to this object. Do nothing more. */
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- nneeded * sizeof needed[0]);
- atomic_write_barrier ();
- l->l_initfini = l_initfini;
-+ l->l_free_initfini = 1;
- }
-
- /* If we have no auxiliary objects just go on to the next map. */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
- l_initfini[nlist] = NULL;
- atomic_write_barrier ();
- map->l_initfini = l_initfini;
-+ map->l_free_initfini = 1;
- if (l_reldeps != NULL)
- {
- atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
- _dl_scope_free (old_l_reldeps);
- }
- if (old_l_initfini != NULL)
-- map->l_orig_initfini = old_l_initfini;
-+ _dl_scope_free (old_l_initfini);
-
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
-
- for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
- {
-- /* Remove all additional names added to the objects. */
- for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- {
- struct libname_list *lnp = l->l_libname->next;
-
- l->l_libname->next = NULL;
-
-+ /* Remove all additional names added to the objects. */
- while (lnp != NULL)
- {
- struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- if (! old->dont_free)
- free (old);
- }
-+
-+ /* Free the initfini dependency list. */
-+ if (l->l_free_initfini)
-+ free (l->l_initfini);
- }
-
- if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- lnp->dont_free = 1;
- lnp = lnp->next;
- }
-+ l->l_free_initfini = 0;
-
- if (l != &GL(dl_rtld_map))
- _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
- loaded ELF shared objects.
-- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- during LD_TRACE_PRELINKING=1
- contains any DT_SYMBOLIC
- libraries. */
-+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+ freed, ie. not allocated with
-+ the dummy malloc in ld.so. */
-
- /* Collected information about own RPATH directories. */
- struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
-
- /* List of object in order of the init and fini calls. */
- struct link_map **l_initfini;
-- /* The init and fini list generated at startup, saved when the
-- object is also loaded dynamically. */
-- struct link_map **l_orig_initfini;
-
- /* List of the dependencies introduced through symbol binding. */
- struct link_map_reldeps
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch b/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir := nis
-
- aux := nis_hash
-
-+headers := $(wildcard rpcsvc/*.[hx])
- distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
-- nisplus-parser.h nis_xdr.h nss \
-- $(wildcard rpcsvc/*.[hx])
-+ nisplus-parser.h nis_xdr.h nss
-
- # These are the databases available for the nis (and perhaps later nisplus)
- # service. This must be a superset of the services in nss.
---
-1.7.5.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch b/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- ns, ansp, ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+ if (n == 0)
- goto next_ns;
- } else {
- /* Use datagrams. */
-@@ -559,7 +559,7 @@
- ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+ if (n == 0)
- goto next_ns;
- if (v_circuit)
- // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- (*thisresplenp > *thisanssizp)
- ? *thisanssizp : *thisresplenp);
-
-- if (recvresp1 || (buf2 != NULL && recvresp2)) {
-- *resplen2 = 0;
-+ if (recvresp1 || (buf2 != NULL && recvresp2))
- return resplen;
-- }
- if (buf2 != NULL)
- {
-- /* No data from the first reply. */
-- resplen = 0;
- /* We are waiting for a possible second reply. */
- if (hp->id == anhp->id)
- recvresp1 = 1;
diff --git a/multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch b/multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch
deleted file mode 100644
index 9e21cbfd3..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/time/tzfile.c b/time/tzfile.c
-index 144e20b..402389c 100644
---- a/time/tzfile.c
-+++ b/time/tzfile.c
-@@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
- goto read_again;
- }
-
-+ if (__builtin_expect (num_transitions
-+ > ((SIZE_MAX - (__alignof__ (struct ttinfo) - 1))
-+ / (sizeof (time_t) + 1)), 0))
-+ goto lose;
- total_size = num_transitions * (sizeof (time_t) + 1);
- total_size = ((total_size + __alignof__ (struct ttinfo) - 1)
- & ~(__alignof__ (struct ttinfo) - 1));
- types_idx = total_size;
-- total_size += num_types * sizeof (struct ttinfo) + chars;
-+ if (__builtin_expect (num_types
-+ > (SIZE_MAX - total_size) / sizeof (struct ttinfo), 0))
-+ goto lose;
-+ total_size += num_types * sizeof (struct ttinfo);
-+ if (__builtin_expect (chars > SIZE_MAX - total_size, 0))
-+ goto lose;
-+ total_size += chars;
-+ if (__builtin_expect (__alignof__ (struct leap) - 1
-+ > SIZE_MAX - total_size, 0))
-+ goto lose;
- total_size = ((total_size + __alignof__ (struct leap) - 1)
- & ~(__alignof__ (struct leap) - 1));
- leaps_idx = total_size;
-+ if (__builtin_expect (num_leaps
-+ > (SIZE_MAX - total_size) / sizeof (struct leap), 0))
-+ goto lose;
- total_size += num_leaps * sizeof (struct leap);
-- tzspec_len = (sizeof (time_t) == 8 && trans_width == 8
-- ? st.st_size - (ftello (f)
-- + num_transitions * (8 + 1)
-- + num_types * 6
-- + chars
-- + num_leaps * 12
-- + num_isstd
-- + num_isgmt) - 1 : 0);
-+ tzspec_len = 0;
-+ if (sizeof (time_t) == 8 && trans_width == 8)
-+ {
-+ off_t rem = st.st_size - ftello (f);
-+ if (__builtin_expect (rem < 0
-+ || (size_t) rem < (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars), 0))
-+ goto lose;
-+ tzspec_len = (size_t) rem - (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars);
-+ if (__builtin_expect (num_leaps > SIZE_MAX / 12
-+ || tzspec_len < num_leaps * 12, 0))
-+ goto lose;
-+ tzspec_len -= num_leaps * 12;
-+ if (__builtin_expect (tzspec_len < num_isstd, 0))
-+ goto lose;
-+ tzspec_len -= num_isstd;
-+ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
-+ goto lose;
-+ tzspec_len -= num_isgmt + 1;
-+ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))
-+ goto lose;
-+ }
-+ if (__builtin_expect (SIZE_MAX - total_size - tzspec_len < extra, 0))
-+ goto lose;
-
- /* Allocate enough memory including the extra block requested by the
- caller. */
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch b/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-lddebug-scopes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Fri, 7 Oct 2011 09:31:27 +0200
-Subject: [PATCH] Horrible workaround for horribly broken software
-
----
- elf/rtld.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 978c609..8422b9f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- char *copy = malloc (len);
- if (copy == NULL)
- _dl_fatal_printf ("out of memory\n");
-- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
-+ l->l_libname->name = memcpy (copy, dsoname, len);
-+ if (GLRO(dl_debug_mask))
-+ l->l_name = copy;
- }
-
- /* Add the vDSO to the object list. */
---
-1.7.3.4
-
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch b/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch
deleted file mode 100644
index d315bf266..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-math64crash.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
-index be68903..a032da8 100644
---- a/sysdeps/x86_64/fpu/multiarch/Makefile
-+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),math)
--libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
-+libm-sysdep_routines += s_floorf-c s_ceilf-c \
- s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
-
- ifeq ($(have-mfma4),yes)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-deleted file mode 100644
-index 6a5ea3f..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#define __ceil __ceil_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-deleted file mode 100644
-index d0f8da3..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
-- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-- 02111-1307 USA. */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__ceil)
-- .type __ceil, @gnu_indirect_function
-- call __get_cpu_features@plt
-- movq %rax, %rdx
-- leaq __ceil_sse41(%rip), %rax
-- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
-- jnz 2f
-- leaq __ceil_c(%rip), %rax
--2: ret
--END(__ceil)
--weak_alias (__ceil, ceil)
--
--
--ENTRY(__ceil_sse41)
-- roundsd $2, %xmm0, %xmm0
-- ret
--END(__ceil_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-deleted file mode 100644
-index 68733b6..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#undef __floor
--#define __floor __floor_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S
-deleted file mode 100644
-index 514ea95..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
-- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-- 02111-1307 USA. */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__floor)
-- .type __floor, @gnu_indirect_function
-- call __get_cpu_features@plt
-- movq %rax, %rdx
-- leaq __floor_sse41(%rip), %rax
-- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
-- jnz 2f
-- leaq __floor_c(%rip), %rax
--2: ret
--END(__floor)
--weak_alias (__floor, floor)
--
--
--ENTRY(__floor_sse41)
-- roundsd $1, %xmm0, %xmm0
-- ret
--END(__floor_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-deleted file mode 100644
-index 1ba9dbc..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ /dev/null
-@@ -1,31 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--# undef NAN
--
--extern double __cos_sse2 (double);
--extern double __sin_sse2 (double);
--extern double __cos_avx (double);
--extern double __sin_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __cos_fma4 (double);
--extern double __sin_fma4 (double);
--# else
--# undef HAS_FMA4
--# define HAS_FMA4 0
--# define __cos_fma4 ((void *) 0)
--# define __sin_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
--weak_alias (__cos, cos)
--
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
--weak_alias (__sin, sin)
--
--# define __cos __cos_sse2
--# define __sin __sin_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_sin.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-deleted file mode 100644
-index 8f6601e..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--
--extern double __tan_sse2 (double);
--extern double __tan_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __tan_fma4 (double);
--# else
--# undef HAS_FMA4
--# define HAS_FMA4 0
--# define __tan_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
--
--# define tan __tan_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_tan.c>
diff --git a/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch b/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index f532b95e8..000000000
--- a/multilib-testing/lib32-glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000
-@@ -137,7 +137,6 @@ __pthread_cond_wait:
- cmpl $PI_BIT, %eax
- jne 18f
-
--90:
- movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
- movl %ebp, %edx
- xorl %esi, %esi
-@@ -151,9 +150,6 @@ __pthread_cond_wait:
- sete 16(%esp)
- je 19f
-
-- cmpl $-EAGAIN, %eax
-- je 91f
--
- /* Normal and PI futexes dont mix. Use normal futex functions only
- if the kernel does not support the PI futex functions. */
- cmpl $-ENOSYS, %eax
-@@ -398,78 +394,6 @@ __pthread_cond_wait:
- #endif
- call __lll_unlock_wake
- jmp 11b
--
--91:
--.LcleanupSTART2:
-- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
-- call it again. */
--
-- /* Get internal lock. */
-- movl $1, %edx
-- xorl %eax, %eax
-- LOCK
--#if cond_lock == 0
-- cmpxchgl %edx, (%ebx)
--#else
-- cmpxchgl %edx, cond_lock(%ebx)
--#endif
-- jz 92f
--
--#if cond_lock == 0
-- movl %ebx, %edx
--#else
-- leal cond_lock(%ebx), %edx
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
-- xorl %ecx, %ecx
--#endif
-- cmpl $-1, dep_mutex(%ebx)
-- setne %cl
-- subl $1, %ecx
-- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
-- addl $LLL_PRIVATE, %ecx
--#endif
-- call __lll_lock_wait
--
--92:
-- /* Increment the cond_futex value again, so it can be used as a new
-- expected value. */
-- addl $1, cond_futex(%ebx)
-- movl cond_futex(%ebx), %ebp
--
-- /* Unlock. */
-- LOCK
--#if cond_lock == 0
-- subl $1, (%ebx)
--#else
-- subl $1, cond_lock(%ebx)
--#endif
-- je 93f
--#if cond_lock == 0
-- movl %ebx, %eax
--#else
-- leal cond_lock(%ebx), %eax
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
-- xorl %ecx, %ecx
--#endif
-- cmpl $-1, dep_mutex(%ebx)
-- setne %cl
-- subl $1, %ecx
-- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
-- addl $LLL_PRIVATE, %ecx
--#endif
-- call __lll_unlock_wake
--
--93:
-- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
-- xorl %ecx, %ecx
-- movl dep_mutex(%ebx), %edi
-- jmp 90b
--.LcleanupEND2:
--
- .size __pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- GLIBC_2_3_2)
-@@ -642,10 +566,6 @@ __condvar_w_cleanup:
- .long .LcleanupEND-.Lsub_cond_futex
- .long __condvar_w_cleanup-.LSTARTCODE
- .uleb128 0
-- .long .LcleanupSTART2-.LSTARTCODE
-- .long .LcleanupEND2-.LcleanupSTART2
-- .long __condvar_w_cleanup-.LSTARTCODE
-- .uleb128 0
- .long .LcallUR-.LSTARTCODE
- .long .LENDCODE-.LcallUR
- .long 0
-Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
-diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000
-@@ -23,7 +23,6 @@
- #include <lowlevelcond.h>
- #include <tcb-offsets.h>
- #include <pthread-pi-defines.h>
--#include <pthread-errnos.h>
-
- #include <kernel-features.h>
-
-@@ -137,14 +136,11 @@ __pthread_cond_wait:
- cmpl $PI_BIT, %eax
- jne 61f
-
--90:
- movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
- movl $SYS_futex, %eax
- syscall
-
- movl $1, %r8d
-- cmpq $-EAGAIN, %rax
-- je 91f
- #ifdef __ASSUME_REQUEUE_PI
- jmp 62f
- #else
-@@ -331,70 +327,6 @@ __pthread_cond_wait:
-
- 13: movq %r10, %rax
- jmp 14b
--
--91:
--.LcleanupSTART2:
-- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
-- call it again. */
-- movq 8(%rsp), %rdi
--
-- /* Get internal lock. */
-- movl $1, %esi
-- xorl %eax, %eax
-- LOCK
--#if cond_lock == 0
-- cmpxchgl %esi, (%rdi)
--#else
-- cmpxchgl %esi, cond_lock(%rdi)
--#endif
-- jz 92f
--
--#if cond_lock != 0
-- addq $cond_lock, %rdi
--#endif
-- cmpq $-1, dep_mutex-cond_lock(%rdi)
-- movl $LLL_PRIVATE, %eax
-- movl $LLL_SHARED, %esi
-- cmovne %eax, %esi
-- callq __lll_lock_wait
--#if cond_lock != 0
-- subq $cond_lock, %rdi
--#endif
--92:
-- /* Increment the cond_futex value again, so it can be used as a new
-- expected value. */
-- incl cond_futex(%rdi)
-- movl cond_futex(%rdi), %edx
--
-- /* Release internal lock. */
-- LOCK
--#if cond_lock == 0
-- decl (%rdi)
--#else
-- decl cond_lock(%rdi)
--#endif
-- jz 93f
--
--#if cond_lock != 0
-- addq $cond_lock, %rdi
--#endif
-- cmpq $-1, dep_mutex-cond_lock(%rdi)
-- movl $LLL_PRIVATE, %eax
-- movl $LLL_SHARED, %esi
-- cmovne %eax, %esi
-- /* The call preserves %rdx. */
-- callq __lll_unlock_wake
--#if cond_lock != 0
-- subq $cond_lock, %rdi
--#endif
--93:
-- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
-- xorq %r10, %r10
-- movq dep_mutex(%rdi), %r8
-- leaq cond_futex(%rdi), %rdi
-- jmp 90b
--.LcleanupEND2:
--
- .size __pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- GLIBC_2_3_2)
-@@ -547,15 +479,11 @@ __condvar_cleanup1:
- .uleb128 .LcleanupSTART-.LSTARTCODE
- .uleb128 .LcleanupEND-.LcleanupSTART
- .uleb128 __condvar_cleanup1-.LSTARTCODE
-- .uleb128 0
-- .uleb128 .LcleanupSTART2-.LSTARTCODE
-- .uleb128 .LcleanupEND2-.LcleanupSTART2
-- .uleb128 __condvar_cleanup1-.LSTARTCODE
-- .uleb128 0
-+ .uleb128 0
- .uleb128 .LcallUR-.LSTARTCODE
- .uleb128 .LENDCODE-.LcallUR
- .uleb128 0
-- .uleb128 0
-+ .uleb128 0
- .Lcstend:
-
-
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej
diff --git a/multilib-testing/lib32-glibc/glibc-__i686.patch b/multilib-testing/lib32-glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/multilib-testing/lib32-glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000
-+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000
-@@ -1,6 +1,7 @@
- # The mpn functions need a #define for asm syntax flavor.
--# Every i386 port in use uses gas syntax (I think).
--asm-CPPFLAGS += -DGAS_SYNTAX
-+# Every i386 port in use uses gas syntax (I think). Don't replace
-+# __i686 in __i686.get_pc_thunk.bx.
-+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686
-
- # The i386 `long double' is a distinct type we support.
- long-double-fcts = yes
diff --git a/multilib-testing/lib32-glibc/lib32-glibc.conf b/multilib-testing/lib32-glibc/lib32-glibc.conf
deleted file mode 100644
index a1c8c4199..000000000
--- a/multilib-testing/lib32-glibc/lib32-glibc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-/lib32
-/usr/lib32
diff --git a/multilib/gcc-multilib/gcc-pr49720.patch b/multilib/gcc-multilib/gcc-pr49720.patch
deleted file mode 100644
index 8f50c4120..000000000
--- a/multilib/gcc-multilib/gcc-pr49720.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- trunk/gcc/simplify-rtx.c 2011/10/28 05:55:10 180603
-+++ trunk/gcc/simplify-rtx.c 2011/10/28 06:35:31 180604
-@@ -4352,10 +4352,20 @@
- {
- rtx x = XEXP (op0, 0);
- rtx c = XEXP (op0, 1);
-+ enum rtx_code invcode = op0code == PLUS ? MINUS : PLUS;
-+ rtx tem = simplify_gen_binary (invcode, cmp_mode, op1, c);
-
-- c = simplify_gen_binary (op0code == PLUS ? MINUS : PLUS,
-- cmp_mode, op1, c);
-- return simplify_gen_relational (code, mode, cmp_mode, x, c);
-+ /* Detect an infinite recursive condition, where we oscillate at this
-+ simplification case between:
-+ A + B == C <---> C - B == A,
-+ where A, B, and C are all constants with non-simplifiable expressions,
-+ usually SYMBOL_REFs. */
-+ if (GET_CODE (tem) == invcode
-+ && CONSTANT_P (x)
-+ && rtx_equal_p (c, XEXP (tem, 1)))
-+ return NULL_RTX;
-+
-+ return simplify_gen_relational (code, mode, cmp_mode, x, tem);
- }
-
- /* (ne:SI (zero_extract:SI FOO (const_int 1) BAR) (const_int 0))) is
diff --git a/multilib/lib32-curl/PKGBUILD b/multilib/lib32-curl/PKGBUILD
deleted file mode 100755
index 84dedb85f..000000000
--- a/multilib/lib32-curl/PKGBUILD
+++ /dev/null
@@ -1,57 +0,0 @@
-# $Id: PKGBUILD 60264 2011-12-08 19:46:45Z bluewind $
-# Maintainer: Florian Pritz <flo@xssn.at>
-
-_pkgbasename=curl
-pkgname=lib32-$_pkgbasename
-pkgver=7.23.1
-pkgrel=1
-pkgdesc="An URL retrieval utility and library (32-bit)"
-arch=('x86_64')
-url="http://curl.haxx.se"
-license=('MIT')
-depends=('lib32-zlib' 'lib32-openssl' 'bash' 'ca-certificates' 'lib32-libssh2' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=("http://curl.haxx.se/download/${_pkgbasename}-${pkgver}.tar.bz2")
-md5sums=('0296d3196b4bf82c896a869b38dbc5f2')
-
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd ${srcdir}/${_pkgbasename}-${pkgver}
-
- ./configure \
- --with-random=/dev/urandom \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --disable-dependency-tracking \
- --enable-ipv6 \
- --disable-ldaps \
- --disable-ldap \
- --disable-manual \
- --enable-versioned-symbols \
- --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt \
- --with-random=/dev/urandom \
- --without-libidn \
- --libdir=/usr/lib32 \
- --enable-threaded-resolver
- make
-}
-
-package() {
- cd ${srcdir}/${_pkgbasename}-${pkgver}
-
- make DESTDIR=${pkgdir} install
-
- rm -rf "${pkgdir}"/usr/{share,bin}
- #we need curlbuild.h
- find ${pkgdir}/usr/include/curl -type f -not -name curlbuild.h -delete
- #now save it as curlbuild-32.h
- mv ${pkgdir}/usr/include/curl/curlbuild.h ${pkgdir}/usr/include/curl/curlbuild-32.h
-
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-db/PKGBUILD b/multilib/lib32-db/PKGBUILD
deleted file mode 100644
index 93be51e47..000000000
--- a/multilib/lib32-db/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 35318 2010-12-18 21:29:14Z heftig $
-# Maintainer: Biru Ionut <biru.ionut at gmail.com>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-_pkgbasename=db
-pkgname=lib32-$_pkgbasename
-pkgver=5.1.19
-pkgrel=1
-pkgdesc="The Berkeley DB embedded database system (32-bit)"
-arch=('x86_64')
-url="http://www.oracle.com/technology/software/products/berkeley-db/index.html"
-license=('custom')
-depends=('lib32-gcc-libs' $_pkgbasename)
-makedepends=('gcc-multilib')
-options=('!libtool')
-source=(http://download-uk.oracle.com/berkeley-db/db-${pkgver}.tar.gz)
-md5sums=('76fcbfeebfcd09ba0b4d96bfdf8d884d')
-
-build() {
- cd ${srcdir}/$_pkgbasename-${pkgver}/build_unix
-
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- ../dist/configure --prefix=/usr --enable-compat185 \
- --enable-shared --enable-static --enable-cxx --enable-dbm \
- --libdir=/usr/lib32
- make LIBSO_LIBS=-lpthread
-}
-
-package() {
- cd ${srcdir}/${_pkgbasename}-${pkgver}/build_unix
- make DESTDIR=${pkgdir} install
-
- rm -rf "${pkgdir}"/usr/{docs,include,share,bin}
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch b/multilib/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch
deleted file mode 100644
index e84754279..000000000
--- a/multilib/lib32-glibc/glibc-2.12.1-static-shared-getpagesize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
-@@ -28,7 +28,7 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
-+#if 0 && defined __ASSUME_AT_PAGESIZE
- assert (GLRO(dl_pagesize) != 0);
- return GLRO(dl_pagesize);
- #else
diff --git a/multilib/lib32-glibc/glibc-2.13-futex.patch b/multilib/lib32-glibc/glibc-2.13-futex.patch
deleted file mode 100644
index 9b9c3ac45..000000000
--- a/multilib/lib32-glibc/glibc-2.13-futex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
-
- 7: movq %rdx, %rax
-
--#ifndef __ASSUME_PRIVATE_FUTEX
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- addq $16, %rsp
- cfi_adjust_cfa_offset(-16)
- popq %r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
diff --git a/multilib/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch b/multilib/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch
deleted file mode 100644
index 9e21cbfd3..000000000
--- a/multilib/lib32-glibc/glibc-2.14.1-tzfile-overflow.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/time/tzfile.c b/time/tzfile.c
-index 144e20b..402389c 100644
---- a/time/tzfile.c
-+++ b/time/tzfile.c
-@@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
- goto read_again;
- }
-
-+ if (__builtin_expect (num_transitions
-+ > ((SIZE_MAX - (__alignof__ (struct ttinfo) - 1))
-+ / (sizeof (time_t) + 1)), 0))
-+ goto lose;
- total_size = num_transitions * (sizeof (time_t) + 1);
- total_size = ((total_size + __alignof__ (struct ttinfo) - 1)
- & ~(__alignof__ (struct ttinfo) - 1));
- types_idx = total_size;
-- total_size += num_types * sizeof (struct ttinfo) + chars;
-+ if (__builtin_expect (num_types
-+ > (SIZE_MAX - total_size) / sizeof (struct ttinfo), 0))
-+ goto lose;
-+ total_size += num_types * sizeof (struct ttinfo);
-+ if (__builtin_expect (chars > SIZE_MAX - total_size, 0))
-+ goto lose;
-+ total_size += chars;
-+ if (__builtin_expect (__alignof__ (struct leap) - 1
-+ > SIZE_MAX - total_size, 0))
-+ goto lose;
- total_size = ((total_size + __alignof__ (struct leap) - 1)
- & ~(__alignof__ (struct leap) - 1));
- leaps_idx = total_size;
-+ if (__builtin_expect (num_leaps
-+ > (SIZE_MAX - total_size) / sizeof (struct leap), 0))
-+ goto lose;
- total_size += num_leaps * sizeof (struct leap);
-- tzspec_len = (sizeof (time_t) == 8 && trans_width == 8
-- ? st.st_size - (ftello (f)
-- + num_transitions * (8 + 1)
-- + num_types * 6
-- + chars
-- + num_leaps * 12
-- + num_isstd
-- + num_isgmt) - 1 : 0);
-+ tzspec_len = 0;
-+ if (sizeof (time_t) == 8 && trans_width == 8)
-+ {
-+ off_t rem = st.st_size - ftello (f);
-+ if (__builtin_expect (rem < 0
-+ || (size_t) rem < (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars), 0))
-+ goto lose;
-+ tzspec_len = (size_t) rem - (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars);
-+ if (__builtin_expect (num_leaps > SIZE_MAX / 12
-+ || tzspec_len < num_leaps * 12, 0))
-+ goto lose;
-+ tzspec_len -= num_leaps * 12;
-+ if (__builtin_expect (tzspec_len < num_isstd, 0))
-+ goto lose;
-+ tzspec_len -= num_isstd;
-+ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
-+ goto lose;
-+ tzspec_len -= num_isgmt + 1;
-+ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))
-+ goto lose;
-+ }
-+ if (__builtin_expect (SIZE_MAX - total_size - tzspec_len < extra, 0))
-+ goto lose;
-
- /* Allocate enough memory including the extra block requested by the
- caller. */
diff --git a/multilib/lib32-libvdpau/PKGBUILD b/multilib/lib32-libvdpau/PKGBUILD
deleted file mode 100644
index 795e0f051..000000000
--- a/multilib/lib32-libvdpau/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 41886 2011-03-10 14:20:26Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: TryA <tryagainprod {at} gmail.com>
-
-_pkgbasename=libvdpau
-pkgname=lib32-libvdpau
-pkgver=0.4.1
-pkgrel=3
-pkgdesc="Nvidia VDPAU library (32-bit)"
-arch=('x86_64')
-url=http://cgit.freedesktop.org/~aplattner/libvdpau
-depends=(${_pkgbasename})
-options=('!libtool')
-license=('custom')
-source=(http://people.freedesktop.org/~aplattner/vdpau/${_pkgbasename}-${pkgver}.tar.gz)
-makedepends=('lib32-libx11')
-sha256sums=('061b6f86c64912f79851bfefcac4f77b401e9a939dbbb7b1ec795bc7d5aaf59b')
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- ./configure --prefix=/usr --libdir=/usr/lib32
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/include
-
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libxpm/PKGBUILD b/multilib/lib32-libxpm/PKGBUILD
deleted file mode 100644
index 4535195de..000000000
--- a/multilib/lib32-libxpm/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 35279 2010-12-18 01:24:10Z heftig $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-_pkgbasename=libxpm
-pkgname=lib32-$_pkgbasename
-pkgver=3.5.9
-pkgrel=1
-pkgdesc="X11 pixmap library (32-bit)"
-arch=(x86_64)
-license=('custom')
-url="http://xorg.freedesktop.org/"
-depends=('lib32-libxt' 'lib32-libxext' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXpm-${pkgver}.tar.bz2)
-sha1sums=('38258a1d589d3f157e0338d0fd13eec11bc4a39b')
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd "${srcdir}/libXpm-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
- --libdir=/usr/lib32
- make
-}
-
-package() {
- cd "${srcdir}/libXpm-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share,bin}
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libxslt/PKGBUILD b/multilib/lib32-libxslt/PKGBUILD
deleted file mode 100644
index 735c35a14..000000000
--- a/multilib/lib32-libxslt/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 26680 2010-09-15 22:51:35Z bluewind $
-# Maintainer: Eric Belanger <eric@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-_pkgbasename=libxslt
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.26
-pkgrel=5
-pkgdesc="XML stylesheet transformation library (32-bit)"
-arch=('x86_64')
-url="http://xmlsoft.org/XSLT/"
-license=('custom')
-depends=('lib32-libxml2>=2.7.7' 'lib32-libgcrypt>=1.4.4' $_pkgbasename)
-makedepends=(gcc-multilib)
-options=('!libtool')
-source=(ftp://xmlsoft.org/libxslt/${_pkgbasename}-${pkgver}.tar.gz)
-md5sums=('e61d0364a30146aaa3001296f853b2b9')
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- ./configure --prefix=/usr --libdir=/usr/lib32 --without-python
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share,bin}
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-libxxf86dga/PKGBUILD b/multilib/lib32-libxxf86dga/PKGBUILD
deleted file mode 100644
index 3b9733151..000000000
--- a/multilib/lib32-libxxf86dga/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 35291 2010-12-18 01:33:35Z heftig $
-# Contributor: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-_pkgbasename=libxxf86dga
-pkgname=lib32-$_pkgbasename
-pkgver=1.1.2
-pkgrel=1
-pkgdesc="X11 Direct Graphics Access extension library (32-bit)"
-arch=(x86_64)
-url="http://xorg.freedesktop.org/"
-license=('custom')
-depends=('lib32-libxext' 'xf86dgaproto' $_pkgbasename)
-makedepends=('xorg-util-macros' gcc-multilib)
-options=('!libtool')
-source=(${url}/releases/individual/lib/libXxf86dga-${pkgver}.tar.bz2)
-sha1sums=('333a9f5c61eba896f420969561606551174645cd')
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- cd "${srcdir}/libXxf86dga-${pkgver}"
- ./configure --prefix=/usr --disable-static \
- --libdir=/usr/lib32
- make
-}
-
-package() {
- cd "${srcdir}/libXxf86dga-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share,bin}
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/multilib/lib32-llvm/clang-toolchains-gcc-versions.patch b/multilib/lib32-llvm/clang-toolchains-gcc-versions.patch
deleted file mode 100644
index 2e527300d..000000000
--- a/multilib/lib32-llvm/clang-toolchains-gcc-versions.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -upr clang-2.9.orig/lib/Driver/ToolChains.cpp clang-2.9/lib/Driver/ToolChains.cpp
---- clang-2.9.orig/lib/Driver/ToolChains.cpp 2011-03-21 23:29:27.000000000 +0200
-+++ clang-2.9/lib/Driver/ToolChains.cpp 2011-04-08 00:03:34.000000000 +0300
-@@ -1449,7 +1449,7 @@ Linux::Linux(const HostInfo &Host, const
- GccTriple = "i586-suse-linux";
- }
-
-- const char* GccVersions[] = {"4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
-+ const char* GccVersions[] = {"4.6.0", "4.5.2", "4.5.1", "4.5", "4.4.5", "4.4.4",
- "4.4.3", "4.4", "4.3.4", "4.3.3", "4.3.2",
- "4.3", "4.2.4", "4.2.3", "4.2.2", "4.2.1",
- "4.2"};
diff --git a/multilib/lib32-nspr/PKGBUILD b/multilib/lib32-nspr/PKGBUILD
deleted file mode 100644
index dbb4d43eb..000000000
--- a/multilib/lib32-nspr/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 55627 2011-09-16 13:38:37Z bluewind $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=nspr
-pkgname=lib32-$_pkgbasename
-pkgver=4.8.9
-pkgrel=1
-pkgdesc="Netscape Portable Runtime (32-bit)"
-arch=('x86_64')
-url="http://www.mozilla.org/projects/nspr/"
-license=('MPL' 'GPL')
-depends=('lib32-glibc' $_pkgbasename)
-makedepends=('zip' 'gcc-multilib')
-options=(!emptydirs)
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v${pkgver}/src/${_pkgbasename}-${pkgver}.tar.gz
- nspr.pc.in)
-md5sums=('60770d45dc08c0f181b22cdfce5be3e8'
- 'bce1611f3117b53fc904cab549c09967')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
- sed -e 's/\$(MKSHLIB) \$(OBJS)/\$(MKSHLIB) \$(LDFLAGS) \$(OBJS)/g' \
- -i mozilla/nsprpub/config/rules.mk
-
- ./mozilla/nsprpub/configure \
- --prefix=/usr \
- --libdir=/usr/lib32 \
- --includedir=/usr/include/nspr \
- --enable-optimize \
- --disable-debug ${confflags}
- make
-
- NSPR_LIBS=`./config/nspr-config --libs`
- NSPR_CFLAGS=`./config/nspr-config --cflags`
- NSPR_VERSION=`./config/nspr-config --version`
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- sed "${srcdir}/nspr.pc.in" -e "s,%libdir%,/usr/lib32," \
- -e "s,%prefix%,/usr," \
- -e "s,%exec_prefix%,/usr/bin," \
- -e "s,%includedir%,/usr/include/nspr," \
- -e "s,%NSPR_VERSION%,${NSPR_VERSION}," \
- -e "s,%FULL_NSPR_LIBS%,${NSPR_LIBS}," \
- -e "s,%FULL_NSPR_CFLAGS%,${NSPR_CFLAGS}," > "${srcdir}/nspr.pc"
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-
- install -m755 -D "${srcdir}/nspr.pc" "${pkgdir}"/usr/lib32/pkgconfig/nspr.pc
- chmod 644 "${pkgdir}/usr/lib32/pkgconfig/nspr.pc"
- ln -sf nspr.pc "${pkgdir}/usr/lib32/pkgconfig/mozilla-nspr.pc"
-
- chmod 644 ${pkgdir}/usr/lib32/*.a
-
- rm -rf "${pkgdir}"/usr/{bin,share,include}
-}
diff --git a/multilib/lib32-nspr/nspr.pc.in b/multilib/lib32-nspr/nspr.pc.in
deleted file mode 100644
index 1d8f4a0ca..000000000
--- a/multilib/lib32-nspr/nspr.pc.in
+++ /dev/null
@@ -1,10 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSPR
-Description: The Netscape Portable Runtime
-Version: %NSPR_VERSION%
-Libs: %FULL_NSPR_LIBS%
-Cflags: %FULL_NSPR_CFLAGS%
diff --git a/multilib/lib32-nss/PKGBUILD b/multilib/lib32-nss/PKGBUILD
deleted file mode 100644
index b747e1a31..000000000
--- a/multilib/lib32-nss/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 55628 2011-09-16 13:40:10Z bluewind $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-
-_pkgbasename=nss
-pkgname=lib32-$_pkgbasename
-pkgver=3.12.11
-pkgrel=1
-pkgdesc="Mozilla Network Security Services (32-bit)"
-arch=('x86_64')
-url="http://www.mozilla.org/projects/security/pki/nss/"
-license=('MPL' 'GPL')
-_nsprver=4.8.9
-depends=("lib32-nspr>=${_nsprver}" 'lib32-sqlite3>=3.6.17' "$_pkgbasename" 'lib32-zlib')
-makedepends=('gcc-multilib' 'perl')
-options=('!strip')
-source=(ftp://ftp.mozilla.org/pub/security/nss/releases/NSS_${pkgver//./_}_RTM/src/${_pkgbasename}-${pkgver}.tar.gz
- nss-no-rpath.patch
- nss.pc.in
- distrust-diginotar.patch
- add_spi+cacert_ca_certs.patch
- ssl-renegotiate-transitional.patch)
-md5sums=('ca0ca058380be200cf247ea2496b5352'
- 'e5c97db0c884d5f4cfda21e562dc9bba'
- 'c547b030c57fe1ed8b77c73bf52b3ded'
- 'bbd7d8a8e2f6ffc8b3e5f6614e5f3ccf'
- 'ba2357c5b9881bfd7d54b037954ba0ff'
- 'd83c7b61abb7e9f8f7bcd157183d1ade')
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}/mozilla"
- # Distrust DigiNotar root CA - backported from CVS (https://bugzilla.mozilla.org/show_bug.cgi?id=682927)
- patch -Np0 -i "${srcdir}/distrust-diginotar.patch"
- # Adds the SPI Inc. and CAcert.org CA certificates - patch from Debian
- patch -Np2 -i "${srcdir}/add_spi+cacert_ca_certs.patch"
- # Adds transitional SSL renegotiate support - patch from Debian
- patch -Np2 -i "${srcdir}/ssl-renegotiate-transitional.patch"
- # Removes rpath
- patch -Np2 -i "${srcdir}/nss-no-rpath.patch"
-
- # Respect LDFLAGS
- sed -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' \
- -i security/coreconf/rules.mk
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
- export PKG_CONFIG_PATH=/usr/lib32/pkgconfig
- export BUILD_OPT=1
- export PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
- export PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1
- export NSS_USE_SYSTEM_SQLITE=1
- export NSPR_INCLUDE_DIR=`pkg-config --cflags-only-I nspr | sed 's/-I//'`
- export NSPR_LIB_DIR=`pkg-config --libs-only-L nspr | sed 's/-L.//'`
- export XCFLAGS="${CFLAGS}"
-
- make -j 1 -C mozilla/security/coreconf
- make -j 1 -C mozilla/security/dbm
- make -j 1 -C mozilla/security/nss
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
- install -m755 -d "${pkgdir}/usr/lib32/pkgconfig"
-
- sed "${srcdir}/nss.pc.in" -e "s,%libdir%,/usr/lib32,g" \
- -e "s,%prefix%,/usr,g" \
- -e "s,%exec_prefix%,/usr/bin,g" \
- -e "s,%includedir%,/usr/include/nss,g" \
- -e "s,%NSPR_VERSION%,${pkgver},g" \
- -e "s,%NSS_VERSION%,${pkgver},g" > \
- "${pkgdir}/usr/lib32/pkgconfig/nss.pc"
- ln -sf nss.pc "${pkgdir}/usr/lib32/pkgconfig/mozilla-nss.pc"
- chmod 644 ${pkgdir}/usr/lib32/pkgconfig/*.pc
-
- for file in libsoftokn3.so libfreebl3.so libnss3.so libnssutil3.so \
- libssl3.so libsmime3.so libnssckbi.so libnssdbm3.so
- do
- install -m755 mozilla/dist/*.OBJ/lib/${file} "${pkgdir}/usr/lib32/"
- done
-
- install -m644 mozilla/dist/*.OBJ/lib/libcrmf.a "${pkgdir}/usr/lib32/"
- install -m644 mozilla/dist/*.OBJ/lib/*.chk "${pkgdir}/usr/lib32/"
-
-}
diff --git a/multilib/lib32-nss/add_spi+cacert_ca_certs.patch b/multilib/lib32-nss/add_spi+cacert_ca_certs.patch
deleted file mode 100644
index 0af0deab7..000000000
--- a/multilib/lib32-nss/add_spi+cacert_ca_certs.patch
+++ /dev/null
@@ -1,1150 +0,0 @@
-## 95_add_spi+cacert_ca_certs.patch by martin f. krafft <madduck@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Adds the SPI Inc. and CAcert.org CA certificates
-
-Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.c
-===================================================================
---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-12 12:29:13.000000000 +0200
-+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-08-12 12:29:29.056420467 +0200
-@@ -1045,6 +1045,24 @@
- static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = {
- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
- };
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = {
-+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
-+};
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = {
-+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
-+};
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_330 [] = {
-+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
-+};
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_331 [] = {
-+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
-+};
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_332 [] = {
-+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
-+};
-+static const CK_ATTRIBUTE_TYPE nss_builtins_types_333 [] = {
-+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
-+};
- #ifdef DEBUG
- static const NSSItem nss_builtins_items_0 [] = {
- { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-@@ -21910,6 +21928,531 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
-+static const NSSItem nss_builtins_items_328 [] = {
-+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 },
-+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
-+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
-+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
-+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
-+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
-+"\100\143\141\143\145\162\164\056\157\162\147"
-+, (PRUint32)123 },
-+ { (void *)"0", (PRUint32)2 },
-+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
-+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
-+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
-+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
-+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
-+"\100\143\141\143\145\162\164\056\157\162\147"
-+, (PRUint32)123 },
-+ { (void *)"\002\001\000"
-+, (PRUint32)3 },
-+ { (void *)"\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000"
-+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
-+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
-+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
-+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
-+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
-+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
-+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
-+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063"
-+"\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060"
-+"\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016"
-+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
-+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
-+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
-+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
-+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
-+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
-+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
-+"\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
-+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
-+"\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007"
-+"\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002"
-+"\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011"
-+"\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315"
-+"\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230"
-+"\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272"
-+"\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016"
-+"\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052"
-+"\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262"
-+"\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140"
-+"\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150"
-+"\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273"
-+"\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022"
-+"\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234"
-+"\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334"
-+"\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070"
-+"\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232"
-+"\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044"
-+"\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355"
-+"\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252"
-+"\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352"
-+"\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276"
-+"\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306"
-+"\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320"
-+"\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167"
-+"\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335"
-+"\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324"
-+"\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246"
-+"\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106"
-+"\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272"
-+"\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334"
-+"\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304"
-+"\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060"
-+"\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265"
-+"\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071"
-+"\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230"
-+"\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260"
-+"\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016"
-+"\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036"
-+"\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057"
-+"\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042"
-+"\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164"
-+"\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151"
-+"\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011"
-+"\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162"
-+"\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001"
-+"\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037"
-+"\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160"
-+"\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157"
-+"\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006"
-+"\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164"
-+"\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060"
-+"\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045"
-+"\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162"
-+"\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077"
-+"\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102"
-+"\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165"
-+"\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164"
-+"\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040"
-+"\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167"
-+"\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006"
-+"\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001"
-+"\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201"
-+"\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275"
-+"\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234"
-+"\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323"
-+"\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073"
-+"\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140"
-+"\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353"
-+"\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160"
-+"\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334"
-+"\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231"
-+"\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116"
-+"\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145"
-+"\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031"
-+"\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363"
-+"\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330"
-+"\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367"
-+"\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260"
-+"\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223"
-+"\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335"
-+"\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026"
-+"\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005"
-+"\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361"
-+"\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371"
-+"\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246"
-+"\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206"
-+"\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153"
-+"\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344"
-+"\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143"
-+"\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362"
-+"\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226"
-+"\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175"
-+"\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305"
-+"\103"
-+, (PRUint32)1857 }
-+};
-+static const NSSItem nss_builtins_items_329 [] = {
-+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)"CAcert.org Class 1 Root CA", (PRUint32)27 },
-+ { (void *)"\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106"
-+"\166\316\217\063"
-+, (PRUint32)20 },
-+ { (void *)"\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153"
-+, (PRUint32)16 },
-+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
-+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
-+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
-+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
-+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
-+"\100\143\141\143\145\162\164\056\157\162\147"
-+, (PRUint32)123 },
-+ { (void *)"\002\001\000"
-+, (PRUint32)3 },
-+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-+};
-+static const NSSItem nss_builtins_items_330 [] = {
-+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 },
-+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-+ { (void *)"\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143"
-+"\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004"
-+"\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101"
-+"\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004"
-+"\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040"
-+"\063\040\122\157\157\164"
-+, (PRUint32)86 },
-+ { (void *)"0", (PRUint32)2 },
-+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
-+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
-+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
-+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
-+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
-+"\100\143\141\143\145\162\164\056\157\162\147"
-+, (PRUint32)123 },
-+ { (void *)"\002\001\001"
-+, (PRUint32)3 },
-+ { (void *)"\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001"
-+"\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060"
-+"\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164"
-+"\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164"
-+"\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056"
-+"\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101"
-+"\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165"
-+"\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110"
-+"\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100"
-+"\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065"
-+"\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060"
-+"\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022"
-+"\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156"
-+"\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164"
-+"\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157"
-+"\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143"
-+"\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164"
-+"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
-+"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
-+"\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335"
-+"\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175"
-+"\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163"
-+"\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144"
-+"\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001"
-+"\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171"
-+"\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313"
-+"\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011"
-+"\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353"
-+"\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277"
-+"\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331"
-+"\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205"
-+"\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073"
-+"\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161"
-+"\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371"
-+"\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047"
-+"\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252"
-+"\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102"
-+"\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064"
-+"\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133"
-+"\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242"
-+"\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137"
-+"\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325"
-+"\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150"
-+"\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230"
-+"\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140"
-+"\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347"
-+"\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321"
-+"\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206"
-+"\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257"
-+"\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164"
-+"\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373"
-+"\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003"
-+"\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006"
-+"\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006"
-+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
-+"\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162"
-+"\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034"
-+"\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162"
-+"\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003"
-+"\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001"
-+"\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002"
-+"\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101"
-+"\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160"
-+"\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206"
-+"\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241"
-+"\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072"
-+"\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135"
-+"\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253"
-+"\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364"
-+"\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172"
-+"\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302"
-+"\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214"
-+"\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074"
-+"\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154"
-+"\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025"
-+"\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352"
-+"\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231"
-+"\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213"
-+"\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325"
-+"\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242"
-+"\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214"
-+"\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027"
-+"\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057"
-+"\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224"
-+"\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134"
-+"\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356"
-+"\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005"
-+"\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355"
-+"\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143"
-+"\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123"
-+"\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243"
-+"\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005"
-+"\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156"
-+"\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317"
-+"\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360"
-+"\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101"
-+"\322\156\245\033\231\047\200\347\013\251\250\000"
-+, (PRUint32)1548 }
-+};
-+static const NSSItem nss_builtins_items_331 [] = {
-+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)"CAcert.org Class 3 Root CA", (PRUint32)27 },
-+ { (void *)"\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304"
-+"\030\116\052\055"
-+, (PRUint32)20 },
-+ { (void *)"\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266"
-+, (PRUint32)16 },
-+ { (void *)"\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157"
-+"\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150"
-+"\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164"
-+"\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103"
-+"\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101"
-+"\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164"
-+"\100\143\141\143\145\162\164\056\157\162\147"
-+, (PRUint32)123 },
-+ { (void *)"\002\001\001"
-+, (PRUint32)3 },
-+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-+};
-+static const NSSItem nss_builtins_items_332 [] = {
-+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 },
-+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
-+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
-+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
-+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
-+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
-+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
-+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
-+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
-+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
-+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
-+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
-+, (PRUint32)191 },
-+ { (void *)"0", (PRUint32)2 },
-+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
-+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
-+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
-+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
-+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
-+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
-+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
-+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
-+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
-+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
-+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
-+, (PRUint32)191 },
-+ { (void *)"\002\011\000\350\216\266\311\370\052\024\050"
-+, (PRUint32)11 },
-+ { (void *)"\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000"
-+"\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206"
-+"\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003"
-+"\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010"
-+"\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125"
-+"\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163"
-+"\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167"
-+"\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151"
-+"\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003"
-+"\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061"
-+"\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146"
-+"\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061"
-+"\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026"
-+"\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151"
-+"\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063"
-+"\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060"
-+"\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125"
-+"\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023"
-+"\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004"
-+"\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061"
-+"\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141"
-+"\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143"
-+"\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125"
-+"\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036"
-+"\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151"
-+"\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045"
-+"\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150"
-+"\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156"
-+"\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110"
-+"\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002"
-+"\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051"
-+"\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074"
-+"\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271"
-+"\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240"
-+"\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321"
-+"\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265"
-+"\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175"
-+"\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375"
-+"\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161"
-+"\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342"
-+"\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172"
-+"\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056"
-+"\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247"
-+"\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310"
-+"\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361"
-+"\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356"
-+"\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110"
-+"\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151"
-+"\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316"
-+"\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307"
-+"\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320"
-+"\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205"
-+"\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123"
-+"\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154"
-+"\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275"
-+"\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356"
-+"\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250"
-+"\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204"
-+"\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147"
-+"\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305"
-+"\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057"
-+"\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124"
-+"\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060"
-+"\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161"
-+"\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122"
-+"\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346"
-+"\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102"
-+"\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061"
-+"\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016"
-+"\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025"
-+"\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141"
-+"\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037"
-+"\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040"
-+"\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061"
-+"\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141"
-+"\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103"
-+"\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157"
-+"\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015"
-+"\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100"
-+"\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216"
-+"\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377"
-+"\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206"
-+"\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035"
-+"\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102"
-+"\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151"
-+"\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164"
-+"\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102"
-+"\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141"
-+"\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055"
-+"\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206"
-+"\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057"
-+"\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143"
-+"\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125"
-+"\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164"
-+"\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016"
-+"\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015"
-+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002"
-+"\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162"
-+"\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030"
-+"\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255"
-+"\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065"
-+"\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014"
-+"\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306"
-+"\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051"
-+"\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017"
-+"\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302"
-+"\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213"
-+"\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017"
-+"\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162"
-+"\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152"
-+"\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357"
-+"\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266"
-+"\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104"
-+"\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177"
-+"\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253"
-+"\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206"
-+"\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217"
-+"\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265"
-+"\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225"
-+"\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140"
-+"\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207"
-+"\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252"
-+"\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340"
-+"\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254"
-+"\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275"
-+"\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132"
-+"\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151"
-+"\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005"
-+"\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004"
-+"\243\140"
-+, (PRUint32)2066 }
-+};
-+static const NSSItem nss_builtins_items_333 [] = {
-+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-+ { (void *)"Software in the Public Interest, Inc. Root CA (2008)", (PRUint32)53 },
-+ { (void *)"\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044"
-+"\251\220\103\034"
-+, (PRUint32)20 },
-+ { (void *)"\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170"
-+, (PRUint32)16 },
-+ { (void *)"\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123"
-+"\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141"
-+"\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144"
-+"\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125"
-+"\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040"
-+"\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162"
-+"\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157"
-+"\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004"
-+"\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101"
-+"\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206"
-+"\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163"
-+"\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147"
-+, (PRUint32)191 },
-+ { (void *)"\002\011\000\350\216\266\311\370\052\024\050"
-+, (PRUint32)11 },
-+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+ { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
-+};
-
- builtinsInternalObject
- nss_builtins_data[] = {
-@@ -22244,11 +22787,17 @@
- { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
- { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} },
- { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} },
-- { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }
-+ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} },
-+ { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} },
-+ { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} },
-+ { 11, nss_builtins_types_330, nss_builtins_items_330, {NULL} },
-+ { 13, nss_builtins_types_331, nss_builtins_items_331, {NULL} },
-+ { 11, nss_builtins_types_332, nss_builtins_items_332, {NULL} },
-+ { 13, nss_builtins_types_333, nss_builtins_items_333, {NULL} }
- };
- const PRUint32
- #ifdef DEBUG
-- nss_builtins_nObjects = 327+1;
-+ nss_builtins_nObjects = 333+1;
- #else
-- nss_builtins_nObjects = 327;
-+ nss_builtins_nObjects = 333;
- #endif /* DEBUG */
-Index: nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt
-===================================================================
---- nss.orig/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-12 12:25:29.000000000 +0200
-+++ nss/mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-08-12 12:29:25.460425941 +0200
-@@ -22589,3 +22589,558 @@
- CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
- CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "CAcert.org Class 1 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\007\075\060\202\005\045\240\003\002\001\002\002\001\000
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\063
-+\060\063\063\060\061\062\062\071\064\071\132\027\015\063\063\060
-+\063\062\071\061\062\062\071\064\071\132\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\316\042\300\342\106\175\354\066\050\007
-+\120\226\362\240\063\100\214\113\361\073\146\077\061\345\153\002
-+\066\333\326\174\366\361\210\217\116\167\066\005\101\225\371\011
-+\360\022\317\106\206\163\140\267\156\176\350\300\130\144\256\315
-+\260\255\105\027\014\143\372\147\012\350\326\322\277\076\347\230
-+\304\360\114\372\340\003\273\065\135\154\041\336\236\040\331\272
-+\315\146\062\067\162\372\367\010\365\307\315\130\311\216\347\016
-+\136\352\076\376\034\241\024\012\025\154\206\204\133\144\146\052
-+\172\251\113\123\171\365\210\242\173\356\057\012\141\053\215\262
-+\176\115\126\245\023\354\352\332\222\236\254\104\101\036\130\140
-+\145\005\146\370\300\104\275\313\224\367\102\176\013\367\145\150
-+\230\121\005\360\363\005\221\004\035\033\027\202\354\310\127\273
-+\303\153\172\210\361\260\162\314\045\133\040\221\354\026\002\022
-+\217\062\351\027\030\110\320\307\005\056\002\060\102\270\045\234
-+\005\153\077\252\072\247\353\123\110\367\350\322\266\007\230\334
-+\033\306\064\177\177\311\034\202\172\005\130\053\010\133\363\070
-+\242\253\027\135\146\311\230\327\236\020\213\242\322\335\164\232
-+\367\161\014\162\140\337\315\157\230\063\235\226\064\166\076\044
-+\172\222\260\016\225\036\157\346\240\105\070\107\252\327\101\355
-+\112\267\022\366\327\033\203\212\017\056\330\011\266\131\327\252
-+\004\377\322\223\175\150\056\335\213\113\253\130\272\057\215\352
-+\225\247\240\303\124\211\245\373\333\213\121\042\235\262\303\276
-+\021\276\054\221\206\213\226\170\255\040\323\212\057\032\077\306
-+\320\121\145\207\041\261\031\001\145\177\105\034\207\365\174\320
-+\101\114\117\051\230\041\375\063\037\165\014\004\121\372\031\167
-+\333\324\024\034\356\201\303\035\365\230\267\151\006\221\042\335
-+\000\120\314\201\061\254\022\007\173\070\332\150\133\346\053\324
-+\176\311\137\255\350\353\162\114\363\001\345\113\040\277\232\246
-+\127\312\221\000\001\213\241\165\041\067\265\143\015\147\076\106
-+\117\160\040\147\316\305\326\131\333\002\340\360\322\313\315\272
-+\142\267\220\101\350\335\040\344\051\274\144\051\102\310\042\334
-+\170\232\377\103\354\230\033\011\121\113\132\132\302\161\361\304
-+\313\163\251\345\241\013\002\003\001\000\001\243\202\001\316\060
-+\202\001\312\060\035\006\003\125\035\016\004\026\004\024\026\265
-+\062\033\324\307\363\340\346\216\363\275\322\260\072\356\262\071
-+\030\321\060\201\243\006\003\125\035\043\004\201\233\060\201\230
-+\200\024\026\265\062\033\324\307\363\340\346\216\363\275\322\260
-+\072\356\262\071\030\321\241\175\244\173\060\171\061\020\060\016
-+\006\003\125\004\012\023\007\122\157\157\164\040\103\101\061\036
-+\060\034\006\003\125\004\013\023\025\150\164\164\160\072\057\057
-+\167\167\167\056\143\141\143\145\162\164\056\157\162\147\061\042
-+\060\040\006\003\125\004\003\023\031\103\101\040\103\145\162\164
-+\040\123\151\147\156\151\156\147\040\101\165\164\150\157\162\151
-+\164\171\061\041\060\037\006\011\052\206\110\206\367\015\001\011
-+\001\026\022\163\165\160\160\157\162\164\100\143\141\143\145\162
-+\164\056\157\162\147\202\001\000\060\017\006\003\125\035\023\001
-+\001\377\004\005\060\003\001\001\377\060\062\006\003\125\035\037
-+\004\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160
-+\163\072\057\057\167\167\167\056\143\141\143\145\162\164\056\157
-+\162\147\057\162\145\166\157\153\145\056\143\162\154\060\060\006
-+\011\140\206\110\001\206\370\102\001\004\004\043\026\041\150\164
-+\164\160\163\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\057\162\145\166\157\153\145\056\143\162\154\060
-+\064\006\011\140\206\110\001\206\370\102\001\010\004\047\026\045
-+\150\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162
-+\164\056\157\162\147\057\151\156\144\145\170\056\160\150\160\077
-+\151\144\075\061\060\060\126\006\011\140\206\110\001\206\370\102
-+\001\015\004\111\026\107\124\157\040\147\145\164\040\171\157\165
-+\162\040\157\167\156\040\143\145\162\164\151\146\151\143\141\164
-+\145\040\146\157\162\040\106\122\105\105\040\150\145\141\144\040
-+\157\166\145\162\040\164\157\040\150\164\164\160\072\057\057\167
-+\167\167\056\143\141\143\145\162\164\056\157\162\147\060\015\006
-+\011\052\206\110\206\367\015\001\001\004\005\000\003\202\002\001
-+\000\050\307\356\234\202\002\272\134\200\022\312\065\012\035\201
-+\157\211\152\231\314\362\150\017\177\247\341\215\130\225\076\275
-+\362\006\303\220\132\254\265\140\366\231\103\001\243\210\160\234
-+\235\142\235\244\207\257\147\130\015\060\066\073\346\255\110\323
-+\313\164\002\206\161\076\342\053\003\150\361\064\142\100\106\073
-+\123\352\050\364\254\373\146\225\123\212\115\135\375\073\331\140
-+\327\312\171\151\073\261\145\222\246\306\201\202\134\234\315\353
-+\115\001\212\245\337\021\125\252\025\312\037\067\300\202\230\160
-+\141\333\152\174\226\243\216\056\124\076\117\041\251\220\357\334
-+\202\277\334\350\105\255\115\220\163\010\074\224\145\260\004\231
-+\166\177\342\274\302\152\025\252\227\004\067\044\330\036\224\116
-+\155\016\121\276\326\304\217\312\226\155\367\103\337\350\060\145
-+\047\073\173\273\103\103\143\304\103\367\262\354\150\314\341\031
-+\216\042\373\230\341\173\132\076\001\067\073\213\010\260\242\363
-+\225\116\032\313\233\315\232\261\333\262\160\360\055\112\333\330
-+\260\343\157\105\110\063\022\377\376\074\062\052\124\367\304\367
-+\212\360\210\043\302\107\376\144\172\161\300\321\036\246\143\260
-+\007\176\244\057\323\001\217\334\237\053\266\306\010\251\017\223
-+\110\045\374\022\375\237\102\334\363\304\076\366\127\260\327\335
-+\151\321\006\167\064\012\113\322\312\240\377\034\306\214\311\026
-+\276\304\314\062\067\150\163\137\010\373\121\367\111\123\066\005
-+\012\225\002\114\362\171\032\020\366\330\072\165\234\363\035\361
-+\242\015\160\147\206\033\263\026\365\057\345\244\353\171\206\371
-+\075\013\302\163\013\245\231\254\157\374\147\270\345\057\013\246
-+\030\044\215\173\321\110\065\051\030\100\254\223\140\341\226\206
-+\120\264\172\131\330\217\041\013\237\317\202\221\306\073\277\153
-+\334\007\221\271\227\126\043\252\266\154\224\306\110\006\074\344
-+\316\116\252\344\366\057\011\334\123\157\056\374\164\353\072\143
-+\231\302\246\254\211\274\247\262\104\240\015\212\020\343\154\362
-+\044\313\372\233\237\160\107\056\336\024\213\324\262\040\011\226
-+\242\144\361\044\034\334\241\065\234\025\262\324\274\125\056\175
-+\006\365\234\016\125\364\132\326\223\332\166\255\045\163\114\305
-+\103
-+END
-+
-+# Trust for Certificate "CAcert.org Class 1 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 1 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\023\134\354\066\364\234\270\351\073\032\262\160\315\200\210\106
-+\166\316\217\063
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\246\033\067\136\071\015\234\066\124\356\275\040\061\106\037\153
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\000
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "CAcert.org Class 3 Root CA"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\124\061\024\060\022\006\003\125\004\012\023\013\103\101\143
-+\145\162\164\040\111\156\143\056\061\036\060\034\006\003\125\004
-+\013\023\025\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\061\034\060\032\006\003\125\004
-+\003\023\023\103\101\143\145\162\164\040\103\154\141\163\163\040
-+\063\040\122\157\157\164
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\006\010\060\202\003\360\240\003\002\001\002\002\001\001
-+\060\015\006\011\052\206\110\206\367\015\001\001\004\005\000\060
-+\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157\164
-+\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150\164
-+\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164\056
-+\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103\101
-+\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101\165
-+\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206\110
-+\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164\100
-+\143\141\143\145\162\164\056\157\162\147\060\036\027\015\060\065
-+\061\060\061\064\060\067\063\066\065\065\132\027\015\063\063\060
-+\063\062\070\060\067\063\066\065\065\132\060\124\061\024\060\022
-+\006\003\125\004\012\023\013\103\101\143\145\162\164\040\111\156
-+\143\056\061\036\060\034\006\003\125\004\013\023\025\150\164\164
-+\160\072\057\057\167\167\167\056\103\101\143\145\162\164\056\157
-+\162\147\061\034\060\032\006\003\125\004\003\023\023\103\101\143
-+\145\162\164\040\103\154\141\163\163\040\063\040\122\157\157\164
-+\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
-+\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
-+\000\253\111\065\021\110\174\322\046\176\123\224\317\103\251\335
-+\050\327\102\052\213\363\207\170\031\130\174\017\236\332\211\175
-+\341\373\353\162\220\015\164\241\226\144\253\237\240\044\231\163
-+\332\342\125\166\307\027\173\365\004\254\106\270\303\276\177\144
-+\215\020\154\044\363\141\234\300\362\220\372\121\346\365\151\001
-+\143\303\017\126\342\112\102\317\342\104\214\045\050\250\305\171
-+\011\175\106\271\212\363\351\363\064\051\010\105\344\034\237\313
-+\224\004\034\201\250\024\263\230\145\304\103\354\116\202\215\011
-+\321\275\252\133\215\222\320\354\336\220\305\177\012\302\343\353
-+\346\061\132\136\164\076\227\063\131\350\303\003\075\140\063\277
-+\367\321\157\107\304\315\356\142\203\122\156\056\010\232\244\331
-+\025\030\221\246\205\222\107\260\256\110\353\155\267\041\354\205
-+\032\150\162\065\253\377\360\020\135\300\364\224\247\152\325\073
-+\222\176\114\220\005\176\223\301\054\213\244\216\142\164\025\161
-+\156\013\161\003\352\257\025\070\232\324\322\005\162\157\214\371
-+\053\353\132\162\045\371\071\106\343\162\033\076\004\303\144\047
-+\042\020\052\212\117\130\247\003\255\276\264\056\023\355\135\252
-+\110\327\325\175\324\052\173\134\372\106\004\120\344\314\016\102
-+\133\214\355\333\362\317\374\226\223\340\333\021\066\124\142\064
-+\070\217\014\140\233\073\227\126\070\255\363\322\133\213\240\133
-+\352\116\226\270\174\327\325\240\206\160\100\323\221\051\267\242
-+\074\255\365\214\273\317\032\222\212\344\064\173\300\330\154\137
-+\351\012\302\303\247\040\232\132\337\054\135\122\134\272\107\325
-+\233\357\044\050\160\070\040\057\325\177\051\300\262\101\003\150
-+\222\314\340\234\314\227\113\105\357\072\020\012\253\160\072\230
-+\225\160\255\065\261\352\205\053\244\034\200\041\061\251\256\140
-+\172\200\046\110\000\270\001\300\223\143\125\042\221\074\126\347
-+\257\333\072\045\363\217\061\124\352\046\213\201\131\371\241\321
-+\123\021\305\173\235\003\366\164\021\340\155\261\054\077\054\206
-+\221\231\161\232\246\167\213\064\140\321\024\264\054\254\235\257
-+\214\020\323\237\304\152\370\157\023\374\163\131\367\146\102\164
-+\036\212\343\370\334\322\157\230\234\313\107\230\225\100\005\373
-+\351\002\003\001\000\001\243\201\277\060\201\274\060\017\006\003
-+\125\035\023\001\001\377\004\005\060\003\001\001\377\060\135\006
-+\010\053\006\001\005\005\007\001\001\004\121\060\117\060\043\006
-+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
-+\057\057\157\143\163\160\056\103\101\143\145\162\164\056\157\162
-+\147\057\060\050\006\010\053\006\001\005\005\007\060\002\206\034
-+\150\164\164\160\072\057\057\167\167\167\056\103\101\143\145\162
-+\164\056\157\162\147\057\143\141\056\143\162\164\060\112\006\003
-+\125\035\040\004\103\060\101\060\077\006\010\053\006\001\004\001
-+\201\220\112\060\063\060\061\006\010\053\006\001\005\005\007\002
-+\001\026\045\150\164\164\160\072\057\057\167\167\167\056\103\101
-+\143\145\162\164\056\157\162\147\057\151\156\144\145\170\056\160
-+\150\160\077\151\144\075\061\060\060\015\006\011\052\206\110\206
-+\367\015\001\001\004\005\000\003\202\002\001\000\177\010\210\241
-+\332\032\120\111\332\211\373\241\010\162\363\212\367\036\304\072
-+\264\171\133\040\060\261\105\336\302\135\323\145\151\361\302\135
-+\124\124\074\205\137\271\173\102\221\302\231\375\033\121\233\253
-+\106\245\241\020\123\236\155\210\254\163\156\054\063\246\360\364
-+\236\340\165\301\076\210\105\251\341\146\103\376\126\132\321\172
-+\101\170\367\100\332\112\072\361\013\133\245\273\026\006\346\302
-+\347\223\271\205\115\227\117\261\036\070\103\200\357\233\015\214
-+\357\270\247\140\000\207\127\175\036\104\034\313\043\357\233\074
-+\231\235\257\265\051\034\105\171\026\226\115\047\155\361\034\154
-+\303\302\125\144\263\274\024\342\363\244\037\036\062\374\047\025
-+\005\317\335\056\256\076\202\141\173\360\041\020\030\366\104\352
-+\123\071\371\334\320\232\040\340\306\273\340\273\132\117\304\231
-+\310\007\275\265\275\242\333\056\142\015\102\064\101\274\377\213
-+\212\365\121\042\252\210\060\000\342\260\324\274\276\145\272\325
-+\003\127\171\233\350\334\310\115\370\120\355\221\245\122\050\242
-+\254\373\066\130\076\351\224\053\221\120\207\033\326\136\326\214
-+\314\367\017\020\014\122\116\320\026\141\345\345\012\154\277\027
-+\307\162\106\127\234\230\365\154\140\143\172\157\136\271\116\057
-+\310\271\271\273\152\205\274\230\015\355\371\076\227\204\064\224
-+\256\000\257\241\345\347\222\156\116\275\363\342\331\024\213\134
-+\322\353\001\154\240\027\245\055\020\353\234\172\112\275\275\356
-+\316\375\355\042\100\253\160\070\210\365\012\207\152\302\253\005
-+\140\311\110\005\332\123\301\336\104\167\152\263\363\074\074\355
-+\200\274\246\070\112\051\044\137\376\131\073\233\045\172\126\143
-+\000\144\271\135\244\142\175\127\066\117\255\203\357\037\222\123
-+\240\216\167\127\335\345\141\021\075\043\000\220\114\074\372\243
-+\140\223\004\243\257\065\366\016\152\217\117\112\140\247\205\005
-+\154\106\241\217\364\307\166\343\241\131\127\367\161\262\304\156
-+\024\134\155\155\101\146\337\033\223\261\324\000\303\356\313\317
-+\074\075\041\200\251\137\143\145\374\335\340\137\244\364\053\360
-+\205\161\101\324\147\045\373\032\261\227\256\326\231\202\023\101
-+\322\156\245\033\231\047\200\347\013\251\250\000
-+END
-+
-+# Trust for Certificate "CAcert.org Class 3 Root CA"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "CAcert.org Class 3 Root CA"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\333\114\102\151\007\077\351\302\243\175\211\012\134\033\030\304
-+\030\116\052\055
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\163\077\065\124\035\104\311\351\132\112\357\121\255\003\006\266
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\171\061\020\060\016\006\003\125\004\012\023\007\122\157\157
-+\164\040\103\101\061\036\060\034\006\003\125\004\013\023\025\150
-+\164\164\160\072\057\057\167\167\167\056\143\141\143\145\162\164
-+\056\157\162\147\061\042\060\040\006\003\125\004\003\023\031\103
-+\101\040\103\145\162\164\040\123\151\147\156\151\156\147\040\101
-+\165\164\150\157\162\151\164\171\061\041\060\037\006\011\052\206
-+\110\206\367\015\001\011\001\026\022\163\165\160\160\157\162\164
-+\100\143\141\143\145\162\164\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\001\001
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-+
-+#
-+# Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+#
-+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
-+CKA_SUBJECT MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_ID UTF8 "0"
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_VALUE MULTILINE_OCTAL
-+\060\202\010\016\060\202\005\366\240\003\002\001\002\002\011\000
-+\350\216\266\311\370\052\024\050\060\015\006\011\052\206\110\206
-+\367\015\001\001\005\005\000\060\201\274\061\013\060\011\006\003
-+\125\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010
-+\023\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125
-+\004\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163
-+\061\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167
-+\141\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151
-+\143\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003
-+\125\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061
-+\036\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146
-+\151\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061
-+\045\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026
-+\150\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151
-+\156\143\056\157\162\147\060\036\027\015\060\070\060\065\061\063
-+\060\070\060\067\065\066\132\027\015\061\070\060\065\061\061\060
-+\070\060\067\065\066\132\060\201\274\061\013\060\011\006\003\125
-+\004\006\023\002\125\123\061\020\060\016\006\003\125\004\010\023
-+\007\111\156\144\151\141\156\141\061\025\060\023\006\003\125\004
-+\007\023\014\111\156\144\151\141\156\141\160\157\154\151\163\061
-+\050\060\046\006\003\125\004\012\023\037\123\157\146\164\167\141
-+\162\145\040\151\156\040\164\150\145\040\120\165\142\154\151\143
-+\040\111\156\164\145\162\145\163\164\061\023\060\021\006\003\125
-+\004\013\023\012\150\157\163\164\155\141\163\164\145\162\061\036
-+\060\034\006\003\125\004\003\023\025\103\145\162\164\151\146\151
-+\143\141\164\145\040\101\165\164\150\157\162\151\164\171\061\045
-+\060\043\006\011\052\206\110\206\367\015\001\011\001\026\026\150
-+\157\163\164\155\141\163\164\145\162\100\163\160\151\055\151\156
-+\143\056\157\162\147\060\202\002\042\060\015\006\011\052\206\110
-+\206\367\015\001\001\001\005\000\003\202\002\017\000\060\202\002
-+\012\002\202\002\001\000\334\066\346\107\102\302\304\121\165\051
-+\207\100\303\330\216\041\006\322\030\116\353\357\040\275\220\074
-+\205\020\023\214\051\133\224\143\366\364\055\361\006\102\221\271
-+\031\304\102\151\010\277\213\066\105\352\050\005\063\111\110\240
-+\047\103\223\065\212\101\330\170\263\360\357\263\156\055\335\321
-+\313\175\352\364\165\046\323\076\220\072\356\327\347\054\004\265
-+\174\341\365\174\305\116\357\167\275\134\242\223\063\222\316\175
-+\201\110\317\153\265\042\054\010\203\375\323\325\317\073\055\375
-+\265\111\220\133\366\255\115\023\312\336\323\246\235\123\121\161
-+\143\106\370\112\026\134\230\356\055\155\232\026\241\166\220\342
-+\140\103\231\326\211\326\154\056\172\230\262\013\003\054\343\172
-+\117\307\335\343\314\343\112\152\215\171\122\372\364\301\257\056
-+\217\052\010\313\033\051\202\222\162\103\274\316\210\251\252\247
-+\212\121\103\125\205\232\067\003\170\223\310\360\275\264\101\310
-+\007\102\232\313\065\227\172\212\201\145\336\035\124\010\001\361
-+\144\134\267\027\032\121\274\036\303\131\207\166\030\026\230\356
-+\277\366\147\201\213\006\065\305\113\155\131\031\307\322\306\110
-+\276\156\024\050\203\112\020\234\033\365\157\274\251\216\365\151
-+\376\262\301\125\314\347\024\311\371\133\024\123\121\007\352\316
-+\075\344\117\050\037\074\141\011\327\063\322\156\247\156\324\307
-+\023\011\157\153\135\024\356\235\211\033\245\152\362\366\370\320
-+\162\216\352\162\037\057\064\152\051\012\305\012\354\034\100\205
-+\022\367\246\245\323\117\255\300\205\214\114\174\163\040\314\123
-+\030\361\262\130\114\001\365\277\352\144\325\134\071\305\316\154
-+\314\123\132\126\272\101\017\045\337\153\120\266\307\212\240\275
-+\002\302\305\073\125\245\262\144\042\204\121\050\126\256\061\356
-+\136\373\013\026\115\106\005\221\200\104\355\254\155\360\127\250
-+\372\353\141\110\240\313\033\263\037\216\315\305\041\167\003\204
-+\036\374\254\243\103\010\143\214\355\371\047\357\264\260\135\147
-+\326\117\355\320\213\076\135\133\311\221\275\226\002\204\075\305
-+\115\274\102\077\164\375\074\135\254\134\110\066\136\207\061\057
-+\030\154\304\150\356\241\213\311\131\320\030\343\000\200\263\124
-+\047\056\231\360\025\123\002\003\001\000\001\243\202\002\017\060
-+\202\002\013\060\035\006\003\125\035\016\004\026\004\024\064\161
-+\321\070\327\025\066\203\107\153\327\067\144\102\073\216\215\122
-+\235\253\060\201\361\006\003\125\035\043\004\201\351\060\201\346
-+\200\024\064\161\321\070\327\025\066\203\107\153\327\067\144\102
-+\073\216\215\122\235\253\241\201\302\244\201\277\060\201\274\061
-+\013\060\011\006\003\125\004\006\023\002\125\123\061\020\060\016
-+\006\003\125\004\010\023\007\111\156\144\151\141\156\141\061\025
-+\060\023\006\003\125\004\007\023\014\111\156\144\151\141\156\141
-+\160\157\154\151\163\061\050\060\046\006\003\125\004\012\023\037
-+\123\157\146\164\167\141\162\145\040\151\156\040\164\150\145\040
-+\120\165\142\154\151\143\040\111\156\164\145\162\145\163\164\061
-+\023\060\021\006\003\125\004\013\023\012\150\157\163\164\155\141
-+\163\164\145\162\061\036\060\034\006\003\125\004\003\023\025\103
-+\145\162\164\151\146\151\143\141\164\145\040\101\165\164\150\157
-+\162\151\164\171\061\045\060\043\006\011\052\206\110\206\367\015
-+\001\011\001\026\026\150\157\163\164\155\141\163\164\145\162\100
-+\163\160\151\055\151\156\143\056\157\162\147\202\011\000\350\216
-+\266\311\370\052\024\050\060\017\006\003\125\035\023\001\001\377
-+\004\005\060\003\001\001\377\060\021\006\011\140\206\110\001\206
-+\370\102\001\001\004\004\003\002\000\007\060\011\006\003\125\035
-+\022\004\002\060\000\060\056\006\011\140\206\110\001\206\370\102
-+\001\015\004\041\026\037\123\157\146\164\167\141\162\145\040\151
-+\156\040\164\150\145\040\120\165\142\154\151\143\040\111\156\164
-+\145\162\145\163\164\060\060\006\011\140\206\110\001\206\370\102
-+\001\004\004\043\026\041\150\164\164\160\163\072\057\057\143\141
-+\056\163\160\151\055\151\156\143\056\157\162\147\057\143\141\055
-+\143\162\154\056\160\145\155\060\062\006\011\140\206\110\001\206
-+\370\102\001\003\004\045\026\043\150\164\164\160\163\072\057\057
-+\143\141\056\163\160\151\055\151\156\143\056\157\162\147\057\143
-+\145\162\164\055\143\162\154\056\160\145\155\060\041\006\003\125
-+\035\021\004\032\060\030\201\026\150\157\163\164\155\141\163\164
-+\145\162\100\163\160\151\055\151\156\143\056\157\162\147\060\016
-+\006\003\125\035\017\001\001\377\004\004\003\002\001\006\060\015
-+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\202\002
-+\001\000\264\315\275\340\271\352\262\003\053\176\062\351\336\162
-+\077\311\113\202\136\235\342\257\125\011\242\014\124\350\317\030
-+\074\050\040\035\251\273\003\002\057\122\071\042\371\027\317\255
-+\147\220\263\003\177\330\025\343\153\176\273\233\126\001\257\065
-+\324\332\271\307\147\027\233\324\325\016\067\263\040\101\056\014
-+\001\304\133\371\145\076\302\141\350\322\360\152\225\160\303\306
-+\157\325\065\244\254\131\162\341\211\337\241\240\235\044\275\051
-+\171\351\141\052\331\323\036\311\106\244\010\170\101\222\162\017
-+\253\024\165\355\011\360\242\360\134\357\303\012\142\040\267\302
-+\050\146\256\114\057\056\217\105\143\046\226\360\356\061\346\213
-+\125\233\252\072\371\202\071\035\210\074\342\007\165\032\341\017
-+\261\060\274\161\062\322\072\376\372\241\211\363\103\054\326\162
-+\304\171\247\025\110\005\300\330\055\162\002\343\313\075\026\152
-+\272\311\270\021\020\342\111\205\314\226\107\140\005\045\056\357
-+\165\131\063\365\107\031\026\357\332\154\137\007\310\246\120\266
-+\035\313\146\064\045\374\146\203\353\305\266\060\101\370\106\104
-+\142\250\301\014\124\346\352\114\132\050\346\256\306\267\376\177
-+\073\226\250\056\356\307\150\076\335\000\075\051\257\052\143\253
-+\137\356\111\052\055\305\334\373\321\306\323\321\227\126\122\206
-+\266\224\353\324\140\121\267\374\036\233\314\002\233\324\037\217
-+\371\112\217\266\056\050\073\027\314\305\246\005\343\322\323\265
-+\306\003\311\341\110\102\233\313\077\344\027\340\376\015\001\225
-+\011\272\270\015\161\344\011\160\167\102\330\115\341\102\251\140
-+\203\327\027\211\103\322\324\335\247\030\266\253\324\044\045\207
-+\265\324\342\374\056\042\151\275\255\150\054\377\162\265\230\252
-+\006\234\347\052\152\270\241\223\166\316\260\363\177\234\341\340
-+\117\270\330\206\106\245\063\002\054\045\141\067\052\222\310\254
-+\201\164\150\143\207\063\166\275\005\177\136\325\325\002\155\275
-+\257\377\052\132\252\111\354\230\171\107\123\221\366\016\064\132
-+\311\245\306\353\262\343\305\254\266\240\160\065\273\310\121\151
-+\320\362\265\242\062\156\274\077\240\067\071\174\161\066\246\005
-+\337\014\022\344\026\247\305\326\313\143\243\225\160\077\346\004
-+\243\140
-+END
-+
-+# Trust for Certificate "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
-+CKA_TOKEN CK_BBOOL CK_TRUE
-+CKA_PRIVATE CK_BBOOL CK_FALSE
-+CKA_MODIFIABLE CK_BBOOL CK_FALSE
-+CKA_LABEL UTF8 "Software in the Public Interest, Inc. Root CA (2008)"
-+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
-+\257\160\210\103\203\202\002\025\315\141\306\274\354\375\067\044
-+\251\220\103\034
-+END
-+CKA_CERT_MD5_HASH MULTILINE_OCTAL
-+\052\107\237\140\273\203\164\157\001\003\327\013\015\366\015\170
-+END
-+CKA_ISSUER MULTILINE_OCTAL
-+\060\201\274\061\013\060\011\006\003\125\004\006\023\002\125\123
-+\061\020\060\016\006\003\125\004\010\023\007\111\156\144\151\141
-+\156\141\061\025\060\023\006\003\125\004\007\023\014\111\156\144
-+\151\141\156\141\160\157\154\151\163\061\050\060\046\006\003\125
-+\004\012\023\037\123\157\146\164\167\141\162\145\040\151\156\040
-+\164\150\145\040\120\165\142\154\151\143\040\111\156\164\145\162
-+\145\163\164\061\023\060\021\006\003\125\004\013\023\012\150\157
-+\163\164\155\141\163\164\145\162\061\036\060\034\006\003\125\004
-+\003\023\025\103\145\162\164\151\146\151\143\141\164\145\040\101
-+\165\164\150\157\162\151\164\171\061\045\060\043\006\011\052\206
-+\110\206\367\015\001\011\001\026\026\150\157\163\164\155\141\163
-+\164\145\162\100\163\160\151\055\151\156\143\056\157\162\147
-+END
-+CKA_SERIAL_NUMBER MULTILINE_OCTAL
-+\002\011\000\350\216\266\311\370\052\024\050
-+END
-+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
-+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
diff --git a/multilib/lib32-nss/distrust-diginotar.patch b/multilib/lib32-nss/distrust-diginotar.patch
deleted file mode 100644
index 60c63fc68..000000000
--- a/multilib/lib32-nss/distrust-diginotar.patch
+++ /dev/null
@@ -1,1675 +0,0 @@
-Index: security/nss/lib/ckfw/builtins/certdata.c
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.c,v
-retrieving revision 1.67.2.10
-retrieving revision 1.67.2.11
-diff -u -r1.67.2.10 -r1.67.2.11
---- security/nss/lib/ckfw/builtins/certdata.c 1 Aug 2011 06:40:03 -0000 1.67.2.10
-+++ security/nss/lib/ckfw/builtins/certdata.c 30 Aug 2011 20:04:39 -0000 1.67.2.11
-@@ -35,7 +35,7 @@
- *
- * ***** END LICENSE BLOCK ***** */
- #ifdef DEBUG
--static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $";
-+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $";
- #endif /* DEBUG */
-
- #ifndef BUILTINS_H
-@@ -1039,12 +1039,6 @@
- static const CK_ATTRIBUTE_TYPE nss_builtins_types_327 [] = {
- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
- };
--static const CK_ATTRIBUTE_TYPE nss_builtins_types_328 [] = {
-- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
--};
--static const CK_ATTRIBUTE_TYPE nss_builtins_types_329 [] = {
-- CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
--};
- #ifdef DEBUG
- static const NSSItem nss_builtins_items_0 [] = {
- { (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-@@ -1053,7 +1047,7 @@
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)"CVS ID", (PRUint32)7 },
- { (void *)"NSS", (PRUint32)4 },
-- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.10 $ $Date: 2011/08/01 06:40:03 $", (PRUint32)164 }
-+ { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.11 $ $Date: 2011/08/30 20:04:39 $", (PRUint32)165 }
- };
- #endif /* DEBUG */
- static const NSSItem nss_builtins_items_1 [] = {
-@@ -12506,151 +12500,6 @@
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)"DigiNotar Root CA", (PRUint32)18 },
-- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
-- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
--"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
--"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
--"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
--"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
--"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
--"\154"
--, (PRUint32)97 },
-- { (void *)"0", (PRUint32)2 },
-- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
--"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
--"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
--"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
--"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
--"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
--"\154"
--, (PRUint32)97 },
-- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
--"\074\114"
--, (PRUint32)18 },
-- { (void *)"\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014"
--"\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060"
--"\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137"
--"\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060"
--"\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141"
--"\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151"
--"\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060"
--"\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156"
--"\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060"
--"\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132"
--"\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060"
--"\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022"
--"\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164"
--"\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147"
--"\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040"
--"\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151"
--"\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154"
--"\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001"
--"\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001"
--"\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126"
--"\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201"
--"\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300"
--"\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177"
--"\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330"
--"\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213"
--"\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337"
--"\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045"
--"\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123"
--"\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007"
--"\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043"
--"\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042"
--"\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041"
--"\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324"
--"\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313"
--"\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110"
--"\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114"
--"\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376"
--"\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344"
--"\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357"
--"\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346"
--"\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314"
--"\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351"
--"\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154"
--"\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262"
--"\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042"
--"\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077"
--"\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102"
--"\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323"
--"\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176"
--"\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147"
--"\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216"
--"\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035"
--"\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125"
--"\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125"
--"\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153"
--"\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206"
--"\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002"
--"\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004"
--"\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257"
--"\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362"
--"\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203"
--"\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302"
--"\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150"
--"\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307"
--"\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050"
--"\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350"
--"\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013"
--"\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075"
--"\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114"
--"\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313"
--"\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273"
--"\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235"
--"\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146"
--"\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160"
--"\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007"
--"\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351"
--"\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134"
--"\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045"
--"\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113"
--"\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174"
--"\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304"
--"\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012"
--"\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330"
--"\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124"
--"\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163"
--"\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056"
--"\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175"
--"\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163"
--"\262\345\214\360\206\231\270\345\305\337\204\301\267\353"
--, (PRUint32)1422 }
--};
--static const NSSItem nss_builtins_items_187 [] = {
-- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)"DigiNotar Root CA", (PRUint32)18 },
-- { (void *)"\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317"
--"\201\147\107\214"
--, (PRUint32)20 },
-- { (void *)"\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230"
--, (PRUint32)16 },
-- { (void *)"\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061"
--"\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157"
--"\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151"
--"\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061"
--"\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021"
--"\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156"
--"\154"
--, (PRUint32)97 },
-- { (void *)"\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223"
--"\074\114"
--, (PRUint32)18 },
-- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
-- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
-- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
--};
--static const NSSItem nss_builtins_items_188 [] = {
-- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
-- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)"Network Solutions Certificate Authority", (PRUint32)40 },
- { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
- { (void *)"\060\142\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
-@@ -12738,7 +12587,7 @@
- "\244\140\114\260\125\240\240\173\127\262"
- , (PRUint32)1002 }
- };
--static const NSSItem nss_builtins_items_189 [] = {
-+static const NSSItem nss_builtins_items_187 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12765,7 +12614,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_190 [] = {
-+static const NSSItem nss_builtins_items_188 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12874,7 +12723,7 @@
- "\333"
- , (PRUint32)1217 }
- };
--static const NSSItem nss_builtins_items_191 [] = {
-+static const NSSItem nss_builtins_items_189 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12902,7 +12751,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_192 [] = {
-+static const NSSItem nss_builtins_items_190 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -12976,7 +12825,7 @@
- "\334\335\363\377\035\054\072\026\127\331\222\071\326"
- , (PRUint32)653 }
- };
--static const NSSItem nss_builtins_items_193 [] = {
-+static const NSSItem nss_builtins_items_191 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13005,7 +12854,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_194 [] = {
-+static const NSSItem nss_builtins_items_192 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13097,7 +12946,7 @@
- "\321\236\164\310\166\147"
- , (PRUint32)1078 }
- };
--static const NSSItem nss_builtins_items_195 [] = {
-+static const NSSItem nss_builtins_items_193 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13122,7 +12971,7 @@
- { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_196 [] = {
-+static const NSSItem nss_builtins_items_194 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13219,7 +13068,7 @@
- "\253\205\322\140\126\132"
- , (PRUint32)1030 }
- };
--static const NSSItem nss_builtins_items_197 [] = {
-+static const NSSItem nss_builtins_items_195 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13247,7 +13096,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_198 [] = {
-+static const NSSItem nss_builtins_items_196 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13332,7 +13181,7 @@
- "\164"
- , (PRUint32)897 }
- };
--static const NSSItem nss_builtins_items_199 [] = {
-+static const NSSItem nss_builtins_items_197 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13358,7 +13207,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_200 [] = {
-+static const NSSItem nss_builtins_items_198 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13455,7 +13304,7 @@
- "\374\276\337\012\015"
- , (PRUint32)1013 }
- };
--static const NSSItem nss_builtins_items_201 [] = {
-+static const NSSItem nss_builtins_items_199 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13484,7 +13333,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_202 [] = {
-+static const NSSItem nss_builtins_items_200 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13595,7 +13444,7 @@
- "\241\361\017\033\037\075\236\004\203\335\226\331\035\072\224"
- , (PRUint32)1151 }
- };
--static const NSSItem nss_builtins_items_203 [] = {
-+static const NSSItem nss_builtins_items_201 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13627,7 +13476,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_204 [] = {
-+static const NSSItem nss_builtins_items_202 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13781,7 +13630,7 @@
- "\103\307\003\340\067\116\135\012\334\131\040\045"
- , (PRUint32)1964 }
- };
--static const NSSItem nss_builtins_items_205 [] = {
-+static const NSSItem nss_builtins_items_203 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13809,7 +13658,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_206 [] = {
-+static const NSSItem nss_builtins_items_204 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13890,7 +13739,7 @@
- "\300\226\130\057\352\273\106\327\273\344\331\056"
- , (PRUint32)940 }
- };
--static const NSSItem nss_builtins_items_207 [] = {
-+static const NSSItem nss_builtins_items_205 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -13913,7 +13762,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_208 [] = {
-+static const NSSItem nss_builtins_items_206 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14047,7 +13896,7 @@
- "\005\211\374\170\326\134\054\046\103\251"
- , (PRUint32)1642 }
- };
--static const NSSItem nss_builtins_items_209 [] = {
-+static const NSSItem nss_builtins_items_207 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14075,7 +13924,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_210 [] = {
-+static const NSSItem nss_builtins_items_208 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14180,7 +14029,7 @@
- "\334\144\047\027\214\132\267\332\164\050\315\227\344\275"
- , (PRUint32)1198 }
- };
--static const NSSItem nss_builtins_items_211 [] = {
-+static const NSSItem nss_builtins_items_209 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14207,7 +14056,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_212 [] = {
-+static const NSSItem nss_builtins_items_210 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14312,7 +14161,7 @@
- "\016\121\075\157\373\226\126\200\342\066\027\321\334\344"
- , (PRUint32)1198 }
- };
--static const NSSItem nss_builtins_items_213 [] = {
-+static const NSSItem nss_builtins_items_211 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14339,7 +14188,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_214 [] = {
-+static const NSSItem nss_builtins_items_212 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14432,7 +14281,7 @@
- "\230"
- , (PRUint32)993 }
- };
--static const NSSItem nss_builtins_items_215 [] = {
-+static const NSSItem nss_builtins_items_213 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14459,7 +14308,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_216 [] = {
-+static const NSSItem nss_builtins_items_214 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14548,7 +14397,7 @@
- "\126\144\127"
- , (PRUint32)931 }
- };
--static const NSSItem nss_builtins_items_217 [] = {
-+static const NSSItem nss_builtins_items_215 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14575,7 +14424,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_218 [] = {
-+static const NSSItem nss_builtins_items_216 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14656,7 +14505,7 @@
- "\000\147\240\161\000\202\110"
- , (PRUint32)919 }
- };
--static const NSSItem nss_builtins_items_219 [] = {
-+static const NSSItem nss_builtins_items_217 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14680,7 +14529,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_220 [] = {
-+static const NSSItem nss_builtins_items_218 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14762,7 +14611,7 @@
- "\316\145\006\056\135\322\052\123\164\136\323\156\047\236\217"
- , (PRUint32)943 }
- };
--static const NSSItem nss_builtins_items_221 [] = {
-+static const NSSItem nss_builtins_items_219 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14786,7 +14635,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_222 [] = {
-+static const NSSItem nss_builtins_items_220 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14867,7 +14716,7 @@
- "\246\210\070\316\125"
- , (PRUint32)933 }
- };
--static const NSSItem nss_builtins_items_223 [] = {
-+static const NSSItem nss_builtins_items_221 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -14890,7 +14739,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_224 [] = {
-+static const NSSItem nss_builtins_items_222 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15009,7 +14858,7 @@
- "\201\370\021\234"
- , (PRUint32)1460 }
- };
--static const NSSItem nss_builtins_items_225 [] = {
-+static const NSSItem nss_builtins_items_223 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15035,7 +14884,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_226 [] = {
-+static const NSSItem nss_builtins_items_224 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15169,7 +15018,7 @@
- "\311\234\220\332\354\251\102\074\255\266\002"
- , (PRUint32)1307 }
- };
--static const NSSItem nss_builtins_items_227 [] = {
-+static const NSSItem nss_builtins_items_225 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15207,7 +15056,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_228 [] = {
-+static const NSSItem nss_builtins_items_226 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15285,7 +15134,7 @@
- "\366\324\357\277\114\210\150"
- , (PRUint32)855 }
- };
--static const NSSItem nss_builtins_items_229 [] = {
-+static const NSSItem nss_builtins_items_227 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15309,7 +15158,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_230 [] = {
-+static const NSSItem nss_builtins_items_228 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15387,7 +15236,7 @@
- "\246\347\313\100\003\335\171"
- , (PRUint32)855 }
- };
--static const NSSItem nss_builtins_items_231 [] = {
-+static const NSSItem nss_builtins_items_229 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15411,7 +15260,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_232 [] = {
-+static const NSSItem nss_builtins_items_230 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15538,7 +15387,7 @@
- "\320\352\111\242\034\215\122\024\246\012\223"
- , (PRUint32)1515 }
- };
--static const NSSItem nss_builtins_items_233 [] = {
-+static const NSSItem nss_builtins_items_231 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15566,7 +15415,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_234 [] = {
-+static const NSSItem nss_builtins_items_232 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15640,7 +15489,7 @@
- "\366\356\260\132\116\111\104\124\130\137\102\203"
- , (PRUint32)828 }
- };
--static const NSSItem nss_builtins_items_235 [] = {
-+static const NSSItem nss_builtins_items_233 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15663,7 +15512,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_236 [] = {
-+static const NSSItem nss_builtins_items_234 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15739,7 +15588,7 @@
- "\011\333\212\101\202\236\146\233\021"
- , (PRUint32)857 }
- };
--static const NSSItem nss_builtins_items_237 [] = {
-+static const NSSItem nss_builtins_items_235 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15762,7 +15611,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_238 [] = {
-+static const NSSItem nss_builtins_items_236 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15845,7 +15694,7 @@
- "\262\033\211\124"
- , (PRUint32)932 }
- };
--static const NSSItem nss_builtins_items_239 [] = {
-+static const NSSItem nss_builtins_items_237 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15869,7 +15718,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_240 [] = {
-+static const NSSItem nss_builtins_items_238 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15969,7 +15818,7 @@
- "\021\055"
- , (PRUint32)1026 }
- };
--static const NSSItem nss_builtins_items_241 [] = {
-+static const NSSItem nss_builtins_items_239 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -15999,7 +15848,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_242 [] = {
-+static const NSSItem nss_builtins_items_240 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16073,7 +15922,7 @@
- "\367\130\077\056\162\002\127\243\217\241\024\056"
- , (PRUint32)652 }
- };
--static const NSSItem nss_builtins_items_243 [] = {
-+static const NSSItem nss_builtins_items_241 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16102,7 +15951,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_244 [] = {
-+static const NSSItem nss_builtins_items_242 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16208,7 +16057,7 @@
- "\061\324\100\032\142\064\066\077\065\001\256\254\143\240"
- , (PRUint32)1070 }
- };
--static const NSSItem nss_builtins_items_245 [] = {
-+static const NSSItem nss_builtins_items_243 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16240,7 +16089,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_246 [] = {
-+static const NSSItem nss_builtins_items_244 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16319,7 +16168,7 @@
- "\017\212"
- , (PRUint32)690 }
- };
--static const NSSItem nss_builtins_items_247 [] = {
-+static const NSSItem nss_builtins_items_245 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16349,7 +16198,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_248 [] = {
-+static const NSSItem nss_builtins_items_246 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16464,7 +16313,7 @@
- "\354\315\202\141\361\070\346\117\227\230\052\132\215"
- , (PRUint32)1213 }
- };
--static const NSSItem nss_builtins_items_249 [] = {
-+static const NSSItem nss_builtins_items_247 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16496,7 +16345,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_250 [] = {
-+static const NSSItem nss_builtins_items_248 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16594,7 +16443,7 @@
- "\055\247\330\206\052\335\056\020"
- , (PRUint32)904 }
- };
--static const NSSItem nss_builtins_items_251 [] = {
-+static const NSSItem nss_builtins_items_249 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16627,7 +16476,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_252 [] = {
-+static const NSSItem nss_builtins_items_250 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16729,7 +16578,7 @@
- "\330\316\304\143\165\077\131\107\261"
- , (PRUint32)1049 }
- };
--static const NSSItem nss_builtins_items_253 [] = {
-+static const NSSItem nss_builtins_items_251 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16759,7 +16608,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_254 [] = {
-+static const NSSItem nss_builtins_items_252 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16878,7 +16727,7 @@
- "\370\161\012\334\271\374\175\062\140\346\353\257\212\001"
- , (PRUint32)1486 }
- };
--static const NSSItem nss_builtins_items_255 [] = {
-+static const NSSItem nss_builtins_items_253 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16903,7 +16752,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_256 [] = {
-+static const NSSItem nss_builtins_items_254 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -16993,7 +16842,7 @@
- "\315\345\250"
- , (PRUint32)1043 }
- };
--static const NSSItem nss_builtins_items_257 [] = {
-+static const NSSItem nss_builtins_items_255 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17017,7 +16866,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_258 [] = {
-+static const NSSItem nss_builtins_items_256 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17122,7 +16971,7 @@
- "\115\273\306\104\333\066\313\052\234\216"
- , (PRUint32)1258 }
- };
--static const NSSItem nss_builtins_items_259 [] = {
-+static const NSSItem nss_builtins_items_257 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17147,7 +16996,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_260 [] = {
-+static const NSSItem nss_builtins_items_258 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17223,7 +17072,7 @@
- "\002\153\331\132"
- , (PRUint32)820 }
- };
--static const NSSItem nss_builtins_items_261 [] = {
-+static const NSSItem nss_builtins_items_259 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17247,7 +17096,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_262 [] = {
-+static const NSSItem nss_builtins_items_260 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17329,7 +17178,7 @@
- "\362"
- , (PRUint32)881 }
- };
--static const NSSItem nss_builtins_items_263 [] = {
-+static const NSSItem nss_builtins_items_261 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17354,7 +17203,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_264 [] = {
-+static const NSSItem nss_builtins_items_262 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17470,7 +17319,7 @@
- "\113\076\053\070\007\125\230\136\244"
- , (PRUint32)1465 }
- };
--static const NSSItem nss_builtins_items_265 [] = {
-+static const NSSItem nss_builtins_items_263 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17494,7 +17343,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_266 [] = {
-+static const NSSItem nss_builtins_items_264 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17559,7 +17408,7 @@
- "\375\166\004\333\142\273\220\152\003\331\106\065\331\370\174\133"
- , (PRUint32)576 }
- };
--static const NSSItem nss_builtins_items_267 [] = {
-+static const NSSItem nss_builtins_items_265 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17586,7 +17435,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_268 [] = {
-+static const NSSItem nss_builtins_items_266 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17651,7 +17500,7 @@
- "\054\163\031\110\151\116\153\174\145\277\017\374\160\316\210\220"
- , (PRUint32)576 }
- };
--static const NSSItem nss_builtins_items_269 [] = {
-+static const NSSItem nss_builtins_items_267 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17678,7 +17527,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_270 [] = {
-+static const NSSItem nss_builtins_items_268 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17775,7 +17624,7 @@
- "\202\042\055\172\124\253\160\303\175\042\145\202\160\226"
- , (PRUint32)1038 }
- };
--static const NSSItem nss_builtins_items_271 [] = {
-+static const NSSItem nss_builtins_items_269 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17803,7 +17652,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_272 [] = {
-+static const NSSItem nss_builtins_items_270 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17894,7 +17743,7 @@
- "\336\102\343\055\202\361\017\345\372\227"
- , (PRUint32)954 }
- };
--static const NSSItem nss_builtins_items_273 [] = {
-+static const NSSItem nss_builtins_items_271 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -17922,7 +17771,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_274 [] = {
-+static const NSSItem nss_builtins_items_272 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18001,7 +17850,7 @@
- "\130\077\137"
- , (PRUint32)867 }
- };
--static const NSSItem nss_builtins_items_275 [] = {
-+static const NSSItem nss_builtins_items_273 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18025,7 +17874,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_276 [] = {
-+static const NSSItem nss_builtins_items_274 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18118,7 +17967,7 @@
- "\045\361\224\264\146"
- , (PRUint32)997 }
- };
--static const NSSItem nss_builtins_items_277 [] = {
-+static const NSSItem nss_builtins_items_275 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18145,7 +17994,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_278 [] = {
-+static const NSSItem nss_builtins_items_276 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18269,7 +18118,7 @@
- "\156\117\022\176\012\074\235\225"
- , (PRUint32)1560 }
- };
--static const NSSItem nss_builtins_items_279 [] = {
-+static const NSSItem nss_builtins_items_277 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18294,7 +18143,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_280 [] = {
-+static const NSSItem nss_builtins_items_278 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18413,7 +18262,7 @@
- "\333\374\046\210\307"
- , (PRUint32)1525 }
- };
--static const NSSItem nss_builtins_items_281 [] = {
-+static const NSSItem nss_builtins_items_279 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18437,7 +18286,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_282 [] = {
-+static const NSSItem nss_builtins_items_280 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18593,7 +18442,7 @@
- "\167\110\320"
- , (PRUint32)1875 }
- };
--static const NSSItem nss_builtins_items_283 [] = {
-+static const NSSItem nss_builtins_items_281 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18624,7 +18473,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_284 [] = {
-+static const NSSItem nss_builtins_items_282 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18777,7 +18626,7 @@
- "\351\233\256\325\124\300\164\200\321\013\102\237\301"
- , (PRUint32)1869 }
- };
--static const NSSItem nss_builtins_items_285 [] = {
-+static const NSSItem nss_builtins_items_283 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18807,7 +18656,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_286 [] = {
-+static const NSSItem nss_builtins_items_284 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18943,7 +18792,7 @@
- "\242\355\264\324\265\145\103\267\223\106\212\323"
- , (PRUint32)1532 }
- };
--static const NSSItem nss_builtins_items_287 [] = {
-+static const NSSItem nss_builtins_items_285 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -18973,7 +18822,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_288 [] = {
-+static const NSSItem nss_builtins_items_286 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19124,7 +18973,7 @@
- "\264"
- , (PRUint32)1761 }
- };
--static const NSSItem nss_builtins_items_289 [] = {
-+static const NSSItem nss_builtins_items_287 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19154,7 +19003,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_290 [] = {
-+static const NSSItem nss_builtins_items_288 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19290,7 +19139,7 @@
- "\111\043"
- , (PRUint32)1522 }
- };
--static const NSSItem nss_builtins_items_291 [] = {
-+static const NSSItem nss_builtins_items_289 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19320,7 +19169,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_292 [] = {
-+static const NSSItem nss_builtins_items_290 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19455,7 +19304,7 @@
- "\172\244\047\023\326\117\364\151"
- , (PRUint32)1512 }
- };
--static const NSSItem nss_builtins_items_293 [] = {
-+static const NSSItem nss_builtins_items_291 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19485,7 +19334,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_294 [] = {
-+static const NSSItem nss_builtins_items_292 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19621,7 +19470,7 @@
- "\302\021\254"
- , (PRUint32)1523 }
- };
--static const NSSItem nss_builtins_items_295 [] = {
-+static const NSSItem nss_builtins_items_293 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19651,7 +19500,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_296 [] = {
-+static const NSSItem nss_builtins_items_294 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19787,7 +19636,7 @@
- "\147\024\060"
- , (PRUint32)1523 }
- };
--static const NSSItem nss_builtins_items_297 [] = {
-+static const NSSItem nss_builtins_items_295 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19817,7 +19666,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_298 [] = {
-+static const NSSItem nss_builtins_items_296 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19951,7 +19800,7 @@
- "\217\116\235\306\066\347\134\246\253\022\017\326\317"
- , (PRUint32)1501 }
- };
--static const NSSItem nss_builtins_items_299 [] = {
-+static const NSSItem nss_builtins_items_297 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -19981,7 +19830,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_300 [] = {
-+static const NSSItem nss_builtins_items_298 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20115,7 +19964,7 @@
- "\130\113\161\203\237\146\346\254\171\110\376\376\107"
- , (PRUint32)1501 }
- };
--static const NSSItem nss_builtins_items_301 [] = {
-+static const NSSItem nss_builtins_items_299 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20145,7 +19994,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_302 [] = {
-+static const NSSItem nss_builtins_items_300 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20280,7 +20129,7 @@
- "\200\246\202\254\344\154\201\106\273\122\205\040\044\370\200\352"
- , (PRUint32)1520 }
- };
--static const NSSItem nss_builtins_items_303 [] = {
-+static const NSSItem nss_builtins_items_301 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20310,7 +20159,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_304 [] = {
-+static const NSSItem nss_builtins_items_302 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20438,7 +20287,7 @@
- "\154\174\107\306\327\224\021\041\354\326\132\322\335\217\177\221"
- , (PRUint32)1392 }
- };
--static const NSSItem nss_builtins_items_305 [] = {
-+static const NSSItem nss_builtins_items_303 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20468,7 +20317,7 @@
- { (void *)&ckt_netscape_valid, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_306 [] = {
-+static const NSSItem nss_builtins_items_304 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20561,7 +20410,7 @@
- "\342\342\104\276\134\367\352\034\365"
- , (PRUint32)969 }
- };
--static const NSSItem nss_builtins_items_307 [] = {
-+static const NSSItem nss_builtins_items_305 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20589,7 +20438,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_308 [] = {
-+static const NSSItem nss_builtins_items_306 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20686,7 +20535,7 @@
- "\364"
- , (PRUint32)993 }
- };
--static const NSSItem nss_builtins_items_309 [] = {
-+static const NSSItem nss_builtins_items_307 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20715,7 +20564,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_310 [] = {
-+static const NSSItem nss_builtins_items_308 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20813,7 +20662,7 @@
- "\261\050\272"
- , (PRUint32)1011 }
- };
--static const NSSItem nss_builtins_items_311 [] = {
-+static const NSSItem nss_builtins_items_309 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20842,7 +20691,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_312 [] = {
-+static const NSSItem nss_builtins_items_310 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20919,7 +20768,7 @@
- "\007\072\027\144\265\004\265\043\041\231\012\225\073\227\174\357"
- , (PRUint32)848 }
- };
--static const NSSItem nss_builtins_items_313 [] = {
-+static const NSSItem nss_builtins_items_311 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -20943,7 +20792,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_314 [] = {
-+static const NSSItem nss_builtins_items_312 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21020,7 +20869,7 @@
- "\355\132\000\124\205\034\026\066\222\014\134\372\246\255\277\333"
- , (PRUint32)848 }
- };
--static const NSSItem nss_builtins_items_315 [] = {
-+static const NSSItem nss_builtins_items_313 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21044,7 +20893,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_316 [] = {
-+static const NSSItem nss_builtins_items_314 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21153,7 +21002,7 @@
- "\051\340\266\270\011\150\031\034\030\103"
- , (PRUint32)1354 }
- };
--static const NSSItem nss_builtins_items_317 [] = {
-+static const NSSItem nss_builtins_items_315 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21177,7 +21026,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_318 [] = {
-+static const NSSItem nss_builtins_items_316 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21234,7 +21083,7 @@
- "\214\171"
- , (PRUint32)514 }
- };
--static const NSSItem nss_builtins_items_319 [] = {
-+static const NSSItem nss_builtins_items_317 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21258,7 +21107,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_320 [] = {
-+static const NSSItem nss_builtins_items_318 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21348,7 +21197,7 @@
- "\326\267\064\365\176\316\071\232\331\070\361\121\367\117\054"
- , (PRUint32)959 }
- };
--static const NSSItem nss_builtins_items_321 [] = {
-+static const NSSItem nss_builtins_items_319 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21375,7 +21224,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_322 [] = {
-+static const NSSItem nss_builtins_items_320 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21493,7 +21342,7 @@
- "\377\276\013\166\026\136\067\067\346\330\164\227\242\231\105\171"
- , (PRUint32)1440 }
- };
--static const NSSItem nss_builtins_items_323 [] = {
-+static const NSSItem nss_builtins_items_321 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21519,7 +21368,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_324 [] = {
-+static const NSSItem nss_builtins_items_322 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21652,7 +21501,7 @@
- "\304\163\304\163\030\137\120\165\026\061\237\267\350\174\303"
- , (PRUint32)1679 }
- };
--static const NSSItem nss_builtins_items_325 [] = {
-+static const NSSItem nss_builtins_items_323 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21678,7 +21527,7 @@
- { (void *)&ckt_netscape_trusted_delegator, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_326 [] = {
-+static const NSSItem nss_builtins_items_324 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21772,7 +21621,7 @@
- "\204\232\315"
- , (PRUint32)979 }
- };
--static const NSSItem nss_builtins_items_327 [] = {
-+static const NSSItem nss_builtins_items_325 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21800,7 +21649,7 @@
- { (void *)&ckt_netscape_trust_unknown, (PRUint32)sizeof(CK_TRUST) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
- };
--static const NSSItem nss_builtins_items_328 [] = {
-+static const NSSItem nss_builtins_items_326 [] = {
- { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -21884,7 +21733,7 @@
- "\274\060\376\173\016\063\220\373\355\322\024\221\037\007\257"
- , (PRUint32)895 }
- };
--static const NSSItem nss_builtins_items_329 [] = {
-+static const NSSItem nss_builtins_items_327 [] = {
- { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
- { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
- { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
-@@ -22242,13 +22091,11 @@
- { 11, nss_builtins_types_324, nss_builtins_items_324, {NULL} },
- { 13, nss_builtins_types_325, nss_builtins_items_325, {NULL} },
- { 11, nss_builtins_types_326, nss_builtins_items_326, {NULL} },
-- { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} },
-- { 11, nss_builtins_types_328, nss_builtins_items_328, {NULL} },
-- { 13, nss_builtins_types_329, nss_builtins_items_329, {NULL} }
-+ { 13, nss_builtins_types_327, nss_builtins_items_327, {NULL} }
- };
- const PRUint32
- #ifdef DEBUG
-- nss_builtins_nObjects = 329+1;
-+ nss_builtins_nObjects = 327+1;
- #else
-- nss_builtins_nObjects = 329;
-+ nss_builtins_nObjects = 327;
- #endif /* DEBUG */
-Index: security/nss/lib/ckfw/builtins/certdata.txt
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/certdata.txt,v
-retrieving revision 1.64.2.10
-retrieving revision 1.64.2.11
-diff -u -r1.64.2.10 -r1.64.2.11
---- security/nss/lib/ckfw/builtins/certdata.txt 1 Aug 2011 06:40:04 -0000 1.64.2.10
-+++ security/nss/lib/ckfw/builtins/certdata.txt 30 Aug 2011 20:04:39 -0000 1.64.2.11
-@@ -34,7 +34,7 @@
- # the terms of any one of the MPL, the GPL or the LGPL.
- #
- # ***** END LICENSE BLOCK *****
--CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.10 $ $Date: 2011/08/01 06:40:04 $"
-+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.11 $ $Date: 2011/08/30 20:04:39 $"
-
- #
- # certdata.txt
-@@ -12461,161 +12461,6 @@
- CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
-
- #
--# Certificate "DigiNotar Root CA"
--#
--CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
--CKA_TOKEN CK_BBOOL CK_TRUE
--CKA_PRIVATE CK_BBOOL CK_FALSE
--CKA_MODIFIABLE CK_BBOOL CK_FALSE
--CKA_LABEL UTF8 "DigiNotar Root CA"
--CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
--CKA_SUBJECT MULTILINE_OCTAL
--\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
--\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
--\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
--\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
--\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
--\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
--\154
--END
--CKA_ID UTF8 "0"
--CKA_ISSUER MULTILINE_OCTAL
--\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
--\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
--\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
--\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
--\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
--\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
--\154
--END
--CKA_SERIAL_NUMBER MULTILINE_OCTAL
--\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
--\074\114
--END
--CKA_VALUE MULTILINE_OCTAL
--\060\202\005\212\060\202\003\162\240\003\002\001\002\002\020\014
--\166\332\234\221\014\116\054\236\376\025\320\130\223\074\114\060
--\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060\137
--\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022\060
--\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164\141
--\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147\151
--\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040\060
--\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151\156
--\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154\060
--\036\027\015\060\067\060\065\061\066\061\067\061\071\063\066\132
--\027\015\062\065\060\063\063\061\061\070\061\071\062\061\132\060
--\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061\022
--\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157\164
--\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151\147
--\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061\040
--\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021\151
--\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156\154
--\060\202\002\042\060\015\006\011\052\206\110\206\367\015\001\001
--\001\005\000\003\202\002\017\000\060\202\002\012\002\202\002\001
--\000\254\260\130\301\000\275\330\041\010\013\053\232\376\156\126
--\060\005\237\033\167\220\020\101\134\303\015\207\021\167\216\201
--\361\312\174\351\214\152\355\070\164\065\273\332\337\371\273\300
--\011\067\264\226\163\201\175\063\032\230\071\367\223\157\225\177
--\075\271\261\165\207\272\121\110\350\213\160\076\225\004\305\330
--\266\303\026\331\210\260\261\207\035\160\332\206\264\017\024\213
--\172\317\020\321\164\066\242\022\173\167\206\112\171\346\173\337
--\002\021\150\245\116\206\256\064\130\233\044\023\170\126\042\045
--\036\001\213\113\121\161\373\202\314\131\226\151\210\132\150\123
--\305\271\015\002\067\313\113\274\146\112\220\176\052\013\005\007
--\355\026\137\125\220\165\330\106\311\033\203\342\010\276\361\043
--\314\231\035\326\052\017\203\040\025\130\047\202\056\372\342\042
--\302\111\261\271\001\201\152\235\155\235\100\167\150\166\116\041
--\052\155\204\100\205\116\166\231\174\202\363\363\267\002\131\324
--\046\001\033\216\337\255\123\006\321\256\030\335\342\262\072\313
--\327\210\070\216\254\133\051\271\031\323\230\371\030\003\317\110
--\202\206\146\013\033\151\017\311\353\070\210\172\046\032\005\114
--\222\327\044\324\226\362\254\122\055\243\107\325\122\366\077\376
--\316\204\006\160\246\252\076\242\362\266\126\064\030\127\242\344
--\201\155\347\312\360\152\323\307\221\153\002\203\101\174\025\357
--\153\232\144\136\343\320\074\345\261\353\173\135\206\373\313\346
--\167\111\315\243\145\334\367\271\234\270\344\013\137\223\317\314
--\060\032\062\034\316\034\143\225\245\371\352\341\164\213\236\351
--\053\251\060\173\240\030\037\016\030\013\345\133\251\323\321\154
--\036\007\147\217\221\113\251\212\274\322\146\252\223\001\210\262
--\221\372\061\134\325\246\301\122\010\011\315\012\143\242\323\042
--\246\350\241\331\071\006\227\365\156\215\002\220\214\024\173\077
--\200\315\033\234\272\304\130\162\043\257\266\126\237\306\172\102
--\063\051\007\077\202\311\346\037\005\015\315\114\050\066\213\323
--\310\076\034\306\210\357\136\356\211\144\351\035\353\332\211\176
--\062\246\151\321\335\314\210\237\321\320\311\146\041\334\006\147
--\305\224\172\232\155\142\114\175\314\340\144\200\262\236\107\216
--\243\002\003\001\000\001\243\102\060\100\060\017\006\003\125\035
--\023\001\001\377\004\005\060\003\001\001\377\060\016\006\003\125
--\035\017\001\001\377\004\004\003\002\001\006\060\035\006\003\125
--\035\016\004\026\004\024\210\150\277\340\216\065\304\073\070\153
--\142\367\050\073\204\201\310\014\327\115\060\015\006\011\052\206
--\110\206\367\015\001\001\005\005\000\003\202\002\001\000\073\002
--\215\313\074\060\350\156\240\255\362\163\263\137\236\045\023\004
--\005\323\366\343\213\273\013\171\316\123\336\344\226\305\321\257
--\163\274\325\303\320\100\125\174\100\177\315\033\137\011\325\362
--\174\237\150\035\273\135\316\172\071\302\214\326\230\173\305\203
--\125\250\325\175\100\312\340\036\367\211\136\143\135\241\023\302
--\135\212\266\212\174\000\363\043\303\355\205\137\161\166\360\150
--\143\252\105\041\071\110\141\170\066\334\361\103\223\324\045\307
--\362\200\145\341\123\002\165\121\374\172\072\357\067\253\204\050
--\127\014\330\324\324\231\126\154\343\242\376\131\204\264\061\350
--\063\370\144\224\224\121\227\253\071\305\113\355\332\335\200\013
--\157\174\051\015\304\216\212\162\015\347\123\024\262\140\101\075
--\204\221\061\150\075\047\104\333\345\336\364\372\143\105\310\114
--\076\230\365\077\101\272\116\313\067\015\272\146\230\361\335\313
--\237\134\367\124\066\202\153\054\274\023\141\227\102\370\170\273
--\314\310\242\237\312\360\150\275\153\035\262\337\215\157\007\235
--\332\216\147\307\107\036\312\271\277\052\102\221\267\143\123\146
--\361\102\243\341\364\132\115\130\153\265\344\244\063\255\134\160
--\035\334\340\362\353\163\024\221\232\003\301\352\000\145\274\007
--\374\317\022\021\042\054\256\240\275\072\340\242\052\330\131\351
--\051\323\030\065\244\254\021\137\031\265\265\033\377\042\112\134
--\306\172\344\027\357\040\251\247\364\077\255\212\247\232\004\045
--\235\016\312\067\346\120\375\214\102\051\004\232\354\271\317\113
--\162\275\342\010\066\257\043\057\142\345\312\001\323\160\333\174
--\202\043\054\026\061\014\306\066\007\220\172\261\037\147\130\304
--\073\130\131\211\260\214\214\120\263\330\206\313\150\243\304\012
--\347\151\113\040\316\301\036\126\113\225\251\043\150\330\060\330
--\303\353\260\125\121\315\345\375\053\270\365\273\021\237\123\124
--\366\064\031\214\171\011\066\312\141\027\045\027\013\202\230\163
--\014\167\164\303\325\015\307\250\022\114\307\247\124\161\107\056
--\054\032\175\311\343\053\073\110\336\047\204\247\143\066\263\175
--\217\240\144\071\044\015\075\173\207\257\146\134\164\033\113\163
--\262\345\214\360\206\231\270\345\305\337\204\301\267\353
--END
--
--# Trust for Certificate "DigiNotar Root CA"
--CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
--CKA_TOKEN CK_BBOOL CK_TRUE
--CKA_PRIVATE CK_BBOOL CK_FALSE
--CKA_MODIFIABLE CK_BBOOL CK_FALSE
--CKA_LABEL UTF8 "DigiNotar Root CA"
--CKA_CERT_SHA1_HASH MULTILINE_OCTAL
--\300\140\355\104\313\330\201\275\016\370\154\013\242\207\335\317
--\201\147\107\214
--END
--CKA_CERT_MD5_HASH MULTILINE_OCTAL
--\172\171\124\115\007\222\073\133\377\101\360\016\307\071\242\230
--END
--CKA_ISSUER MULTILINE_OCTAL
--\060\137\061\013\060\011\006\003\125\004\006\023\002\116\114\061
--\022\060\020\006\003\125\004\012\023\011\104\151\147\151\116\157
--\164\141\162\061\032\060\030\006\003\125\004\003\023\021\104\151
--\147\151\116\157\164\141\162\040\122\157\157\164\040\103\101\061
--\040\060\036\006\011\052\206\110\206\367\015\001\011\001\026\021
--\151\156\146\157\100\144\151\147\151\156\157\164\141\162\056\156
--\154
--END
--CKA_SERIAL_NUMBER MULTILINE_OCTAL
--\002\020\014\166\332\234\221\014\116\054\236\376\025\320\130\223
--\074\114
--END
--CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
--CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_TRUST_UNKNOWN
--CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_TRUSTED_DELEGATOR
--CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
--
--#
- # Certificate "Network Solutions Certificate Authority"
- #
- CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
-Index: security/nss/lib/ckfw/builtins/nssckbi.h
-===================================================================
-RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/nssckbi.h,v
-retrieving revision 1.24.2.5
-retrieving revision 1.24.2.6
-diff -u -r1.24.2.5 -r1.24.2.6
---- security/nss/lib/ckfw/builtins/nssckbi.h 1 Aug 2011 06:40:04 -0000 1.24.2.5
-+++ security/nss/lib/ckfw/builtins/nssckbi.h 30 Aug 2011 20:04:40 -0000 1.24.2.6
-@@ -77,8 +77,8 @@
- * of the comment in the CK_VERSION type definition.
- */
- #define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
--#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 84
--#define NSS_BUILTINS_LIBRARY_VERSION "1.84"
-+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 85
-+#define NSS_BUILTINS_LIBRARY_VERSION "1.85"
-
- /* These version numbers detail the semantic changes to the ckfw engine. */
- #define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
diff --git a/multilib/lib32-nss/nss-no-rpath.patch b/multilib/lib32-nss/nss-no-rpath.patch
deleted file mode 100644
index 35ea57315..000000000
--- a/multilib/lib32-nss/nss-no-rpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./mozilla/security/nss/cmd/platlibs.mk.withrpath 2007-02-19 07:17:06.000000000 +0100
-+++ ./mozilla/security/nss/cmd/platlibs.mk 2007-02-19 07:18:07.000000000 +0100
-@@ -52,9 +52,9 @@
-
- ifeq ($(OS_ARCH), Linux)
- ifeq ($(USE_64), 1)
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib64:$$ORIGIN/../lib'
- else
--EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
-+#EXTRA_SHARED_LIBS += -Wl,-rpath,'$$ORIGIN/../lib'
- endif
- endif
-
diff --git a/multilib/lib32-nss/nss-nolocalsql.patch b/multilib/lib32-nss/nss-nolocalsql.patch
deleted file mode 100644
index dc75a223f..000000000
--- a/multilib/lib32-nss/nss-nolocalsql.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -up ./mozilla/security/nss/lib/Makefile.nolocalsql ./mozilla/security/nss/lib/Makefile
---- ./mozilla/security/nss/lib/Makefile.nolocalsql 2010-02-27 16:40:25.891777537 -0800
-+++ ./mozilla/security/nss/lib/Makefile 2010-02-27 16:41:59.175902327 -0800
-@@ -62,11 +62,11 @@ ifndef USE_SYSTEM_ZLIB
- ZLIB_SRCDIR = zlib # Add the zlib directory to DIRS.
- endif
-
--ifndef MOZILLA_CLIENT
--ifndef NSS_USE_SYSTEM_SQLITE
--SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS.
--endif
--endif
-+#ifndef MOZILLA_CLIENT
-+#ifndef NSS_USE_SYSTEM_SQLITE
-+#SQLITE_SRCDIR = sqlite # Add the sqlite directory to DIRS.
-+#endif
-+#endif
-
- ifndef MOZILLA_CLIENT
- ifeq ($(OS_ARCH),Linux)
-diff -up ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn
---- ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn.nolocalsql 2010-02-27 16:44:24.998777709 -0800
-+++ ./mozilla/security/nss/lib/softoken/legacydb/manifest.mn 2010-02-27 16:45:08.533803472 -0800
-@@ -46,9 +46,9 @@ MAPFILE = $(OBJDIR)/nssdbm.def
-
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\"
-
--ifdef MOZILLA_CLIENT
--INCLUDES += -I$(DIST)/include/sqlite3
--endif
-+#ifdef MOZILLA_CLIENT
-+#INCLUDES += -I$(DIST)/include/sqlite3
-+#endif
-
- CSRCS = \
- dbmshim.c \
-diff -up ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql ./mozilla/security/nss/lib/softoken/manifest.mn
---- ./mozilla/security/nss/lib/softoken/manifest.mn.nolocalsql 2010-02-27 16:42:52.213902231 -0800
-+++ ./mozilla/security/nss/lib/softoken/manifest.mn 2010-02-27 16:43:34.040776788 -0800
-@@ -47,9 +47,9 @@ MAPFILE = $(OBJDIR)/softokn.def
-
- DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\"
-
--ifdef MOZILLA_CLIENT
--INCLUDES += -I$(DIST)/include/sqlite3
--endif
-+#ifdef MOZILLA_CLIENT
-+#INCLUDES += -I$(DIST)/include/sqlite3
-+#endif
-
- EXPORTS = \
- secmodt.h \
diff --git a/multilib/lib32-nss/nss.pc.in b/multilib/lib32-nss/nss.pc.in
deleted file mode 100644
index d47b9e146..000000000
--- a/multilib/lib32-nss/nss.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=%prefix%
-exec_prefix=%exec_prefix%
-libdir=%libdir%
-includedir=%includedir%
-
-Name: NSS
-Description: Network Security Services
-Version: %NSS_VERSION%
-Requires: nspr >= %NSPR_VERSION%
-Libs: -lssl3 -lsmime3 -lnss3 -lnssutil3
-Cflags: -I${includedir}
diff --git a/multilib/lib32-nss/ssl-renegotiate-transitional.patch b/multilib/lib32-nss/ssl-renegotiate-transitional.patch
deleted file mode 100644
index f457c5551..000000000
--- a/multilib/lib32-nss/ssl-renegotiate-transitional.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Enable transitional scheme for ssl renegotiation:
-
-(from mozilla/security/nss/lib/ssl/ssl.h)
-Disallow unsafe renegotiation in server sockets only, but allow clients
-to continue to renegotiate with vulnerable servers.
-This value should only be used during the transition period when few
-servers have been upgraded.
-
-diff --git a/mozilla/security/nss/lib/ssl/sslsock.c b/mozilla/security/nss/lib/ssl/sslsock.c
-index f1d1921..c074360 100644
---- a/mozilla/security/nss/lib/ssl/sslsock.c
-+++ b/mozilla/security/nss/lib/ssl/sslsock.c
-@@ -181,7 +181,7 @@ static sslOptions ssl_defaults = {
- PR_FALSE, /* noLocks */
- PR_FALSE, /* enableSessionTickets */
- PR_FALSE, /* enableDeflate */
-- 2, /* enableRenegotiation (default: requires extension) */
-+ 3, /* enableRenegotiation (default: transitional) */
- PR_FALSE, /* requireSafeNegotiation */
- };
-
diff --git a/staging/arora/PKGBUILD b/staging/arora/PKGBUILD
deleted file mode 100644
index 6ca245e39..000000000
--- a/staging/arora/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 145108 2011-12-17 04:20:31Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=arora
-pkgver=0.11.0
-pkgrel=3
-pkgdesc='Lightweight cross-platform Web browser'
-url='http://www.arora-browser.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qtwebkit' 'desktop-file-utils')
-source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- qmake PREFIX='/usr' 'CONFIG-=debug' -r
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/staging/arora/install b/staging/arora/install
deleted file mode 100644
index 6c87527e2..000000000
--- a/staging/arora/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/claws-mail-extra-plugins/PKGBUILD b/staging/claws-mail-extra-plugins/PKGBUILD
deleted file mode 100644
index 801d7403c..000000000
--- a/staging/claws-mail-extra-plugins/PKGBUILD
+++ /dev/null
@@ -1,66 +0,0 @@
-# $Id: PKGBUILD 145839 2012-01-02 19:48:20Z dreisner $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Mildred <mildred593 at online dot fr>
-
-pkgname=claws-mail-extra-plugins
-pkgver=3.8.0
-pkgrel=2
-pkgdesc="Extra plugins for claws-mail"
-url="http://www.claws-mail.org/plugins.php?branch=EXT"
-license=('GPL3')
-arch=('i686' 'x86_64')
-depends=('claws-mail>=3.8.0')
-makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
- 'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1'
- 'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
-optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
- 'perl: for perl plugin'
- 'libnotify: for notification plugin'
- 'libcanberra: for notification plugin'
- 'dbus-core: for notification plugin'
- 'libxml2: for gtkhtml2_viewer and rssyl plugins'
- 'curl: for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
- 'libarchive: for archive plugin'
- 'libytnef: for tnef_parse plugin'
- 'libwebkit: for the fancy webkit html plugin'
- 'libsoup-gnome: for the fancy webkit html plugin'
- 'python2: for python plugin'
- 'libgdata: for gdata plugin')
-conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
- 'sylpheed-claws-gtkhtml2-plugin' 'sylpheed-claws-rssyl-plugin'
- 'sylpheed-claws-extra-plugins' 'claws-tnef-plugin'
- 'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
-replaces=('sylpheed-claws-extra-plugins')
-options=('!libtool' '!strip')
-source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2)
-md5sums=('4776f6e0357a694f384349ac73b6da52')
-
-build() {
- cd "$srcdir/claws-mail-extra-plugins-$pkgver"
-
- # fix for python2
- export PYTHON="/usr/bin/python2"
-
- # fix gdata plugin build
- sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.3/configure
-
- for dir in */; do
- [[ $dir != geolocation_plugin-* ]] && (
- cd $dir
-
- ./configure --prefix=/usr --disable-static
- make
- )
- done
-}
-
-package() {
- cd "$srcdir/claws-mail-extra-plugins-$pkgver"
- for dir in */; do
- [[ $dir != geolocation_plugin-* ]] &&
- make -C $dir DESTDIR="$pkgdir" install
- done
-
- # fix fileconflict with libical, #11485
- rm -f "$pkgdir/usr/include/ical.h"
-}
diff --git a/staging/cloog/PKGBUILD b/staging/cloog/PKGBUILD
deleted file mode 100644
index 148d10d70..000000000
--- a/staging/cloog/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144977 2011-12-12 23:18:46Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=cloog
-pkgver=0.17.0
-pkgrel=1
-pkgdesc="Library that generates loops for scanning polyhedra"
-arch=('i686' 'x86_64')
-url="http://www.bastoul.net/cloog/"
-license=('GPL')
-depends=('isl' 'gmp')
-conflicts=('cloog-ppl<0.15.10-2')
-options=('!libtool')
-source=(http://www.bastoul.net/cloog/pages/download/$pkgname-$pkgver.tar.gz)
-md5sums=('8562effdf567ea94b008510bd83b6ea9')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --with-isl=system --with-gmp=system
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
- make check
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir/" install
-}
diff --git a/staging/cmake/PKGBUILD b/staging/cmake/PKGBUILD
deleted file mode 100644
index a2972c813..000000000
--- a/staging/cmake/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 145835 2012-01-02 19:34:59Z dreisner $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=cmake
-pkgver=2.8.7
-pkgrel=2
-pkgdesc="A cross-platform open-source make system"
-arch=('i686' 'x86_64')
-license=('custom')
-url="http://www.cmake.org"
-depends=('curl' 'libarchive' 'shared-mime-info')
-makedepends=('qt')
-optdepends=('qt: cmake-gui')
-install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('e1b237aeaed880f65dec9c20602452f6')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- ./bootstrap --prefix=/usr \
- --mandir=/share/man \
- --docdir=/share/doc/cmake \
- --system-libs \
- --qt-gui \
- --parallel=2
- make
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- vimpath="$pkgdir/usr/share/vim/vimfiles"
- install -Dm644 Docs/cmake-indent.vim ${vimpath}/indent/cmake-indent.vim
- install -Dm644 Docs/cmake-syntax.vim ${vimpath}/syntax/cmake-syntax.vim
- install -Dm644 Docs/cmake-mode.el ${pkgdir}/usr/share/emacs/site-lisp/cmake-mode.el
- install -Dm644 Copyright.txt ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/staging/cmake/cmake.install b/staging/cmake/cmake.install
deleted file mode 100644
index 55f6c843b..000000000
--- a/staging/cmake/cmake.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
- [[ -x usr/bin/update-desktop-database ]] && update-desktop-database -q || true
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/erlang/PKGBUILD b/staging/erlang/PKGBUILD
deleted file mode 100644
index f2860ed78..000000000
--- a/staging/erlang/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 145156 2011-12-18 09:42:26Z andyrtr $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
-
-pkgname=erlang
-pkgver=R14B04
-pkgrel=2
-pkgdesc="A small concurrent functional programming language developed by Ericsson."
-arch=(i686 x86_64)
-url="http://www.erlang.org/index.html"
-license=('custom')
-depends=('ncurses' 'glibc')
-makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa')
-optdepends=('wxgtk: for wx support' 'unixodbc: database')
-
-options=('!makeflags')
-source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz
- http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz)
-md5sums=('4b469729f103f52702bfb1fb24529dc0'
- 'f31e72518daae4007f595c0b224dd59f')
-
-# please check these deps reported by namcap when you do the next build:
-#erlang E: Dependency java-environment detected and not included (found class files usr/lib/erlang/lib/jinterface-1.5.4/priv/OtpErlang.jar, usr/lib/erlang/lib/ic-4.2.27/priv/ic.jar)
-#erlang E: Dependency mesa detected and not included (libraries ['usr/lib/libGLU.so.1'] needed in files ['usr/lib/erlang/lib/wx-0.99/priv/erl_gl.so'])
-
-
-build() {
- cd "$srcdir/otp_src_${pkgver/./-}"
- export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
- export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk)
-
- sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
-
- CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs
- make
-}
-
-package() {
- cd "$srcdir/otp_src_${pkgver/./-}"
- make INSTALL_PREFIX="$pkgdir" install
-
-# fix prefix
- cd "$pkgdir"
- for i in usr/lib/erlang/bin/erl \
- usr/lib/erlang/bin/start \
- usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \
- usr/lib/erlang/erts-${ERTSVERSION}/bin/start \
- usr/lib/erlang/releases/RELEASES ;do
- sed -i "s#$pkgdir##" $i
- done
-
-# fix symlinks
- cd "$pkgdir/usr/lib/erlang/bin"
- ln -sf ../erts-${ERTSVERSION}/bin/epmd
-
- cd "$pkgdir/usr/bin"
- for file in *; do
- ln -sfv ../lib/erlang/bin/$file
- done
-
- ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call"
-
-# install documentation
- install -d "$pkgdir/usr/share/doc/erlang"
- install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang"
- cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
-
- install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
-
-}
diff --git a/staging/freetds/PKGBUILD b/staging/freetds/PKGBUILD
deleted file mode 100644
index c91427f2c..000000000
--- a/staging/freetds/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 11362 2010-02-09 23:57:26Z dgriffiths $
-# Contributor: Aaron Malone <aaron@munge.net>
-
-pkgname=freetds
-pkgver=0.91
-pkgrel=2
-pkgdesc='Library for accessing Sybase and MS SQL Server databases'
-url='http://www.freetds.org'
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('unixodbc')
-options=('!libtool')
-backup=('etc/freetds/freetds.conf'
- 'etc/freetds/locales.conf'
- 'etc/freetds/pool.conf')
-source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b14db5823980a32f0643d1a84d3ec3ad')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/gcc/PKGBUILD b/staging/gcc/PKGBUILD
deleted file mode 100644
index c7d2789f4..000000000
--- a/staging/gcc/PKGBUILD
+++ /dev/null
@@ -1,259 +0,0 @@
-# $Id: PKGBUILD 144979 2011-12-12 23:21:41Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.6.2
-pkgrel=4
-_snapshot=4.6-20111125
-_libstdcppmanver=20110814 # Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
- gcc_pure64.patch
- gcc-hash-style-both.patch
- gcc-pr49720.patch)
-md5sums=('922b0ee688669c188d237bbd21d42d07'
- 'ce920d2550ff7e042b9f091d27764d8f'
- '4030ee1c08dd1e843c0225b772360e76'
- '4df25b623799b148a0703eaeec8fdf3f'
- 'f9d7e5b792c59175f3da3f8421447512')
-
-if [ -n "${_snapshot}" ]; then
- _basedir="${srcdir}/gcc-${_snapshot}"
-else
- _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
- cd ${_basedir}
-
- # Do not install libiberty
- sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
- # Do not run fixincludes
- sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
- if [ "${CARCH}" = "x86_64" ]; then
- patch -Np1 -i ${srcdir}/gcc_pure64.patch
- fi
- patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
- # fix compiler segfault in binutils testsuite
- patch -Np1 -i ${srcdir}/gcc-pr49720.patch
-
- echo ${pkgver} > gcc/BASE-VER
-
- cd ${srcdir}
- mkdir gcc-build && cd gcc-build
-
- ${_basedir}/configure --prefix=/usr \
- --libdir=/usr/lib --libexecdir=/usr/lib \
- --mandir=/usr/share/man --infodir=/usr/share/info \
- --with-bugurl=https://bugs.archlinux.org/ \
- --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
- --enable-shared --enable-threads=posix \
- --with-system-zlib --enable-__cxa_atexit \
- --disable-libunwind-exceptions --enable-clocale=gnu \
- --enable-gnu-unique-object --enable-linker-build-id \
- --with-ppl --enable-cloog-backend=isl \
- --enable-lto --enable-gold --enable-ld=default \
- --enable-plugin --with-plugin-ld=ld.gold \
- --disable-multilib --disable-libssp --disable-libstdcxx-pch \
- --enable-checking=release
- make
-}
-
-check() {
- cd gcc-build
-
- # increase stack size to prevent test failures
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
- ulimit -s 32768
-
- # do not abort on error as some are "expected"
- make -k check || true
- ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs()
-{
- pkgdesc="Runtime libraries shipped by GCC"
- groups=('base')
- depends=('glibc>=2.14')
- install=gcc-libs.install
-
- cd gcc-build
- make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
- for lib in libmudflap libgomp libstdc++-v3/src; do
- make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
- done
- make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
- make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=${pkgdir} install-target-libgfortran
- make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
- # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
- rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
- # remove static libraries
- find ${pkgdir} -name *.a -delete
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc()
-{
- pkgdesc="The GNU Compiler Collection - C and C++ frontends"
- depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl')
- groups=('base-devel')
- install=gcc.install
-
- cd gcc-build
-
- # unfortunately it is much, much easier to install the lot and clean-up the mess...
- make -j1 DESTDIR=${pkgdir} install
- rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
- rm $pkgdir/usr/lib/*.so*
- rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
- rm $pkgdir/usr/lib/libgfortran.spec
- rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
- rm -r $pkgdir/usr/lib/go
- rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
- rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
- rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
- rm $pkgdir/usr/share/man/man3/ffi*
-
- # many packages require these symlinks
- install -dm755 ${pkgdir}/lib
- ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
- ln -sf gcc ${pkgdir}/usr/bin/cc
- ln -sf g++ ${pkgdir}/usr/bin/c++
-
- # install gengtype for plugin support
- install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
- install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
- # POSIX conformance launcher scripts for c89 and c99
- cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
- case "$opt" in
- -ansi|-std=c89|-std=iso9899:1990) fl="";;
- -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
- case "$opt" in
- -std=c99|-std=iso9899:1999) fl="";;
- -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- chmod 755 $pkgdir/usr/bin/c{8,9}9
-
- # install the libstdc++ man pages
- install -dm755 ${pkgdir}/usr/share/man/man3
- install -m644 ${srcdir}/man/man3/* ${pkgdir}/usr/share/man/man3/
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran()
-{
- pkgdesc="Fortran front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-fortran.install
-
- cd gcc-build
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=$pkgdir install-target-libgfortran
- make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
- make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
- install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
- rm ${pkgdir}/usr/share/info/libquadmath.info
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc()
-{
- pkgdesc="Objective-C front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libobjc
- install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
- install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib/libobjc.so*
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada()
-{
- pkgdesc="Ada front-end for GCC (GNAT)"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-ada.install
-
- cd gcc-build/gcc
- make -j1 DESTDIR=$pkgdir ada.install-{common,info}
- install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go()
-{
- pkgdesc="Go front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-go.install
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libgo
- make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
- install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/staging/gcc/gcc-ada.install b/staging/gcc/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/staging/gcc/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/staging/gcc/gcc-fortran.install b/staging/gcc/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/staging/gcc/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/staging/gcc/gcc-go.install b/staging/gcc/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/staging/gcc/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/staging/gcc/gcc-hash-style-both.patch b/staging/gcc/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/staging/gcc/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
-
- #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER
-
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \
- %{O*:-O3} %{!O*:-O1} \
- %{shared:-shared} \
- %{!shared: \
---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
- %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
-
- #undef LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
- { "dynamic_linker", LINUX_DYNAMIC_LINKER }
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-
-
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
-
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
-
---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
-
---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
-
- #undef LINK_SPEC
- #define LINK_SPEC \
-- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{static:-static} \
---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
- { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
- { "link_arch", LINK_ARCH_SPEC },
-
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
- %{static:-static}} \
- "
-
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
- %{!mno-relax:%{!r:-relax}} \
- %{!shared: \
- %{!static: \
diff --git a/staging/gcc/gcc-libs.install b/staging/gcc/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/staging/gcc/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/staging/gcc/gcc-pr49720.patch b/staging/gcc/gcc-pr49720.patch
deleted file mode 100644
index 8f50c4120..000000000
--- a/staging/gcc/gcc-pr49720.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- trunk/gcc/simplify-rtx.c 2011/10/28 05:55:10 180603
-+++ trunk/gcc/simplify-rtx.c 2011/10/28 06:35:31 180604
-@@ -4352,10 +4352,20 @@
- {
- rtx x = XEXP (op0, 0);
- rtx c = XEXP (op0, 1);
-+ enum rtx_code invcode = op0code == PLUS ? MINUS : PLUS;
-+ rtx tem = simplify_gen_binary (invcode, cmp_mode, op1, c);
-
-- c = simplify_gen_binary (op0code == PLUS ? MINUS : PLUS,
-- cmp_mode, op1, c);
-- return simplify_gen_relational (code, mode, cmp_mode, x, c);
-+ /* Detect an infinite recursive condition, where we oscillate at this
-+ simplification case between:
-+ A + B == C <---> C - B == A,
-+ where A, B, and C are all constants with non-simplifiable expressions,
-+ usually SYMBOL_REFs. */
-+ if (GET_CODE (tem) == invcode
-+ && CONSTANT_P (x)
-+ && rtx_equal_p (c, XEXP (tem, 1)))
-+ return NULL_RTX;
-+
-+ return simplify_gen_relational (code, mode, cmp_mode, x, tem);
- }
-
- /* (ne:SI (zero_extract:SI FOO (const_int 1) BAR) (const_int 0))) is
diff --git a/staging/gcc/gcc.install b/staging/gcc/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/staging/gcc/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/staging/gcc/gcc_pure64.patch b/staging/gcc/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/staging/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
- When the -shared link option is used a final link is not being
- done. */
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
-
- #undef LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
-
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
-
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/staging/gvfs/PKGBUILD b/staging/gvfs/PKGBUILD
deleted file mode 100644
index 5aca1f451..000000000
--- a/staging/gvfs/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 145841 2012-01-02 19:54:43Z dreisner $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=gvfs
-pkgname=('gvfs' 'gvfs-smb' 'gvfs-afc' 'gvfs-afp' 'gvfs-gphoto2' 'gvfs-obexftp')
-pkgver=1.10.1
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('LGPL')
-makedepends=('libsoup-gnome' 'libcdio' 'fuse' 'bluez' 'smbclient' 'libgphoto2' 'libarchive' 'libgdu' 'pkgconfig' 'intltool' 'libimobiledevice' 'avahi' 'dconf')
-url="http://www.gnome.org"
-options=(!libtool)
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgbase}/${pkgver%.*}/${pkgbase}-${pkgver}.tar.xz)
-sha256sums=('cd30facee5ad6cd0fafc5337bbf7c06a0bff3936f9ff2ae31519b301efcc9288')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-static \
- --libexecdir=/usr/lib/gvfs \
- --with-bash-completion-dir=/etc/bash_completion.d
- make
-}
-
-package_gvfs() {
- pkgdesc="Userspace virtual filesystem implemented as a pluggable module for gio"
- depends=('libsoup-gnome' 'libgdu' 'libcdio' 'fuse' 'libarchive' 'avahi' 'dconf')
- optdepends=('gvfs-afc: AFC (mobile devices) support'
- 'gvfs-smb: SMB/CIFS (Windows client) support'
- 'gvfs-gphoto2: gphoto2 (PTP camera/MTP media player) support'
- 'gvfs-obexftp: ObexFTP (bluetooth) support'
- 'gvfs-afp: Apple Filing Protocol (AFP) support')
- install=gvfs.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- sed -e 's/^am__append_3/#am__append_3/' \
- -e 's/^am__append_4/#am__append_4/' \
- -i monitor/Makefile
- make DESTDIR="${pkgdir}" install
-
- cd "${pkgdir}"
- rm usr/lib/gvfs/gvfsd-{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}
- rm usr/share/gvfs/mounts/{smb,smb-browse,afc,afp,afp-browse,gphoto2,obexftp}.mount
- rm usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml
- rm usr/share/GConf/gsettings/gvfs-smb.convert
-}
-
-package_gvfs-smb() {
- pkgdesc="SMB/CIFS (Windows client) backend for gvfs"
- depends=("gvfs=${pkgver}" 'smbclient' 'libgnome-keyring')
- install=gvfs-smb.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -m755 -d "${pkgdir}/usr/lib/gvfs"
- install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
- install -m755 .libs/gvfsd-smb{,-browse} "${pkgdir}/usr/lib/gvfs/"
- install -m644 smb{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
- install -Dm644 org.gnome.system.smb.gschema.xml \
- "${pkgdir}/usr/share/glib-2.0/schemas/org.gnome.system.smb.gschema.xml"
- install -Dm644 gvfs-smb.convert \
- "${pkgdir}/usr/share/GConf/gsettings/gvfs-smb.convert"
-}
-
-package_gvfs-afc() {
- pkgdesc="AFC (mobile devices) backend for gvfs"
- depends=("gvfs=${pkgver}" 'libimobiledevice')
- install=gvfs-module.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -D .libs/gvfsd-afc "${pkgdir}/usr/lib/gvfs/gvfsd-afc"
- install -Dm644 afc.mount "${pkgdir}/usr/share/gvfs/mounts/afc.mount"
-
- cd "${srcdir}/${pkgbase}-${pkgver}/monitor/afc"
- make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-gphoto2() {
- pkgdesc="gphoto2 (PTP camera/MTP media player) backend for gvfs"
- depends=("gvfs=${pkgver}" 'dbus-core' 'libgphoto2' 'udev')
- install=gvfs-module.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -D .libs/gvfsd-gphoto2 "${pkgdir}/usr/lib/gvfs/gvfsd-gphoto2"
- install -Dm644 gphoto2.mount "${pkgdir}/usr/share/gvfs/mounts/gphoto2.mount"
-
- cd "${srcdir}/${pkgbase}-${pkgver}/monitor/gphoto2"
- make DESTDIR="${pkgdir}" install
-}
-
-package_gvfs-obexftp() {
- pkgdesc="ObexFTP (bluetooth) backend for gvfs"
- depends=("gvfs=${pkgver}" 'dbus-glib' 'bluez' 'obex-data-server')
- install=gvfs-module.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -D .libs/gvfsd-obexftp "${pkgdir}/usr/lib/gvfs/gvfsd-obexftp"
- install -Dm644 obexftp.mount "${pkgdir}/usr/share/gvfs/mounts/obexftp.mount"
-}
-
-package_gvfs-afp() {
- pkgdesc="Apple Filing Protocol (AFP) backend for gvfs"
- depends=("gvfs=${pkgver}")
- install=gvfs-module.install
- install -m755 -d "${pkgdir}/usr/lib/gvfs"
- install -m755 -d "${pkgdir}/usr/share/gvfs/mounts"
-
- cd "${srcdir}/${pkgbase}-${pkgver}/daemon"
- install -m755 .libs/gvfsd-afp{,-browse} "${pkgdir}/usr/lib/gvfs/"
- install -m644 afp{,-browse}.mount "${pkgdir}/usr/share/gvfs/mounts/"
-
-}
diff --git a/staging/gvfs/gvfs-module.install b/staging/gvfs/gvfs-module.install
deleted file mode 100644
index 09d1f11ec..000000000
--- a/staging/gvfs/gvfs-module.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
- killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
- post_install
-}
diff --git a/staging/gvfs/gvfs-smb.install b/staging/gvfs/gvfs-smb.install
deleted file mode 100644
index 0b8783c7b..000000000
--- a/staging/gvfs/gvfs-smb.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/staging/gvfs/gvfs.install b/staging/gvfs/gvfs.install
deleted file mode 100644
index 9458b1513..000000000
--- a/staging/gvfs/gvfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- usr/bin/gio-querymodules usr/lib/gio/modules
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
- killall -USR1 gvfsd >&/dev/null || :
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- usr/bin/gio-querymodules usr/lib/gio/modules
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/staging/hydrogen/PKGBUILD b/staging/hydrogen/PKGBUILD
deleted file mode 100644
index 6f497e64a..000000000
--- a/staging/hydrogen/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 145882 2012-01-03 18:42:57Z schiv $
-# Maintainer: tobias <tobias@archlinux.org>
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: K. Piche <kpiche@rogers.com>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=hydrogen
-pkgver=0.9.5
-pkgrel=2
-pkgdesc="Advanced Drum Machine"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.hydrogen-music.org/"
-depends=('libarchive' 'liblrdf' 'qt' 'jack')
-makedepends=('scons')
-#options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
- lrdf_raptor2.patch
- install.patch)
-md5sums=('e96f291d60e58f5d62fe616cee577dc0'
- '2124851e890f46158189b5fa90006d40'
- 'ce3a83a069b55e46aa532b55e803c9a5')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- export QTDIR=/usr
- patch -Np1 -i "${srcdir}/lrdf_raptor2.patch"
- # http://www.assembla.com/spaces/hydrogen/tickets/204
- patch -Np0 -i "${srcdir}/install.patch"
- scons prefix=/usr libarchive=1
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- scons DESTDIR="${pkgdir}" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/hydrogen/install.patch b/staging/hydrogen/install.patch
deleted file mode 100644
index 2e6e707a1..000000000
--- a/staging/hydrogen/install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-*** Sconstruct.org 2011-11-06 12:15:40.018119106 +0100
---- Sconstruct 2011-11-06 12:16:21.124122432 +0100
-***************
-*** 298,304 ****
-
- for N in glob.glob('./data/i18n/hydrogen.*'):
- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N))
-- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img"))
-
- #add every img in ./data/img to the install list.
- os.path.walk("./data/img/",install_images,env)
---- 298,303 ----
diff --git a/staging/hydrogen/lrdf_raptor2.patch b/staging/hydrogen/lrdf_raptor2.patch
deleted file mode 100644
index ec176b716..000000000
--- a/staging/hydrogen/lrdf_raptor2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -baur hydrogen-0.9.5.old/Sconstruct hydrogen-0.9.5/Sconstruct
---- hydrogen-0.9.5.old/Sconstruct 2011-08-11 18:00:07.889112348 +0800
-+++ hydrogen-0.9.5/Sconstruct 2011-08-11 18:00:34.945632437 +0800
-@@ -83,6 +83,7 @@
- includes.append( './' )
- includes.append( 'gui/src/' )
- includes.append( '3rdparty/install/include' )
-+ includes.append( '/usr/include/raptor2' )
-
- if sys.platform == "darwin":
- ldflags.append( '-L/opt/local/lib' )
diff --git a/staging/isl/PKGBUILD b/staging/isl/PKGBUILD
deleted file mode 100644
index 6c4dcf315..000000000
--- a/staging/isl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 144975 2011-12-12 23:17:00Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=isl
-pkgver=0.08
-pkgrel=1
-pkgdesc="Library for manipulating sets and relations of integer points bounded by linear constraints"
-arch=('i686' 'x86_64')
-url="http://www.kotnet.org/~skimo/isl/"
-license=('LGPL2.1')
-options=('!libtool')
-source=(http://www.kotnet.org/~skimo/isl/$pkgname-$pkgver.tar.bz2)
-md5sums=('ea6d534348cae97ff9b20ac5ea13d6bc')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
- make check
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make -j1 DESTDIR="$pkgdir/" install
-
- # this seems a better place for this file...
- install -dm755 $pkgdir/usr/share/gdb/auto-load/
- mv $pkgdir/usr/{lib,share/gdb/auto-load}/libisl.so.8.0.0-gdb.py
-}
diff --git a/staging/k9copy/PKGBUILD b/staging/k9copy/PKGBUILD
deleted file mode 100644
index 0c3b120ee..000000000
--- a/staging/k9copy/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 146218 2012-01-06 05:17:15Z eric $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Stefano Zamprogno <stefano.zamprogno@gmail.com>
-
-pkgname=k9copy
-pkgver=2.3.8
-pkgrel=2
-pkgdesc="A small utility which allows the copy of DVD under Linux"
-arch=('i686' 'x86_64')
-url="http://k9copy.sourceforge.net"
-license=('GPL')
-depends=('kdebase-runtime' 'libmpeg2' 'xine-lib' 'dvd+rw-tools' 'dvdauthor')
-makedepends=('automoc4' 'cmake')
-install=k9copy.install
-source=("http://downloads.sourceforge.net/project/${pkgname}/k9copy-kde4/${pkgver}/${pkgname}-${pkgver}-Source.tar.gz")
-md5sums=('584f6cc50f28befbeb0d5c1ec9476456')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}-Source"
-
- sed -i -e "s:Name=k9copy:Name=K9copy:g" k9copy.desktop k9copy_assistant.desktop
-
- cmake -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}-Source"
-
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/k9copy/k9copy.install b/staging/k9copy/k9copy.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/k9copy/k9copy.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kadu/PKGBUILD b/staging/kadu/PKGBUILD
deleted file mode 100644
index 9f3f341ab..000000000
--- a/staging/kadu/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 57137 2011-10-22 11:15:09Z bpiotrowski $
-# Maintainer: Mateusz Herych
-# Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
-
-pkgname=kadu
-pkgver=0.10.1
-pkgrel=2
-pkgdesc="A Qt-based Jabber/XMPP and Gadu-Gadu client"
-arch=('i686' 'x86_64')
-url="http://www.kadu.net/"
-license=('GPL')
-depends=('libgadu' 'libxss' 'aspell' 'phonon' 'qca-ossl' 'libidn' 'libmpdclient' 'qtwebkit')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
-source=(http://www.kadu.net/download/stable/$pkgname-$pkgver.tar.bz2)
-md5sums=('6211a9a9e02d645268cbf055892601a0')
-
-build() {
- cd $srcdir/kadu-$pkgver
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd $srcdir/kadu-$pkgver
- make DESTDIR=$pkgdir install
- rm -rf $pkgdir/usr/{lib,include}/{libgadu*,pkgconfig}
- rm -rf $pkgdir/usr/share/kadu/{HISTORY,README}
-}
diff --git a/staging/kdeaccessibility/PKGBUILD b/staging/kdeaccessibility/PKGBUILD
deleted file mode 100644
index 1ecd64674..000000000
--- a/staging/kdeaccessibility/PKGBUILD
+++ /dev/null
@@ -1,82 +0,0 @@
-# $Id: PKGBUILD 144135 2011-12-04 09:13:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeaccessibility
-pkgname=('kdeaccessibility-jovie'
- 'kdeaccessibility-kaccessible'
- 'kdeaccessibility-kmag'
- 'kdeaccessibility-kmousetool'
- 'kdeaccessibility-kmouth')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://accessibility.kde.org'
-license=('GPL' 'FDL')
-groups=('kde' 'kdeaccessibility')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'speech-dispatcher')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('03f4ac8234dcc49eb93eff3630f76e226e290fff')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeaccessibility-jovie() {
- pkgdesc='A text to speech application'
- depends=('kdebase-runtime' 'speech-dispatcher')
- replaces=('kdeaccessibility-kttsd')
- install='kdeaccessibility.install'
- cd $srcdir/build/jovie
- make DESTDIR=$pkgdir install
- cd $srcdir/build/jovie/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kaccessible() {
- pkgdesc='Provides accessibility services like focus tracking and a screenreader'
- depends=('kdebase-runtime' 'speech-dispatcher')
- install='kdeaccessibility.install'
- cd $srcdir/build/kaccessible
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmag() {
- pkgdesc='Screen Magnifier'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kmag/"
- install='kdeaccessibility.install'
- cd $srcdir/build/kmag
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kmag/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmousetool() {
- pkgdesc='Clicks the mouse for you, reducing the effects of RSI'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kmousetool/"
- install='kdeaccessibility.install'
- cd $srcdir/build/kmousetool
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kmousetool/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeaccessibility-kmouth() {
- pkgdesc='Speech Synthesizer Frontend'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kmouth/"
- install='kdeaccessibility.install'
- cd $srcdir/build/kmouth
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kmouth/doc
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeaccessibility/kdeaccessibility.install b/staging/kdeaccessibility/kdeaccessibility.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeaccessibility/kdeaccessibility.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeadmin/PKGBUILD b/staging/kdeadmin/PKGBUILD
deleted file mode 100644
index 0272df4c9..000000000
--- a/staging/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 144136 2011-12-04 09:13:46Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
- 'kdeadmin-ksystemlog'
- 'kdeadmin-kuser'
- 'kdeadmin-system-config-printer-kde')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebindings-python'
- 'system-config-printer-common')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'syslog-path.patch')
-sha1sums=('1a294315645adbbff348a380196d4300a408b70d'
- '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
- patch -p1 -i ${srcdir}/syslog-path.patch
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_strigi-analyzer=OFF \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
- make
-}
-
-package_kdeadmin-kcron() {
- pkgdesc='Configure and schedule tasks'
- depends=('kdelibs')
- cd $srcdir/build/kcron
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcron
- make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-ksystemlog() {
- pkgdesc='System log viewer tool'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/ksystemlog/"
- cd $srcdir/build/ksystemlog
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksystemlog
- make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-kuser() {
- pkgdesc='User Manager'
- depends=('kdepim-runtime')
- url="http://kde.org/applications/system/kuser/"
- install='kdeadmin.install'
- cd $srcdir/build/kuser
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kuser
- make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-system-config-printer-kde() {
- pkgdesc='Configure local and remote Printers'
- depends=('kdebindings-python' 'system-config-printer-common' 'python2-pyqt')
- url="http://kde.org/applications/system/printerapplet/"
- cd $srcdir/build/system-config-printer-kde
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find ${pkgdir} -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/kdeadmin/kdeadmin.install b/staging/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeadmin/kdeadmin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeadmin/syslog-path.patch b/staging/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/staging/kdeadmin/syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~ 2011-01-27 14:24:29.840000005 +0100
-+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h 2011-01-27 14:24:53.803333335 +0100
-@@ -39,7 +39,7 @@
- SystemConfiguration() :
- GenericLogModeConfiguration(
- QLatin1String( SYSTEM_LOG_MODE_ID ),
-- QStringList() << QLatin1String( "/var/log/syslog" ),
-+ QStringList() << QLatin1String( "/var/log/messages.log" ),
- QList<int>() << INFORMATION_LOG_LEVEL_ID
- ) {
-
diff --git a/staging/kdeartwork/PKGBUILD b/staging/kdeartwork/PKGBUILD
deleted file mode 100644
index c4f18cb90..000000000
--- a/staging/kdeartwork/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 144137 2011-12-04 09:13:49Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeartwork
-pkgname=('kdeartwork-aurorae'
- 'kdeartwork-colorschemes'
- 'kdeartwork-desktopthemes'
- 'kdeartwork-emoticons'
- 'kdeartwork-iconthemes'
- 'kdeartwork-kscreensaver'
- 'kdeartwork-sounds'
- 'kdeartwork-styles'
- 'kdeartwork-wallpapers'
- 'kdeartwork-weatherwallpapers')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeartwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'xscreensaver' 'eigen'
- 'kdebase-workspace' 'libkexiv2')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('f397f49a73273baadabcaf45cf18c4d6a3efbe44')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeartwork-aurorae() {
- pkgdesc='An Aurorae theme based on the Oxygen plasma theme'
- cd $srcdir/build/aurorae
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-colorschemes() {
- pkgdesc='KDE color schemes'
- replaces=('kdeaccessibility-colorschemes')
- cd $srcdir/build/ColorSchemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-desktopthemes() {
- pkgdesc='KDE desktop themes'
- cd $srcdir/build/desktopthemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-emoticons() {
- pkgdesc='KDE emoticons'
- cd $srcdir/build/emoticons
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-iconthemes() {
- pkgdesc='KDE icon themes'
- replaces=('kdeaccessibility-iconthemes')
- cd $srcdir/build/IconThemes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-kscreensaver() {
- pkgdesc='KDE screensaver'
- depends=('kdebase-workspace' 'libkexiv2')
- cd $srcdir/build/kscreensaver
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-sounds() {
- pkgdesc='KDE sounds'
- cd $srcdir/build/sounds
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-styles() {
- pkgdesc='KDE styles'
- depends=('kdebase-workspace')
- cd $srcdir/build/styles
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kwin-styles
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-wallpapers() {
- pkgdesc='KDE wallpapers'
- cd $srcdir/build/wallpapers
- make DESTDIR=$pkgdir install
- cd $srcdir/build/HighResolutionWallpapers
- make DESTDIR=$pkgdir install
-}
-
-package_kdeartwork-weatherwallpapers() {
- pkgdesc='KDE weather wallpapers'
- cd $srcdir/build/WeatherWallpapers
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase-konsole/PKGBUILD b/staging/kdebase-konsole/PKGBUILD
deleted file mode 100644
index ae29b2e63..000000000
--- a/staging/kdebase-konsole/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 144138 2011-12-04 09:13:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebase-konsole
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://kde.org/applications/system/konsole/'
-pkgdesc="Terminal"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.bz2")
-sha1sums=('33e1bc6f1043c9bf6186190b66b21483301eac7e')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../konsole-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebase-runtime/PKGBUILD b/staging/kdebase-runtime/PKGBUILD
deleted file mode 100644
index bd7faf78d..000000000
--- a/staging/kdebase-runtime/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 145924 2012-01-04 07:53:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-runtime
-pkgver=4.7.4
-pkgrel=3
-pkgdesc="KDE Base Runtime Environment"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'ntrack' 'smbclient' 'libssh' 'libcanberra' 'oxygen-icons'
- 'xorg-xauth' 'hicolor-icon-theme')
-makedepends=('pkg-config' 'cmake' 'automoc4' 'kdepimlibs' 'openslp' 'xine-lib')
-optdepends=('htdig: to build the search index in khelpcenter'
- 'rarian: needed by khelpcenter'
- 'gdb: drkonq crash handler')
-install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kde-runtime-${pkgver}.tar.bz2"
- 'libqzeitgeist08.patch')
-sha1sums=('bf5c266b7748cda44cc3a2fb231a2d6dde2b09f6'
- '164c9e4305029cb68a2101cfeeb76c7066c2fd39')
-
-build() {
- cd "${srcdir}"/kde-runtime-${pkgver}
- patch -p1 -i "${srcdir}"/libqzeitgeist08.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kde-runtime-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "$srcdir/build"
- make DESTDIR="$pkgdir" install
- rm -f "${pkgdir}/usr/share/icons/hicolor/index.theme"
- ln -sf /usr/lib/kde4/libexec/kdesu "${pkgdir}/usr/bin/"
-}
diff --git a/staging/kdebase-runtime/kdebase-runtime.install b/staging/kdebase-runtime/kdebase-runtime.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/kdebase-runtime/kdebase-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdebase-runtime/libqzeitgeist08.patch b/staging/kdebase-runtime/libqzeitgeist08.patch
deleted file mode 100644
index f832cd8b2..000000000
--- a/staging/kdebase-runtime/libqzeitgeist08.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- kde-runtime-4.7.2/activitymanager/CMakeLists.txt~ 2011-10-29 15:46:55.003710230 +0000
-+++ kde-runtime-4.7.2/activitymanager/CMakeLists.txt 2011-10-29 15:47:28.910716093 +0000
-@@ -21,7 +21,7 @@
- )
- endif(Nepomuk_FOUND)
-
--# Checking for QtZeitgeist
-+# Checking for QZeitgeist
- macro_optional_find_package(QZeitgeist)
-
- if (QZEITGEIST_INCLUDE_DIR)
-@@ -30,8 +30,8 @@
-
- macro_log_feature(
- QZeitgeist_FOUND
-- "QtZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE ""
-- "RECOMMENDED: Zeitgeist and QtZeitgeist is needed for resource tracking")
-+ "QZeitgeist" "Qt bindings for Zeitgeist" "http://gitorious.org/kde-zeitgeist/libqzeitgeist/" FALSE ""
-+ "RECOMMENDED: Zeitgeist and QZeitgeist is needed for resource tracking")
- if (QZeitgeist_FOUND)
- set(HAVE_QZEITGEIST 1)
- include_directories(${QZEITGEIST_INCLUDE_DIR})
---- kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp~ 2011-10-29 15:47:40.960836591 +0000
-+++ kde-runtime-4.7.2/activitymanager/ZeitgeistEventBackend.cpp 2011-10-29 15:48:57.034930073 +0000
-@@ -21,31 +21,31 @@
-
- #ifndef HAVE_QZEITGEIST
- #ifdef __GNUC__
-- #warning "No QtZeitgeist, disabling desktop events processing"
-+ #warning "No QZeitgeist, disabling desktop events processing"
- #endif
-
- #else // HAVE_QZEITGEIST
-
- #include "ZeitgeistEventBackend.h"
-
--#include <QtZeitgeist/QtZeitgeist>
--#include <QtZeitgeist/Interpretation>
--#include <QtZeitgeist/Manifestation>
-+#include <QZeitgeist/QZeitgeist>
-+#include <QZeitgeist/Interpretation>
-+#include <QZeitgeist/Manifestation>
-
- static QString eventInterpretation(Event::Type type)
- {
- switch (type) {
- case Event::Accessed:
-- return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
-+ return QZeitgeist::Interpretation::Event::ZGAccessEvent;
-
- case Event::Opened:
-- return QtZeitgeist::Interpretation::Event::ZGAccessEvent;
-+ return QZeitgeist::Interpretation::Event::ZGAccessEvent;
-
- case Event::Modified:
-- return QtZeitgeist::Interpretation::Event::ZGModifyEvent;
-+ return QZeitgeist::Interpretation::Event::ZGModifyEvent;
-
- case Event::Closed:
-- return QtZeitgeist::Interpretation::Event::ZGLeaveEvent;
-+ return QZeitgeist::Interpretation::Event::ZGLeaveEvent;
-
- }
-
-@@ -57,23 +57,23 @@
- {
- switch (reason) {
- case Event::User:
-- return QtZeitgeist::Manifestation::Event::ZGUserActivity;
-+ return QZeitgeist::Manifestation::Event::ZGUserActivity;
-
- case Event::Heuristic:
-- return QtZeitgeist::Manifestation::Event::ZGHeuristicActivity;
-+ return QZeitgeist::Manifestation::Event::ZGHeuristicActivity;
-
- case Event::Scheduled:
-- return QtZeitgeist::Manifestation::Event::ZGScheduledActivity;
-+ return QZeitgeist::Manifestation::Event::ZGScheduledActivity;
-
- case Event::System:
-- return QtZeitgeist::Manifestation::Event::ZGSystemNotification;
-+ return QZeitgeist::Manifestation::Event::ZGSystemNotification;
-
- case Event::World:
-- return QtZeitgeist::Manifestation::Event::ZGWorldActivity;
-+ return QZeitgeist::Manifestation::Event::ZGWorldActivity;
- }
-
- // shut up GCC
-- return QtZeitgeist::Manifestation::Event::ZGUserActivity;
-+ return QZeitgeist::Manifestation::Event::ZGUserActivity;
- }
-
- static QString applicationUri(const QString & application)
-@@ -84,7 +84,6 @@
-
- ZeitgeistEventBackend::ZeitgeistEventBackend()
- {
-- QtZeitgeist::init();
- }
-
- void ZeitgeistEventBackend::addEvents(const EventList & events)
diff --git a/staging/kdebase-workspace/PKGBUILD b/staging/kdebase-workspace/PKGBUILD
deleted file mode 100644
index 571af4f3a..000000000
--- a/staging/kdebase-workspace/PKGBUILD
+++ /dev/null
@@ -1,83 +0,0 @@
-# $Id: PKGBUILD 144126 2011-12-04 09:06:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdebase-workspace
-_pkgname=kde-workspace
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="KDE Base Workspace"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde')
-# note on libxdamage:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxdamage
-depends=('kdepim-runtime' 'lm_sensors' 'libraw1394' 'libqalculate'
- 'qimageblitz' 'polkit-kde' 'consolekit' 'xorg-xprop' 'libxdamage'
- 'libxklavier' 'xorg-xsetroot' 'libxcomposite' 'libxinerama'
- 'xorg-xrdb')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdebindings-python'
- 'networkmanager')
-optdepends=('kde-wallpapers: officials KDE wallapers')
-replaces=('kdmtheme' 'kde-common' 'guidance-power-manager' 'policykit-kde'
- 'kdebase-kinfocenter')
-conflicts=('kde-common' 'guidance-power-manager' 'policykit-kde'
- 'kdebase-kinfocenter')
-install="${pkgname}.install"
-backup=('usr/share/config/kdm/kdmrc'
- 'etc/pam.d/kde'
- 'etc/pam.d/kde-np'
- 'etc/pam.d/kscreensaver')
-options=('emptydirs')
-source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2"
- 'kdm-zsh-profile.patch' 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam'
- 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch')
-sha1sums=('b7810ba13f6f2a1c4783b153ad9349a1dd27b495'
- '8c2bdefb23a03b753b78d16944d03fa3939d2d99'
- '5db3a245201bd4a50e65aa2ef583cf5490e4f646'
- 'f7b38af38549242a240f1a90ab9964ca8a366129'
- '603cc79c4d2b4eae62bb5f244aeecb3a778b5516'
- '106635aa1aae51d6f0668b1853f6c49a4fe9d3d8'
- 'd7b5883f7e65c6839b1f65f94d58026673dd0226'
- 'ac7bc292c865bc1ab8c02e6341aa7aeaf1a3eeee'
- 'd509dac592bd8b310df27991b208c95b6d907514')
-
-build() {
- cd "${srcdir}"/${_pkgname}-${pkgver}
- patch -p0 -i "${srcdir}"/kdm-zsh-profile.patch
- patch -p1 -i "${srcdir}"/kdm-xinitrd.patch
- patch -p0 -i "${srcdir}"/fixpath.patch
- patch -p0 -i "${srcdir}"/terminate-server.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${_pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xmms=OFF \
- -DWITH_Googlegadgets=OFF \
- -DWITH_libgps=OFF \
- -DWITH_OpenGLES=OFF \
- -DKWIN_BUILD_WITH_OPENGLES=OFF \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- install -D -m755 "${srcdir}"/kdm "${pkgdir}"/etc/rc.d/kdm
- install -D -m644 "${srcdir}"/kde.pam "${pkgdir}"/etc/pam.d/kde
- install -D -m644 "${srcdir}"/kde-np.pam "${pkgdir}"/etc/pam.d/kde-np
- install -D -m644 "${srcdir}"/kscreensaver.pam "${pkgdir}"/etc/pam.d/kscreensaver
- install -d -m755 "${pkgdir}"/usr/share/xsessions/
- ln -sf /usr/share/apps/kdm/sessions/kde-plasma{,-safe}.desktop "${pkgdir}"/usr/share/xsessions/
- install -d -m755 "${pkgdir}"/etc/kde/{env,shutdown}
-
- install -d -g 135 -o 135 "${pkgdir}"/var/lib/kdm
-}
diff --git a/staging/kdebase-workspace/fix-powerprofiles.patch b/staging/kdebase-workspace/fix-powerprofiles.patch
deleted file mode 100644
index 309fcf3db..000000000
--- a/staging/kdebase-workspace/fix-powerprofiles.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Dario Freddi <drf@kde.org>
-Date: Tue, 04 Oct 2011 14:09:09 +0000
-Subject: Use full config when reading settings
-X-Git-Url: http://quickgit.kde.org/?p=kde-workspace.git&amp;a=commitdiff&amp;h=8d59876457387d1c72ca3626ae2d267adf100014
----
-Use full config when reading settings
-
-BUG: 267323
----
-
-
---- a/powerdevil/daemon/powerdevilcore.cpp
-+++ b/powerdevil/daemon/powerdevilcore.cpp
-@@ -88,7 +88,7 @@ void Core::onBackendReady()
- {
- kDebug() << "Backend is ready, KDE Power Management system initialized";
-
-- m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::SimpleConfig);
-+ m_profilesConfig = KSharedConfig::openConfig("powerdevil2profilesrc", KConfig::FullConfig);
-
- // Is it brand new?
- if (m_profilesConfig->groupList().isEmpty()) {
-
diff --git a/staging/kdebase-workspace/fixpath.patch b/staging/kdebase-workspace/fixpath.patch
deleted file mode 100644
index be2b8383e..000000000
--- a/staging/kdebase-workspace/fixpath.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- startkde.cmake.orig 2009-01-15 14:24:44.000000000 +0100
-+++ startkde.cmake 2009-01-15 14:33:08.000000000 +0100
-@@ -34,22 +34,6 @@
- MALLOC_CHECK_=2
- export MALLOC_CHECK_
-
--# in case we have been started with full pathname spec without being in PATH
--bindir=`echo "$0" | sed -n 's,^\(/.*\)/[^/][^/]*$,\1,p'`
--if [ -n "$bindir" ]; then
-- qbindir=`$bindir/kde4-config --qt-binaries`
-- if [ -n "$qbindir" ]; then
-- case $PATH in
-- $qbindir|$qbindir:*|*:$qbindir|*:$qbindir:*) ;;
-- *) PATH=$qbindir:$PATH; export PATH;;
-- esac
-- fi
-- case $PATH in
-- $bindir|$bindir:*|*:$bindir|*:$bindir:*) ;;
-- *) PATH=$bindir:$PATH; export PATH;;
-- esac
--fi
--
- # Boot sequence:
- #
- # kdeinit is used to fork off processes which improves memory usage
-@@ -206,7 +190,7 @@
- # For anything else (that doesn't set env vars, or that needs a window manager),
- # better use the Autostart folder.
-
--libpath=`kde4-config --path lib | tr : '\n'`
-+libpath=`kde4-config --path lib | tr : '\n'`$(echo -e '\n/etc/kde/lib/')
-
- for prefix in `echo "$libpath" | sed -n -e 's,/lib[^/]*/,/env/,p'`; do
- for file in "$prefix"*.sh; do
diff --git a/staging/kdebase-workspace/kde-np.pam b/staging/kdebase-workspace/kde-np.pam
deleted file mode 100644
index 81eeef47b..000000000
--- a/staging/kdebase-workspace/kde-np.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth required pam_nologin.so
-auth required pam_permit.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
-session required pam_limits.so \ No newline at end of file
diff --git a/staging/kdebase-workspace/kde.pam b/staging/kdebase-workspace/kde.pam
deleted file mode 100644
index 1a259390f..000000000
--- a/staging/kdebase-workspace/kde.pam
+++ /dev/null
@@ -1,7 +0,0 @@
-#%PAM-1.0
-auth required pam_unix.so
-auth required pam_nologin.so
-account required pam_unix.so
-password required pam_unix.so
-session required pam_unix.so
-session required pam_limits.so \ No newline at end of file
diff --git a/staging/kdebase-workspace/kdebase-workspace.install b/staging/kdebase-workspace/kdebase-workspace.install
deleted file mode 100644
index f7d6d305b..000000000
--- a/staging/kdebase-workspace/kdebase-workspace.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
- groupadd -g 135 kdm &>/dev/null
- useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
- chown -R 135:135 var/lib/kdm &>/dev/null
- xdg-icon-resource forceupdate --theme hicolor &>/dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- getent group kdm >/dev/null 2>&1 || groupadd -g 135 kdm &>/dev/null
- getent passwd kdm >/dev/null 2>&1 || useradd -u 135 -g kdm -d /var/lib/kdm -s /bin/false -r -M kdm &>/dev/null
- chown -R 135:135 var/lib/kdm &>/dev/null
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_remove() {
- if getent passwd kdm >/dev/null 2>&1; then
- userdel kdm
- fi
- if getent group kdm >/dev/null 2>&1; then
- groupdel kdm
- fi
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdebase-workspace/kdm b/staging/kdebase-workspace/kdm
deleted file mode 100644
index 799d58f4b..000000000
--- a/staging/kdebase-workspace/kdm
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=$(pidof -o %PPID /usr/bin/kdm)
-case "$1" in
- start)
- stat_busy "Starting KDE Desktop Manager"
- [ -z "$PID" ] && /usr/bin/kdm &>/dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon kdm
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping KDE Desktop Manager"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon kdm
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/staging/kdebase-workspace/kdm-xinitrd.patch b/staging/kdebase-workspace/kdm-xinitrd.patch
deleted file mode 100644
index f5fc0e571..000000000
--- a/staging/kdebase-workspace/kdm-xinitrd.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c~ 2011-10-04 22:11:24.787771512 +0000
-+++ kde-workspace-4.7.2/kdm/kfrontend/genkdmconf.c 2011-10-04 22:13:58.612702824 +0000
-@@ -742,6 +742,15 @@
- "[ -f /etc/xprofile ] && . /etc/xprofile\n"
- "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
- "\n"
-+"# run all system xinitrc shell scripts.\n"
-+"if [ -d /etc/X11/xinit/xinitrc.d ]; then\n"
-+" for i in /etc/X11/xinit/xinitrc.d/* ; do\n"
-+" if [ -x \"$i\" ]; then\n"
-+" . \"$i\"\n"
-+" fi\n"
-+" done\n"
-+"fi\n"
-+"\n"
- "if [ -d /etc/X11/Xresources ]; then\n"
- " for i in /etc/X11/Xresources/*; do\n"
- " [ -f $i ] && xrdb -merge $i\n"
diff --git a/staging/kdebase-workspace/kdm-zsh-profile.patch b/staging/kdebase-workspace/kdm-zsh-profile.patch
deleted file mode 100644
index 779456b39..000000000
--- a/staging/kdebase-workspace/kdm-zsh-profile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/genkdmconf.c 2008-02-13 09:40:49.000000000 +0000
-+++ kdm/kfrontend/genkdmconf.c 2008-05-16 12:47:36.000000000 +0000
-@@ -662,7 +662,7 @@
- " [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc\n"
- " zhome=${ZDOTDIR:-$HOME}\n"
- " # zshenv is always sourced automatically.\n"
--" [ -f $zdir/zprofile ] && . $zdir/zprofile\n"
-+" [ -f /etc/profile ] && . /etc/profile\n"
- " [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
- " [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
- " [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
diff --git a/staging/kdebase-workspace/kscreensaver.pam b/staging/kdebase-workspace/kscreensaver.pam
deleted file mode 100644
index b4d80c21f..000000000
--- a/staging/kdebase-workspace/kscreensaver.pam
+++ /dev/null
@@ -1 +0,0 @@
-auth required pam_unix_auth.so
diff --git a/staging/kdebase-workspace/terminate-server.patch b/staging/kdebase-workspace/terminate-server.patch
deleted file mode 100644
index 094591317..000000000
--- a/staging/kdebase-workspace/terminate-server.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/config.def 2009-08-27 10:17:39.000000000 +0200
-+++ kdm/config.def 2009-10-31 00:40:21.000000000 +0100
-@@ -1448,7 +1448,7 @@
-
- Key: TerminateServer
- Type: bool
--Default: false
-+Default: true
- User: core
- Instance: #:*/!
- Merge: xdm
diff --git a/staging/kdebase/PKGBUILD b/staging/kdebase/PKGBUILD
deleted file mode 100644
index 11f1e4fc6..000000000
--- a/staging/kdebase/PKGBUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# $Id: PKGBUILD 144127 2011-12-04 09:06:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdebase
-pkgname=('kdebase-dolphin'
- 'kdebase-kdepasswd'
- 'kdebase-kdialog'
- 'kdebase-keditbookmarks'
- 'kdebase-kfind'
- 'kdebase-konq-plugins'
- 'kdebase-konqueror'
- 'kdebase-lib'
- 'kdebase-plasma')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdebase')
-makedepends=('kdelibs' 'pkgconfig' 'cmake' 'automoc4' 'tidyhtml')
-source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.bz2")
-sha1sums=('ad4b6d8479bcf8be49b5f53ee8fdcc1b3d1106d6')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../kde-baseapps-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdebase-dolphin() {
- pkgdesc='File Manager'
- depends=('kdebase-runtime' 'kdebase-lib')
- optdepends=('kdegraphics-svgpart: thumbailers for SVG files'
- 'kdegraphics-thumbnailers: thumbnailers for graphics file'
- 'ruby: servicemenu installation')
- url="http://kde.org/applications/system/dolphin/"
- cd $srcdir/build/dolphin
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/dolphin
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdepasswd() {
- pkgdesc='Change Password'
- depends=('kdebase-runtime' 'kdebase-lib')
- cd $srcdir/build/kdepasswd
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kdepasswd
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kdialog() {
- pkgdesc='A utility for displaying dialog boxes from shell scripts'
- depends=('kdebase-runtime')
- cd $srcdir/build/kdialog
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-keditbookmarks() {
- pkgdesc='Bookmark Organizer and Editor'
- depends=('kdebase-runtime')
- cd $srcdir/build/keditbookmarks
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-kfind() {
- pkgdesc='Find Files/Folders'
- depends=('kdebase-runtime' 'kdebase-lib')
- url="http://kde.org/applications/utilities/kfind/"
- install='kdebase.install'
- cd $srcdir/build/kfind
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kfind
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konq-plugins() {
- pkgdesc='Extra plugins for Konqueror'
- depends=('kdebase-konqueror' 'tidyhtml')
- replaces=('konq-plugins')
- install='kdebase.install'
- cd $srcdir/build/konq-plugins
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-konqueror() {
- pkgdesc='KDE File Manager & Web Browser'
- depends=('kdebase-dolphin' 'kdebase-keditbookmarks')
- optdepends=('kwebkitpart: to enable webkit engine')
- url="http://kde.org/applications/internet/konqueror/"
- install='kdebase.install'
- conflicts=('kdebase-nsplugins')
- replaces=('kdebase-nsplugins')
- for i in konqueror doc/konqueror nsplugins; do
- cd $srcdir/build/${i}
- make DESTDIR=$pkgdir install
- done
-}
-
-package_kdebase-lib() {
- pkgdesc='KDE libraries for the basic desktop applications'
- groups=()
- depends=('kdelibs')
- cd $srcdir/build/lib
- make DESTDIR=$pkgdir install
-}
-
-package_kdebase-plasma() {
- pkgdesc='Display the contents of folders (User´s home folder as default)'
- depends=('kdebase-workspace' 'kdebase-lib')
- cd $srcdir/build/plasma
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdebase/kdebase.install b/staging/kdebase/kdebase.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdebase/kdebase.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdebindings-kimono/PKGBUILD b/staging/kdebindings-kimono/PKGBUILD
deleted file mode 100644
index 64ab10908..000000000
--- a/staging/kdebindings-kimono/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144139 2011-12-04 09:13:55Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-kimono
-pkgver=4.7.4
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the KDE libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qyoto' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
-sha1sums=('8f260e09bffcf74bad18a5168016d0dad5db3656')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kimono-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Soprano=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-korundum/PKGBUILD b/staging/kdebindings-korundum/PKGBUILD
deleted file mode 100644
index 97fa12662..000000000
--- a/staging/kdebindings-korundum/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144292 2011-12-04 09:44:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-korundum
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="KDE bindings for ruby"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-qtruby' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
- 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/unstable/${pkgver}/src/korundum-${pkgver}.tar.bz2")
-sha1sums=('e220dc672461aa1369e58de325f980139fcd52f6')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../korundum-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-kross/PKGBUILD b/staging/kdebindings-kross/PKGBUILD
deleted file mode 100644
index a187bb81c..000000000
--- a/staging/kdebindings-kross/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 144141 2011-12-04 09:14:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdebindings-kross
-pkgname=('kdebindings-kross-python'
-# 'kdebindings-kross-ruby'
- 'kdebindings-kross-java')
-pkgver=4.7.4
-pkgrel=1
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'openjdk6')
-source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.bz2")
-sha1sums=('416e9f25ff2050d9c5518254a7cc7d4cad22b648')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kross-interpreters-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_ruby=OFF \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
- make
-}
-
-package_kdebindings-kross-python() {
- pkgdesc="Python2 language interpreters to enable in-process scripting with Kross"
- depends=('kdelibs' 'python2')
-
- cd "${srcdir}"/build/python
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-kross-java() {
- pkgdesc="Java language interpreters to enable in-process scripting with Kross"
- depends=('kdelibs' 'openjdk6')
-
- cd "${srcdir}"/build/java
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdebindings-kross-ruby() {
- pkgdesc="Ruby language interpreters to enable in-process scripting with Kross"
- depends=('kdelibs' 'ruby')
-
- cd "${srcdir}"/build/ruby
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-perlkde/PKGBUILD b/staging/kdebindings-perlkde/PKGBUILD
deleted file mode 100644
index 927e6107d..000000000
--- a/staging/kdebindings-perlkde/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144142 2011-12-04 09:14:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlkde
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Perl bindings for the KDE libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-perlqt' 'kdebindings-smokekde')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs'
- 'kdegraphics-okular' 'kdesdk-kate')
-source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.bz2")
-sha1sums=('7116668ecd5baf55734a8349a2f0b04d0e701898')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../perlkde-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-perlqt/PKGBUILD b/staging/kdebindings-perlqt/PKGBUILD
deleted file mode 100644
index c13a644d0..000000000
--- a/staging/kdebindings-perlqt/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 144122 2011-12-04 09:06:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-perlqt
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Perl bindings for the Qt libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.bz2")
-sha1sums=('b4b3d8ce2b08af62202f5ae79fe57bde60dd9a85')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../perlqt-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-python/PKGBUILD b/staging/kdebindings-python/PKGBUILD
deleted file mode 100644
index 938795b00..000000000
--- a/staging/kdebindings-python/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 144123 2011-12-04 09:06:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-python
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="KDE bindings for Python"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdepim-runtime' 'python2-pyqt' 'qscintilla' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.bz2")
-sha1sums=('cac4b94098dba73d58fb4f7d73d7c65c306517d1')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../pykde4-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/kdebindings-qtruby/PKGBUILD b/staging/kdebindings-qtruby/PKGBUILD
deleted file mode 100644
index b2d2acce2..000000000
--- a/staging/kdebindings-qtruby/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144125 2011-12-04 09:06:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qtruby
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Qt bindings for ruby"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'ruby')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-conflicts=('kdebindings-ruby')
-source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
-sha1sums=('e49e38a59238cf6f5ec9c2d9afc06f3330369fc7')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../qtruby-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-qyoto/PKGBUILD b/staging/kdebindings-qyoto/PKGBUILD
deleted file mode 100644
index 2491e41e5..000000000
--- a/staging/kdebindings-qyoto/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144124 2011-12-04 09:06:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-qyoto
-pkgver=4.7.4
-pkgrel=1
-pkgdesc=".NET/Mono bindings for the Qt libraries"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt' 'mono')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-conflicts=('kdebindings-csharp')
-source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
-sha1sums=('8f2412a8bbb343bdb1e14c0fc6ef3681afe9d601')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../qyoto-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-smokegen/PKGBUILD b/staging/kdebindings-smokegen/PKGBUILD
deleted file mode 100644
index c853bee64..000000000
--- a/staging/kdebindings-smokegen/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 144217 2011-12-04 09:37:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokegen
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="A general purpose C++ parser with a plugin infrastructure"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.bz2"
- 'fix-crash.patch')
-sha1sums=('068d37e2404311b9caa23d78ee7fa262188a8622'
- 'b209b2b7017622fea3406c5a9636e2334566af01')
-
-build() {
- cd "${srcdir}"/smokegen-${pkgver}
- patch -p1 -i "${srcdir}"/fix-crash.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../smokegen-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-smokegen/fix-crash.patch b/staging/kdebindings-smokegen/fix-crash.patch
deleted file mode 100644
index 5864da3f3..000000000
--- a/staging/kdebindings-smokegen/fix-crash.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -up smokegen-4.7.0/parser/type_compiler.cpp.orig smokegen-4.7.0/parser/type_compiler.cpp
-diff -up smokegen-4.7.0/type_compiler.cpp.orig smokegen-4.7.0/type_compiler.cpp
---- smokegen-4.7.0/type_compiler.cpp.orig 2011-08-02 14:34:08.000000000 +0200
-+++ smokegen-4.7.0/type_compiler.cpp 2011-08-02 14:34:34.000000000 +0200
-@@ -191,6 +191,8 @@ void TypeCompiler::visitParameterDeclara
-
- void TypeCompiler::visitPtrOperator(PtrOperatorAST* node)
- {
-+ if ( ! m_session->token_stream ) return;
-+ if ( ! token_text(m_session->token_stream->kind(node->op)) ) return;
- if (token_text(m_session->token_stream->kind(node->op))[0] == '*') {
- QPair<bool, bool> cv = m_visitor->parseCv(node->cv);
- pointerDepth.append(cv.first);
diff --git a/staging/kdebindings-smokekde/PKGBUILD b/staging/kdebindings-smokekde/PKGBUILD
deleted file mode 100644
index a409f3409..000000000
--- a/staging/kdebindings-smokekde/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144121 2011-12-04 09:06:06Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokekde
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Language independent library for KDE bindings"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebindings-smokeqt')
-makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost'
- 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
-sha1sums=('c3e2bd07158c4bc6a19123d5ae8e81529b52e07b')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../smokekde-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdebindings-smokeqt/PKGBUILD b/staging/kdebindings-smokeqt/PKGBUILD
deleted file mode 100644
index 9640ce0c2..000000000
--- a/staging/kdebindings-smokeqt/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144218 2011-12-04 09:37:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdebindings-smokeqt
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Language independent library for Qt bindings"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kdebindings')
-depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'kdebindings-smokegen')
-makedepends=('cmake' 'automoc4')
-conflicts=('kdebindings-smoke')
-source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
-sha1sums=('2b1033732d166946db3096ddbf6eb9a6ddb61877')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../smokeqt-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Qwt5=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-blinken/PKGBUILD b/staging/kdeedu-blinken/PKGBUILD
deleted file mode 100644
index 0ddaf0cc8..000000000
--- a/staging/kdeedu-blinken/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144143 2011-12-04 09:14:06Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-blinken
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Memory Enhancement Game"
-url="http://kde.org/applications/education/blinken/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.bz2")
-sha1sums=('edeb024db23da00cf896bc41c6e3efa371d9867d')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../blinken-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-blinken/kdeedu-blinken.install b/staging/kdeedu-blinken/kdeedu-blinken.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-blinken/kdeedu-blinken.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-cantor/PKGBUILD b/staging/kdeedu-cantor/PKGBUILD
deleted file mode 100644
index b2ee91fbd..000000000
--- a/staging/kdeedu-cantor/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 144144 2011-12-04 09:14:09Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-cantor
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="KDE Frontend to Mathematical Software"
-url="http://kde.org/applications/education/cantor/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libspectre')
-makedepends=('cmake' 'automoc4' 'r')
-optdepends=('maxima: Maxima backend'
- 'octave: Octave backend'
- 'r: R backend')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.bz2")
-sha1sums=('da39832093c1ea6eb28c6b5b4f67cb24473d8fb5')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../cantor-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-cantor/kdeedu-cantor.install b/staging/kdeedu-cantor/kdeedu-cantor.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-cantor/kdeedu-cantor.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kalgebra/PKGBUILD b/staging/kdeedu-kalgebra/PKGBUILD
deleted file mode 100644
index 01499438f..000000000
--- a/staging/kdeedu-kalgebra/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144145 2011-12-04 09:14:12Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalgebra
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Graph Calculator"
-url="http://kde.org/applications/education/kalgebra/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.bz2")
-sha1sums=('8ef005a50316d7d86b7bc1ed306380d69ce946a0')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kalgebra-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kalgebra/kdeedu-kalgebra.install b/staging/kdeedu-kalgebra/kdeedu-kalgebra.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kalgebra/kdeedu-kalgebra.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kalzium/PKGBUILD b/staging/kdeedu-kalzium/PKGBUILD
deleted file mode 100644
index 24e1dc140..000000000
--- a/staging/kdeedu-kalzium/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144146 2011-12-04 09:14:15Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kalzium
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Periodic Table of Elements"
-url="http://kde.org/applications/education/kalzium/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdelibs' 'avogadro' 'ocaml')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.bz2")
-sha1sums=('6cb65b2c524f529976e4c63a75a7637a181d08d9')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kalzium-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kalzium/kdeedu-kalzium.install b/staging/kdeedu-kalzium/kdeedu-kalzium.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kalzium/kdeedu-kalzium.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kanagram/PKGBUILD b/staging/kdeedu-kanagram/PKGBUILD
deleted file mode 100644
index 57d9f3d11..000000000
--- a/staging/kdeedu-kanagram/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144147 2011-12-04 09:14:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kanagram
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Letter Order Game"
-url="http://kde.org/applications/education/kanagram/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.bz2")
-sha1sums=('15fda47cd6685a7e19fb4744ec930b9a4dcfbe05')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kanagram-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kanagram/kdeedu-kanagram.install b/staging/kdeedu-kanagram/kdeedu-kanagram.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kanagram/kdeedu-kanagram.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kbruch/PKGBUILD b/staging/kdeedu-kbruch/PKGBUILD
deleted file mode 100644
index 8b7afd5e5..000000000
--- a/staging/kdeedu-kbruch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144148 2011-12-04 09:14:21Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kbruch
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Exercise Fractions"
-url="http://kde.org/applications/education/kbruch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.bz2")
-sha1sums=('36165292cb9935343d1aa2572935a130b6619f00')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kbruch-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kbruch/kdeedu-kbruch.install b/staging/kdeedu-kbruch/kdeedu-kbruch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kbruch/kdeedu-kbruch.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kgeography/PKGBUILD b/staging/kdeedu-kgeography/PKGBUILD
deleted file mode 100644
index 73ea071ad..000000000
--- a/staging/kdeedu-kgeography/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144149 2011-12-04 09:14:24Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kgeography
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Geography Trainer"
-url="http://kde.org/applications/education/kgeography/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.bz2")
-sha1sums=('4a90c59928a4947c5cd970ed72e5e9cea370d8e6')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kgeography-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kgeography/kdeedu-kgeography.install b/staging/kdeedu-kgeography/kdeedu-kgeography.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kgeography/kdeedu-kgeography.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-khangman/PKGBUILD b/staging/kdeedu-khangman/PKGBUILD
deleted file mode 100644
index a2857b29a..000000000
--- a/staging/kdeedu-khangman/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144150 2011-12-04 09:14:27Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-khangman
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Hangman Game"
-url="http://kde.org/applications/education/khangman/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.bz2")
-sha1sums=('c5999ba4218cb0331b906fbcaafa7f497762221d')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../khangman-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-khangman/kdeedu-khangman.install b/staging/kdeedu-khangman/kdeedu-khangman.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-khangman/kdeedu-khangman.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD
deleted file mode 100644
index b600e7b62..000000000
--- a/staging/kdeedu-kig/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 144152 2011-12-04 09:18:02Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kig
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Interactive Geometry"
-url="http://kde.org/applications/education/kig/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.bz2")
-sha1sums=('4c76ef89e6210f2f25e719176db4d8a2b31b6222')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kig-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # Use the python2 executable
- sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' "${pkgdir}"/usr/bin/pykig.py
-}
diff --git a/staging/kdeedu-kig/kdeedu-kig.install b/staging/kdeedu-kig/kdeedu-kig.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kig/kdeedu-kig.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kiten/PKGBUILD b/staging/kdeedu-kiten/PKGBUILD
deleted file mode 100644
index 3c1406cf1..000000000
--- a/staging/kdeedu-kiten/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144153 2011-12-04 09:18:05Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kiten
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Japanese Reference/Study Tool"
-url="http://kde.org/applications/education/kiten/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.bz2")
-sha1sums=('8ec806306a7b08cb8ca5e567a48417cd2268e501')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kiten-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kiten/kdeedu-kiten.install b/staging/kdeedu-kiten/kdeedu-kiten.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kiten/kdeedu-kiten.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-klettres/PKGBUILD b/staging/kdeedu-klettres/PKGBUILD
deleted file mode 100644
index 5909a5498..000000000
--- a/staging/kdeedu-klettres/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144154 2011-12-04 09:18:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-klettres
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Learn The Alphabet"
-url="http://kde.org/applications/education/klettres/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.bz2")
-sha1sums=('d2450f7aa24fc0118dd20d2e11d61fca68ba5461')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../klettres-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-klettres/kdeedu-klettres.install b/staging/kdeedu-klettres/kdeedu-klettres.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-klettres/kdeedu-klettres.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kmplot/PKGBUILD b/staging/kdeedu-kmplot/PKGBUILD
deleted file mode 100644
index 277416ae8..000000000
--- a/staging/kdeedu-kmplot/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144155 2011-12-04 09:18:11Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kmplot
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Mathematical Function Plotter"
-url="http://kde.org/applications/education/kmplot/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.bz2")
-sha1sums=('b0b2b748e4ea0f670ffe5c9be01a6997a061a75c')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kmplot-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kmplot/kdeedu-kmplot.install b/staging/kdeedu-kmplot/kdeedu-kmplot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kmplot/kdeedu-kmplot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kstars/PKGBUILD b/staging/kdeedu-kstars/PKGBUILD
deleted file mode 100644
index 91f063fc1..000000000
--- a/staging/kdeedu-kstars/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144156 2011-12-04 09:18:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kstars
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Desktop Planetarium"
-url="http://kde.org/applications/education/kstars/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.bz2")
-sha1sums=('d4e489093b440e4246c817821187193e4e53be66')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kstars-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xplanet=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kstars/kdeedu-kstars.install b/staging/kdeedu-kstars/kdeedu-kstars.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kstars/kdeedu-kstars.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-ktouch/PKGBUILD b/staging/kdeedu-ktouch/PKGBUILD
deleted file mode 100644
index 6c962ca14..000000000
--- a/staging/kdeedu-ktouch/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144157 2011-12-04 09:18:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-ktouch
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Touch Typing Tutor"
-url="http://kde.org/applications/education/ktouch/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.bz2")
-sha1sums=('92d7e446216bdfdf68e13c9f0ba39d44e02b29c9')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../ktouch-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-ktouch/kdeedu-ktouch.install b/staging/kdeedu-ktouch/kdeedu-ktouch.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-ktouch/kdeedu-ktouch.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kturtle/PKGBUILD b/staging/kdeedu-kturtle/PKGBUILD
deleted file mode 100644
index e40ff0fee..000000000
--- a/staging/kdeedu-kturtle/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144158 2011-12-04 09:18:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kturtle
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Educational Programming Environment"
-url="http://kde.org/applications/education/kturtle/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.bz2")
-sha1sums=('b3baa81277417f352d4a0bdca61df75515f30c0d')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kturtle-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kturtle/kdeedu-kturtle.install b/staging/kdeedu-kturtle/kdeedu-kturtle.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-kturtle/kdeedu-kturtle.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-kwordquiz/PKGBUILD b/staging/kdeedu-kwordquiz/PKGBUILD
deleted file mode 100644
index e1c62e334..000000000
--- a/staging/kdeedu-kwordquiz/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144159 2011-12-04 09:18:23Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-kwordquiz
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Flash Card Trainer"
-url="http://kde.org/applications/education/kwordquiz/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.bz2")
-sha1sums=('c726b0856234ce78fab0ecd61072cdb035e66513')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kwordquiz-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install b/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-kwordquiz/kdeedu-kwordquiz.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-marble/PKGBUILD b/staging/kdeedu-marble/PKGBUILD
deleted file mode 100644
index 934a14298..000000000
--- a/staging/kdeedu-marble/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144129 2011-12-04 09:06:29Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-marble
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Desktop Globe"
-url="http://kde.org/applications/education/marble/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4' 'gpsd')
-optdepends=('gpsd: gps support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.bz2")
-sha1sums=('e560c355a8d91bbb61b9f2e6c7cb11bd79eba1ab')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../marble-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-marble/kdeedu-marble.install b/staging/kdeedu-marble/kdeedu-marble.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-marble/kdeedu-marble.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-parley/PKGBUILD b/staging/kdeedu-parley/PKGBUILD
deleted file mode 100644
index 0a2166ea0..000000000
--- a/staging/kdeedu-parley/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144160 2011-12-04 09:18:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-parley
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Vocabulary Trainer"
-url="http://kde.org/applications/education/parley/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libkdeedu')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.bz2")
-sha1sums=('e61d0192dce0e1427ee41ff96f1bcb73c77cbcef')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../parley-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-parley/kdeedu-parley.install b/staging/kdeedu-parley/kdeedu-parley.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdeedu-parley/kdeedu-parley.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD
deleted file mode 100644
index fa293bb09..000000000
--- a/staging/kdeedu-rocs/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144161 2011-12-04 09:18:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-rocs
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Rocs Graph Theory"
-url="http://kde.org/applications/education/rocs/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'boost-libs')
-makedepends=('cmake' 'automoc4' 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.bz2")
-sha1sums=('f808118fcd5df59a9a808747be940a88b30cf6f3')
-options=('!makeflags')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../rocs-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-step/PKGBUILD b/staging/kdeedu-step/PKGBUILD
deleted file mode 100644
index 5308ebf03..000000000
--- a/staging/kdeedu-step/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144162 2011-12-04 09:18:31Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdeedu-step
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Interactive Physical Simulator"
-url="http://kde.org/applications/education/step/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.bz2")
-sha1sums=('30dba80e6f34124fd5a8ebf6688e261ab109d0d4')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../step-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdeedu-step/kdeedu-step.install b/staging/kdeedu-step/kdeedu-step.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeedu-step/kdeedu-step.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/PKGBUILD b/staging/kdegames/PKGBUILD
deleted file mode 100644
index 7e7a07026..000000000
--- a/staging/kdegames/PKGBUILD
+++ /dev/null
@@ -1,515 +0,0 @@
-# $Id: PKGBUILD 144163 2011-12-04 09:18:34Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdegames
-pkgname=('kdegames-bomber'
- 'kdegames-bovo'
- 'kdegames-granatier'
- 'kdegames-kajongg'
- 'kdegames-kapman'
- 'kdegames-katomic'
- 'kdegames-kbattleship'
- 'kdegames-kblackbox'
- 'kdegames-kblocks'
- 'kdegames-kbounce'
- 'kdegames-kbreakout'
- 'kdegames-kdiamond'
- 'kdegames-kfourinline'
- 'kdegames-kgoldrunner'
- 'kdegames-kigo'
- 'kdegames-killbots'
- 'kdegames-kiriki'
- 'kdegames-kjumpingcube'
- 'kdegames-klines'
- 'kdegames-klickety'
- 'kdegames-kmahjongg'
- 'kdegames-kmines'
- 'kdegames-knetwalk'
- 'kdegames-kolf'
- 'kdegames-kollision'
- 'kdegames-konquest'
- 'kdegames-kpatience'
- 'kdegames-kreversi'
- 'kdegames-kshisen'
- 'kdegames-ksirk'
- 'kdegames-kspaceduel'
- 'kdegames-ksquares'
- 'kdegames-ksudoku'
- 'kdegames-ktron'
- 'kdegames-ktuberling'
- 'kdegames-kubrick'
- 'kdegames-libkdegames'
- 'kdegames-libkmahjongg'
- 'kdegames-lskat'
- 'kdegames-palapeli')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegames')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ggz-client-libs' 'twisted'
- 'kdebindings-python' 'openal')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('a1f97524f868ab9dae0439abcbf4b41f68715598')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
- make
-}
-
-package_kdegames-bomber() {
- pkgdesc='Arcade Bombing Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/bomber/"
- install='kdegames.install'
- cd $srcdir/build/bomber
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/bomber
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-bovo() {
- pkgdesc='Five-in-a-row Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/bovo/"
- install='kdegames.install'
- cd $srcdir/build/bovo
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/bovo
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-granatier() {
- pkgdesc='Granatier'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
- url="http://kde.org/applications/games/granatier/"
- install='kdegames.install'
- cd $srcdir/build/granatier
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/granatier
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kajongg() {
- pkgdesc='The ancient Chinese board game for 4 players'
- depends=('kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdebindings-python' 'twisted')
- install='kdegames.install'
- cd $srcdir/build/kajongg
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kajongg
- make DESTDIR=$pkgdir install
-
- # Use the python2 executable
- find "${pkgdir}" -name '*.py' | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
-
-package_kdegames-kapman() {
- pkgdesc='Eat pills escaping ghosts'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kapman/"
- install='kdegames.install'
- cd $srcdir/build/kapman
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kapman
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-katomic() {
- pkgdesc='Sokoban-like Logic Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/katomic/"
- install='kdegames.install'
- cd $srcdir/build/katomic
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/katomic
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbattleship() {
- pkgdesc='Battleship Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
- url="http://kde.org/applications/games/kbattleship/"
- install='kdegames-kbattleship.install'
- cd $srcdir/build/kbattleship
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbattleship
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/kbattleship/src/module.dsc \
- $pkgdir/usr/share/ggz/kbattleship.dsc
-}
-
-package_kdegames-kblackbox() {
- pkgdesc='Blackbox Logic Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kblackbox/"
- install='kdegames.install'
- cd $srcdir/build/kblackbox
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kblackbox
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kblocks() {
- pkgdesc='Falling Blocks Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kblocks/"
- install='kdegames.install'
- cd $srcdir/build/kblocks
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kblocks
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbounce() {
- pkgdesc='Ball Bouncing Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kbounce/"
- install='kdegames.install'
- cd $srcdir/build/kbounce
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbounce
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kbreakout() {
- pkgdesc='Breakout-like Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kbreakout/"
- install='kdegames.install'
- cd $srcdir/build/kbreakout
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kbreakout
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kdiamond() {
- pkgdesc='Three-in-a-row game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kdiamond/"
- install='kdegames.install'
- cd $srcdir/build/kdiamond
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kdiamond
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kfourinline() {
- pkgdesc='Four-in-a-row Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kfourinline/"
- install='kdegames-kfourinline.install'
- cd $srcdir/build/kfourinline
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kfourinline
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kgoldrunner() {
- pkgdesc='A game of action and puzzle-solving'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'openal')
- url="http://kde.org/applications/games/kgoldrunner/"
- install='kdegames.install'
- cd $srcdir/build/kgoldrunner
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kgoldrunner
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kigo() {
- pkgdesc='Go Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'gnugo')
- url="http://kde.org/applications/games/kigo/"
- install='kdegames-kigo.install'
- cd $srcdir/build/kigo
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kigo
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-killbots() {
- pkgdesc='Killbots'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/killbots/"
- install='kdegames.install'
- cd $srcdir/build/killbots
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/killbots
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kiriki() {
- pkgdesc='Yahtzee-like Dice Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kiriki/"
- install='kdegames.install'
- cd $srcdir/build/kiriki
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kiriki
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kjumpingcube() {
- pkgdesc='Territory Capture Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kjumpingcube/"
- install='kdegames.install'
- cd $srcdir/build/kjumpingcube
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kjumpingcube
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klickety() {
- pkgdesc='Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- replaces=('kdegames-ksame')
- conflicts=('kdegames-ksame')
- url="http://kde.org/applications/games/ksame/"
- install='kdegames.install'
- cd $srcdir/build/klickety
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klickety
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-klines() {
- pkgdesc='Tactical Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/klines/"
- install='kdegames.install'
- cd $srcdir/build/klines
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klines
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmahjongg() {
- pkgdesc='Mahjongg Solitaire'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
- url="http://kde.org/applications/games/kmahjongg/"
- install='kdegames.install'
- cd $srcdir/build/kmahjongg
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmahjongg
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kmines() {
- pkgdesc='Minesweeper-like Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kmines/"
- install='kdegames.install'
- cd $srcdir/build/kmines
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmines
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-knetwalk() {
- pkgdesc='Network Construction Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/knetwalk/"
- install='kdegames.install'
- cd $srcdir/build/knetwalk
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/knetwalk
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kolf() {
- pkgdesc='Miniature Golf'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kolf/"
- install='kdegames-kolf.install'
- cd $srcdir/build/kolf
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kolf
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kollision() {
- pkgdesc='A simple ball dodging game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kollision/"
- install='kdegames.install'
- cd $srcdir/build/kollision
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kollision
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-konquest() {
- pkgdesc='Galactic Strategy Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/konquest/"
- install='kdegames.install'
- cd $srcdir/build/konquest
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/konquest
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kpatience() {
- pkgdesc='Patience Card Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kpatience/"
- install='kdegames.install'
- replaces=('kdegames-kpat')
- cd $srcdir/build/kpat
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kpat
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kreversi() {
- pkgdesc='Reversi Board Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
- url="http://kde.org/applications/games/kreversi/"
- install='kdegames-kreversi.install'
- cd $srcdir/build/kreversi
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kreversi
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/kreversi/module.dsc \
- $pkgdir/usr/share/ggz/kreversi.dsc
-}
-
-package_kdegames-kshisen() {
- pkgdesc='Shisen-Sho Mahjongg-like Tile Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'kdegames-libkmahjongg')
- url="http://kde.org/applications/games/kshisen/"
- install='kdegames.install'
- cd $srcdir/build/kshisen
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kshisen
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksirk() {
- pkgdesc='World Domination Strategy Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ksirk/"
- install='kdegames.install'
- cd $srcdir/build/ksirk
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksirk
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kspaceduel() {
- pkgdesc='Space Arcade Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kspaceduel/"
- install='kdegames-kspaceduel.install'
- cd $srcdir/build/kspaceduel
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kspaceduel
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ksquares() {
- pkgdesc='Connect the dots to create squares'
- depends=('kdebase-runtime' 'kdegames-libkdegames' 'ggz-client-libs')
- url="http://kde.org/applications/games/ksquares/"
- install='kdegames-ksquares.install'
- cd $srcdir/build/ksquares
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksquares
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/ksquares/src/module.dsc \
- $pkgdir/usr/share/ggz/ksquares.dsc
-}
-
-package_kdegames-ksudoku() {
- pkgdesc='KSudoku, Sudoku game & more for KDE'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ksudoku/"
- install='kdegames.install'
- cd $srcdir/build/ksudoku
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ksudoku
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktron() {
- pkgdesc='Tron-like Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ktron/"
- install='kdegames.install'
- cd $srcdir/build/ktron
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ktron
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-ktuberling() {
- pkgdesc='Picture Game for Children'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/ktuberling/"
- install='kdegames-ktuberling.install'
- cd $srcdir/build/ktuberling
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/ktuberling
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-kubrick() {
- pkgdesc='A 3-D game based on Rubik´s Cube'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/kubrick/"
- install='kdegames.install'
- cd $srcdir/build/kubrick
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kubrick
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-libkdegames() {
- pkgdesc='KDE game library'
- groups=()
- depends=('kdelibs')
- cd $srcdir/build/libkdegames
- make DESTDIR=$pkgdir install
- for i in $srcdir/${pkgbase}-${pkgver}/cmake/modules/*.cmake; do
- install -D -m644 $i $pkgdir/usr/share/apps/cmake/modules/$(basename $i)
- done
-}
-
-package_kdegames-libkmahjongg() {
- pkgdesc='Library used for loading and rendering of Mahjongg tilesets'
- groups=()
- depends=('kdelibs')
- cd $srcdir/build/libkmahjongg
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-lskat() {
- pkgdesc='Card Game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/lskat/"
- install='kdegames-lskat.install'
- cd $srcdir/build/lskat
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/lskat
- make DESTDIR=$pkgdir install
-}
-
-package_kdegames-palapeli() {
- pkgdesc='Jigsaw puzzle game'
- depends=('kdebase-runtime' 'kdegames-libkdegames')
- url="http://kde.org/applications/games/palapeli/"
- install='kdegames-palapeli.install'
- cd $srcdir/build/palapeli
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/palapeli
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdegames/kdegames-kbattleship.install b/staging/kdegames/kdegames-kbattleship.install
deleted file mode 100644
index ac4516ed0..000000000
--- a/staging/kdegames/kdegames-kbattleship.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
- ggz-config -i -f -m usr/share/ggz/kbattleship.dsc >& /dev/null
-}
-
-pre_remove() {
- if [ -f usr/share/ggz/kbattleship.dsc ]; then
- ggz-config -r -m usr/share/ggz/kbattleship.dsc >& /dev/null
- fi
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
diff --git a/staging/kdegames/kdegames-kfourinline.install b/staging/kdegames/kdegames-kfourinline.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kfourinline.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-kigo.install b/staging/kdegames/kdegames-kigo.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kigo.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-kolf.install b/staging/kdegames/kdegames-kolf.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kolf.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-kreversi.install b/staging/kdegames/kdegames-kreversi.install
deleted file mode 100644
index 4623e6e49..000000000
--- a/staging/kdegames/kdegames-kreversi.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- ggz-config -i -f -m usr/share/ggz/kreversi.dsc >& /dev/null
-}
-
-pre_remove() {
- if [ -f usr/share/ggz/kreversi.dsc ]; then
- ggz-config -r -m usr/share/ggz/kreversi.dsc >& /dev/null
- fi
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-kspaceduel.install b/staging/kdegames/kdegames-kspaceduel.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-kspaceduel.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-ksquares.install b/staging/kdegames/kdegames-ksquares.install
deleted file mode 100644
index 5a619897d..000000000
--- a/staging/kdegames/kdegames-ksquares.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- ggz-config -i -f -m usr/share/ggz/ksquares.dsc >& /dev/null
-}
-
-pre_remove() {
- if [ -f usr/share/ggz/ksquares.dsc ]; then
- ggz-config -r -m usr/share/ggz/ksquares.dsc >& /dev/null
- fi
-}
-
-pre_upgrade() {
- pre_remove
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
diff --git a/staging/kdegames/kdegames-ktuberling.install b/staging/kdegames/kdegames-ktuberling.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-ktuberling.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-lskat.install b/staging/kdegames/kdegames-lskat.install
deleted file mode 100644
index 9b20edb30..000000000
--- a/staging/kdegames/kdegames-lskat.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames-palapeli.install b/staging/kdegames/kdegames-palapeli.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdegames/kdegames-palapeli.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegames/kdegames.install b/staging/kdegames/kdegames.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegames/kdegames.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegraphics-gwenview/PKGBUILD b/staging/kdegraphics-gwenview/PKGBUILD
deleted file mode 100644
index c65f8bd4f..000000000
--- a/staging/kdegraphics-gwenview/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144164 2011-12-04 09:18:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-gwenview
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="A fast and easy to use image viewer for KDE"
-url="http://kde.org/applications/graphics/gwenview/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-lib' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins: extra plugins to share photos')
-install=$pkgname.install
-source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.bz2")
-sha1sums=('598714d18cf7adab8afd4f906070f0915e1cdc95')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../gwenview-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-gwenview/kdegraphics-gwenview.install b/staging/kdegraphics-gwenview/kdegraphics-gwenview.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-gwenview/kdegraphics-gwenview.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegraphics-kamera/PKGBUILD b/staging/kdegraphics-kamera/PKGBUILD
deleted file mode 100644
index 132ffe373..000000000
--- a/staging/kdegraphics-kamera/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 144165 2011-12-04 09:18:41Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kamera
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Configure Kamera"
-url="http://kde.org/applications/graphics/kamera/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'gphoto2')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.bz2")
-sha1sums=('098c71d7588d5163656cb07a476efbfc6755900a')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kamera-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kcolorchooser/PKGBUILD b/staging/kdegraphics-kcolorchooser/PKGBUILD
deleted file mode 100644
index 345fd9112..000000000
--- a/staging/kdegraphics-kcolorchooser/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144166 2011-12-04 09:18:44Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kcolorchooser
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Color Chooser"
-url="http://kde.org/applications/graphics/kcolorchooser/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.bz2")
-sha1sums=('bbfda234e8aec109c63226499fc72355b1c051ca')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kcolorchooser-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install b/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegraphics-kgamma/PKGBUILD b/staging/kdegraphics-kgamma/PKGBUILD
deleted file mode 100644
index bfee18e39..000000000
--- a/staging/kdegraphics-kgamma/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 144167 2011-12-04 09:18:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kgamma
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="A monitor calibration tool"
-url="http://kde.org/applications/graphics/kgamma/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-# note on libxxf86vm:
-# not detected by namcap because libgl depends on it
-# but nvidia providing libgl does not depend on libxxf86vm
-depends=('kdebase-runtime' 'libxxf86vm')
-makedepends=('cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.bz2")
-sha1sums=('cd528839b6a9be997ed8d4a2fc87a8b5b8e8de91')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kgamma-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kolourpaint/PKGBUILD b/staging/kdegraphics-kolourpaint/PKGBUILD
deleted file mode 100644
index ca2c0adc6..000000000
--- a/staging/kdegraphics-kolourpaint/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144168 2011-12-04 09:18:50Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kolourpaint
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Paint Program"
-url="http://kde.org/applications/graphics/kolourpaint/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.bz2")
-sha1sums=('31e23ab6735291ec86ebd83e2eee7afa191a4a59')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kolourpaint-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install b/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegraphics-kruler/PKGBUILD b/staging/kdegraphics-kruler/PKGBUILD
deleted file mode 100644
index e45f98738..000000000
--- a/staging/kdegraphics-kruler/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144169 2011-12-04 09:18:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-kruler
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Screen Ruler"
-url="http://kde.org/applications/graphics/kruler/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.bz2")
-sha1sums=('a854213e5342e382d3b9c4a29d1aada654378d0f')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kruler-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-kruler/kdegraphics-kruler.install b/staging/kdegraphics-kruler/kdegraphics-kruler.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-kruler/kdegraphics-kruler.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegraphics-ksaneplugin/PKGBUILD b/staging/kdegraphics-ksaneplugin/PKGBUILD
deleted file mode 100644
index 796109c0d..000000000
--- a/staging/kdegraphics-ksaneplugin/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144170 2011-12-04 09:18:56Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksaneplugin
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="A scan plugin that implements the scanning"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libksane')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.bz2")
-sha1sums=('15f7ca6fbabb757898cc0f18685f5e204e6b3f56')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../ksaneplugin-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-ksnapshot/PKGBUILD b/staging/kdegraphics-ksnapshot/PKGBUILD
deleted file mode 100644
index bc728d44d..000000000
--- a/staging/kdegraphics-ksnapshot/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144171 2011-12-04 09:18:59Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-ksnapshot
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Screen Capture Program"
-url="http://kde.org/applications/graphics/ksnapshot/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdelibs' 'libkipi')
-makedepends=('cmake' 'automoc4')
-optdepends=('kipi-plugins')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.bz2")
-sha1sums=('bc40ae740e3a684e47ba1b5af01aeb427bb4336e')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../ksnapshot-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install b/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegraphics-mobipocket/PKGBUILD b/staging/kdegraphics-mobipocket/PKGBUILD
deleted file mode 100644
index cf984f21e..000000000
--- a/staging/kdegraphics-mobipocket/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144172 2011-12-04 09:19:01Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-mobipocket
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="A collection of plugins to handle mobipocket files"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/mobipocket-${pkgver}.tar.bz2")
-sha1sums=('db278a2ebe4680a94c4963a53c1501cf1f1d9d2a')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../mobipocket-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/PKGBUILD b/staging/kdegraphics-okular/PKGBUILD
deleted file mode 100644
index 0afa6af0e..000000000
--- a/staging/kdegraphics-okular/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 144219 2011-12-04 09:37:47Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.7.4
-pkgrel=1
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
- 'ebook-tools' 'libspectre')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('5f02bbfeff81b55e0fd5d9e973cb927909faccb1')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../okular-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/kdegraphics-okular.install b/staging/kdegraphics-okular/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-okular/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegraphics-okular/staging-i686/PKGBUILD b/staging/kdegraphics-okular/staging-i686/PKGBUILD
deleted file mode 100644
index 8b08d240f..000000000
--- a/staging/kdegraphics-okular/staging-i686/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 144119 2011-12-04 09:06:00Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-okular
-pkgver=4.7.4
-pkgrel=1
-pkgdesc='Document Viewer'
-arch=('i686' 'x86_64')
-url="http://kde.org/applications/graphics/okular/"
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdegraphics')
-depends=('kdebase-runtime' 'qimageblitz' 'poppler-qt' 'chmlib' 'djvulibre'
- 'ebook-tools' 'libspectre')
-makedepends=('pkgconfig' 'cmake' 'automoc4')
-optdepends=('kdegraphics-mobipocket: mobipocket support')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.bz2")
-sha1sums=('5f02bbfeff81b55e0fd5d9e973cb927909faccb1')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../okular-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-okular/staging-i686/kdegraphics-okular.install b/staging/kdegraphics-okular/staging-i686/kdegraphics-okular.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdegraphics-okular/staging-i686/kdegraphics-okular.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdegraphics-strigi-analyzer/PKGBUILD b/staging/kdegraphics-strigi-analyzer/PKGBUILD
deleted file mode 100644
index df96289d6..000000000
--- a/staging/kdegraphics-strigi-analyzer/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144173 2011-12-04 09:19:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-strigi-analyzer
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Strigi analyzers for various graphics file formats"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('39b3b0312663a3ef7a68c972b39bf12fb4cabe8b')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-svgpart/PKGBUILD b/staging/kdegraphics-svgpart/PKGBUILD
deleted file mode 100644
index 615b6b0fb..000000000
--- a/staging/kdegraphics-svgpart/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144174 2011-12-04 09:19:08Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-svgpart
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="A KPart for viewving SVGs"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.bz2")
-sha1sums=('38dcb3c468ca359e7b0a0027523b8156de6a06a1')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../svgpart-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdegraphics-thumbnailers/PKGBUILD b/staging/kdegraphics-thumbnailers/PKGBUILD
deleted file mode 100644
index 42dcd5faa..000000000
--- a/staging/kdegraphics-thumbnailers/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144175 2011-12-04 09:19:11Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kdegraphics-thumbnailers
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Thumbnailers for various graphics file formats"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('libkexiv2' 'libkdcraw')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('0e1636da30c78ad2c186bcd30c0566406b920126')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdelibs/PKGBUILD b/staging/kdelibs/PKGBUILD
deleted file mode 100644
index 019a971bf..000000000
--- a/staging/kdelibs/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 145730 2011-12-29 13:52:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdelibs
-pkgver=4.7.4
-pkgrel=5
-pkgdesc="KDE Core Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('strigi' 'attica' 'libxss' 'xz' 'openssl' 'soprano' 'krb5'
- 'shared-desktop-ontologies' 'qca' 'libdbusmenu-qt' 'polkit-qt' 'grantlee'
- 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'xdg-utils'
- 'phonon' 'hicolor-icon-theme' 'upower' 'udisks' 'libxcursor'
- 'docbook-xsl' 'qtwebkit')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'avahi' 'libgl' 'hspell')
-replaces=('kdelibs-experimental')
-install='kdelibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'kde-applications-menu.patch' 'archlinux-menu.patch'
- 'fix-knotify-filepath.patch' 'kdelibs-4.7.4-xinelib12x.patch')
-sha1sums=('78b25e93a8c70ccc1e0f117cce960fe4e1deb8d8'
- '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
- '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- '3312f6005aa56a9b992c74008fe5b314f1c8ffba'
- '9cb83cb7f6394549354c6837977f9e9529127041')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- # avoid file conflict with gnome-menus
- patch -p1 -i "${srcdir}"/kde-applications-menu.patch
- # add Archlinux menu entry
- patch -p1 -i "${srcdir}"/archlinux-menu.patch
-
- # https://bugs.kde.org/show_bug.cgi?id=285028
- patch -p1 -i "${srcdir}"/fix-knotify-filepath.patch
-
- patch -p1 -i "${srcdir}"/kdelibs-4.7.4-xinelib12x.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DHTML_INSTALL_DIR=/usr/share/doc/kde/html \
- -DKDE_DEFAULT_HOME='.kde4' \
- -DWITH_FAM=OFF
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-
- # cert bundle seems to be hardcoded
- # link it to the one from ca-certificates
- rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
- ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
-}
diff --git a/staging/kdelibs/archlinux-menu.patch b/staging/kdelibs/archlinux-menu.patch
deleted file mode 100644
index 546784fa2..000000000
--- a/staging/kdelibs/archlinux-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000
-+++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000
-@@ -16,11 +16,19 @@
- </DefaultLayout>
- <Layout>
- <Merge type="menus"/>
-+ <Menuname>Arch Linux</Menuname>
- <Menuname>Applications</Menuname>
- <Merge type="files"/>
- </Layout>
-
- <Menu>
-+ <Name>Arch Linux</Name>
-+ <Directory>Archlinux.directory</Directory>
-+ <Include>
-+ <Category>Archlinux</Category>
-+ </Include>
-+ </Menu>
-+ <Menu>
- <Name>Applications</Name>
- <Directory>kde-unknown.directory</Directory>
- <OnlyUnallocated/>
diff --git a/staging/kdelibs/fix-knotify-filepath.patch b/staging/kdelibs/fix-knotify-filepath.patch
deleted file mode 100644
index 2cd995e97..000000000
--- a/staging/kdelibs/fix-knotify-filepath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/knotify/config/knotifyconfigactionswidget.cpp b/knotify/config/knotifyconfigactionswidget.cpp
-index 88d18b6..0e76658 100644
---- a/knotify/config/knotifyconfigactionswidget.cpp
-+++ b/knotify/config/knotifyconfigactionswidget.cpp
-@@ -128,7 +128,7 @@ void KNotifyConfigActionsWidget::slotPlay( )
- KUrl soundURL = m_ui.Sound_select->url();
- if ( soundURL.isRelative() )
- {
-- QString soundString = soundURL.toLocalFile();
-+ QString soundString = m_ui.Sound_select->text();
- // we need a way to get the application name in order to ba able to do this :
- /*QString search = QString("%1/sounds/%2").arg(config->appname).arg(soundFile);
- search = KGlobal::mainComponent().dirs()->findResource("data", search);
diff --git a/staging/kdelibs/kde-applications-menu.patch b/staging/kdelibs/kde-applications-menu.patch
deleted file mode 100644
index 4b513298a..000000000
--- a/staging/kdelibs/kde-applications-menu.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
-+++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
-@@ -69,7 +69,7 @@
- if (WIN32)
- install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
- else (WIN32)
--install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
-+install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
- endif (WIN32)
- install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
- install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
---- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000
-+++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000
-@@ -302,7 +302,7 @@
- if (!m_trackId.isEmpty())
- g_vfolder->setTrackId(m_trackId);
-
-- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
-+ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
-
- KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
- entry->setLayoutInfo(kdeMenu->layoutList);
diff --git a/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch b/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch
deleted file mode 100644
index bdcd39a6c..000000000
--- a/staging/kdelibs/kdelibs-4.7.4-xinelib12x.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From de5da56d10a47ff8fdf55c0818e9e776dcfa01f9 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Thu, 5 Jan 2012 10:06:05 +0100
-Subject: [PATCH] Fix FindXine.cmake module with >=xine-lib-1.2.
-
----
- cmake/modules/FindXine.cmake | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/modules/FindXine.cmake b/cmake/modules/FindXine.cmake
-index 37c58c6..d71969a 100644
---- a/cmake/modules/FindXine.cmake
-+++ b/cmake/modules/FindXine.cmake
-@@ -36,13 +36,13 @@ find_library(XINE_LIBRARY NAMES xine
- ${PC_LIBXINE_LIBRARY_DIRS}
- )
-
--find_program(XINECONFIG_EXECUTABLE NAMES xine-config
-+find_program(XINECONFIG_EXECUTABLE NAMES pkg-config
- HINTS
- ${PC_LIBXINE_PREFIX}/bin
- )
-
- if (XINE_INCLUDE_DIR AND XINE_LIBRARY AND XINECONFIG_EXECUTABLE)
-- exec_program(${XINECONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
-+ exec_program(${XINECONFIG_EXECUTABLE} ARGS --modversion libxine RETURN_VALUE _return_VALUE OUTPUT_VARIABLE XINE_VERSION ERROR_QUIET)
- if("${XINE_VERSION}" VERSION_GREATER "1.1.0") #if (... VERSION_GREATER) is new since cmake 2.6.2
- set(XINE_VERSION_OK TRUE)
- string(REGEX REPLACE "[0-9]\\.[0-9]\\." "" XINE_BUGFIX_VERSION ${XINE_VERSION})
---
-1.7.8.2
-
diff --git a/staging/kdelibs/kdelibs.install b/staging/kdelibs/kdelibs.install
deleted file mode 100644
index c77e68041..000000000
--- a/staging/kdelibs/kdelibs.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdemultimedia/PKGBUILD b/staging/kdemultimedia/PKGBUILD
deleted file mode 100644
index 6fc645930..000000000
--- a/staging/kdemultimedia/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id: PKGBUILD 144176 2011-12-04 09:19:14Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
- 'kdemultimedia-ffmpegthumbs'
- 'kdemultimedia-juk'
- 'kdemultimedia-kioslave'
- 'kdemultimedia-kmix'
- 'kdemultimedia-kscd'
- 'kdemultimedia-mplayerthumbs')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
- 'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'mplayerthumbs.config')
-sha1sums=('e0001afac38e35e3ab7b919d79f74cd57e3c18dd'
- 'ba016fa2563c14ffcba852c62506b66bfc6ee683')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_Xine=OFF
- make
-}
-
-package_kdemultimedia-dragonplayer() {
- pkgdesc='Video Player'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/multimedia/dragonplayer/"
- install='kdemultimedia.install'
- cd $srcdir/build/dragonplayer
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/dragonplayer
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-ffmpegthumbs() {
- pkgdesc='Video Files (ffmpegthumbs)'
- depends=('kdebase-runtime' 'ffmpeg')
- install='kdemultimedia.install'
- cd $srcdir/build/ffmpegthumbs
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-juk() {
- pkgdesc='Music Player'
- depends=('kdebase-runtime' 'tunepimp')
- url="http://kde.org/applications/multimedia/juk"
- install='kdemultimedia.install'
- cd $srcdir/build/juk
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/juk
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kioslave() {
- pkgdesc='Audio CD Browser'
- depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
- conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
- replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
- for i in kioslave doc/kioslave libkcddb libkcompactdisc; do
- cd $srcdir/build/${i}
- make DESTDIR=$pkgdir install
- done
-}
-
-package_kdemultimedia-kmix() {
- pkgdesc='Sound Mixer'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/multimedia/kmix"
- install='kdemultimedia.install'
- cd $srcdir/build/kmix
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmix
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kscd() {
- pkgdesc='CD Player'
- depends=('kdebase-runtime' 'libmusicbrainz3')
- url="http://kde.org/applications/multimedia/kscd"
- install='kdemultimedia.install'
- cd $srcdir/build/kscd
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcontrol/cddbretrieval
- make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-mplayerthumbs() {
- pkgdesc='Video Files (MPlayerThumbs)'
- depends=('kdebase-runtime' 'mplayer')
- replaces=('mplayerthumbs')
- conflicts=('mplayerthumbs')
- cd $srcdir/build/mplayerthumbs
- make DESTDIR=$pkgdir install
- install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}
diff --git a/staging/kdemultimedia/kdemultimedia.install b/staging/kdemultimedia/kdemultimedia.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdemultimedia/kdemultimedia.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdemultimedia/mplayerthumbs.config b/staging/kdemultimedia/mplayerthumbs.config
deleted file mode 100644
index 761a17953..000000000
--- a/staging/kdemultimedia/mplayerthumbs.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0
diff --git a/staging/kdenetwork/PKGBUILD b/staging/kdenetwork/PKGBUILD
deleted file mode 100644
index a07fa1800..000000000
--- a/staging/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,111 +0,0 @@
-# $Id: PKGBUILD 144177 2011-12-04 09:19:17Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdenetwork
-pkgname=('kdenetwork-filesharing'
- 'kdenetwork-kdnssd'
- 'kdenetwork-kget'
- 'kdenetwork-kopete'
- 'kdenetwork-kppp'
- 'kdenetwork-krdc'
- 'kdenetwork-krfb')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr'
- 'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver' 'libmsn' 'ppp'
- 'v4l-utils' 'libidn' 'rdesktop' 'qimageblitz' 'libxdamage' 'libgadu'
- 'telepathy-qt4' 'libktorrent' 'libmms' 'mediastreamer')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('15d5bdcda0e05de6247b22b96c6ca4a98da8a278')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
- -DWITH_Xmms=OFF \
- -DWITH_LibMeanwhile=OFF
- make
-}
-
-package_kdenetwork-filesharing() {
- pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
- depends=('kdelibs' 'smbclient')
- install='kdenetwork.install'
- cd $srcdir/build/filesharing
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kdnssd() {
- pkgdesc='Monitors the network for DNS-SD services'
- depends=('kdelibs')
- cd $srcdir/build/kdnssd
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kget() {
- pkgdesc='Download Manager'
- depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
- optdepends=('python2: YouTube plugin')
- url="http://kde.org/applications/internet/kget/"
- install='kdenetwork.install'
- cd $srcdir/build/kget
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kget
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kopete() {
- pkgdesc='Instant Messenger'
- depends=('kdebase-runtime' 'kdepimlibs' 'qca-ossl' 'libotr' 'libmsn'
- 'libidn' 'qimageblitz' 'v4l-utils' 'libgadu' 'mediastreamer')
- url="http://kde.org/applications/internet/kopete/"
- install='kdenetwork.install'
- cd $srcdir/build/kopete
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kopete
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kppp() {
- pkgdesc='Internet Dial-Up Tool'
- depends=('kdebase-runtime' 'ppp')
- url="http://kde.org/applications/internet/kppp/"
- install='kdenetwork.install'
- cd $srcdir/build/kppp
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kppp
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krdc() {
- pkgdesc='Remote Desktop Client'
- depends=('kdebase-runtime' 'libvncserver' 'rdesktop' 'telepathy-qt4')
- optdepends=('kdebase-keditbookmarks: to edit bookmarks')
- url="http://kde.org/applications/internet/krdc/"
- cd $srcdir/build/krdc
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/krdc
- make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krfb() {
- pkgdesc='Desktop Sharing'
- # note on libxdamage:
- # not detected by namcap because libgl depends on it
- # but nvidia providing libgl does not depend on libxdamage
- depends=('kdebase-runtime' 'libvncserver' 'libxdamage')
- cd $srcdir/build/krfb
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/krfb
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdenetwork/kdenetwork.install b/staging/kdenetwork/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdenetwork/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdepim-runtime/PKGBUILD b/staging/kdepim-runtime/PKGBUILD
deleted file mode 100644
index 52a24909d..000000000
--- a/staging/kdepim-runtime/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144216 2011-12-04 09:37:38Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepim-runtime
-pkgver=4.7.4
-pkgrel=1
-pkgdesc='KDE PIM Runtime Environment'
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdepimlibs' 'kdebase-runtime')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('fb02f53673316aaafb65b7c4dd570f3be3b4e935')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdepim-runtime/kdepim-runtime.install b/staging/kdepim-runtime/kdepim-runtime.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdepim-runtime/kdepim-runtime.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdepim/PKGBUILD b/staging/kdepim/PKGBUILD
deleted file mode 100644
index 52e26e307..000000000
--- a/staging/kdepim/PKGBUILD
+++ /dev/null
@@ -1,252 +0,0 @@
-# $Id: PKGBUILD 144178 2011-12-04 09:19:20Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdepim
-pkgname=('kdepim-akonadiconsole'
- 'kdepim-akregator'
- 'kdepim-blogilo'
- 'kdepim-console'
- 'kdepim-kaddressbook'
- 'kdepim-kalarm'
- 'kdepim-kjots'
- 'kdepim-kleopatra'
- 'kdepim-kmail'
- 'kdepim-knode'
- 'kdepim-knotes'
- 'kdepim-kontact'
- 'kdepim-korganizer'
- 'kdepim-kresources'
- 'kdepim-ktimetracker'
- 'kdepim-libkdepim'
- 'kdepim-wizards')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://pim.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdepim')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
- 'pilot-link' 'kde-agent')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('233f6c413eeedd4af7cf15106a2af7b8f29977bf')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DKDEPIM_BUILD_MOBILE=OFF
- make
-}
-
-package_kdepim-akonadiconsole() {
- pkgdesc='Akonadi Management and Debugging Console'
- depends=('kdepim-libkdepim')
- url='http://pim.kde.org'
- install='kdepim.install'
- cd "${srcdir}"/build/akonadiconsole
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-akregator() {
- pkgdesc='A Feed Reader for KDE'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/akregator/"
- install='kdepim.install'
- cd "${srcdir}"/build/akregator
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/akregator
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/akregator
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-blogilo() {
- pkgdesc='A KDE Blogging Client'
- depends=('kdepim-runtime')
- url="http://kde.org/applications/internet/blogilo/"
- replaces=('blogilo')
- conflicts=('blogilo')
- install='kdepim.install'
- cd "${srcdir}"/build/blogilo
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/blogilo
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-console() {
- pkgdesc='Command line tool for accessing calendar files'
- depends=('kdepim-runtime')
- url='http://pim.kde.org'
- install='kdepim.install'
- cd "${srcdir}"/build/console
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kaddressbook() {
- pkgdesc='Contact Manager'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/kaddressbook/"
- install='kdepim.install'
- cd "${srcdir}"/build/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/plugins/kaddressbook
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kalarm() {
- pkgdesc='Personal Alarm Scheduler'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kalarm/"
- install='kdepim.install'
- cd "${srcdir}"/build/kalarm
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kalarm
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kjots() {
- pkgdesc='Note Taker'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kjots/"
- install='kdepim.install'
- cd "${srcdir}"/build/kjots
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kjots
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/kjots
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kleopatra() {
- pkgdesc='Certificate Manager and Unified Crypto GUI'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/kleopatra/"
- cd "${srcdir}"/build/kleopatra
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/kleopatra
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kmail() {
- pkgdesc='Mail Client'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/kmail/"
- install='kdepim.install'
- conflicts=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
- 'kdepim-mimelib' 'kdepim-plugins')
- replaces=('kdepim-kmailcvt' 'kdepim-ksendemail' 'kdepim-libksieve'
- 'kdepim-mimelib' 'kdepim-plugins')
- for i in kmail doc/kmail kmailcvt ksendemail libksieve mailcommon \
- nepomuk_email_feeder ontologies kontact/plugins/kmail; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-knode() {
- pkgdesc='News Reader'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/internet/knode/"
- install='kdepim.install'
- cd "${srcdir}"/build/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knode
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/knode
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-knotes() {
- pkgdesc='Popup Notes'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/utilities/knotes/"
- install='kdepim.install'
- cd "${srcdir}"/build/knotes
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/knotes
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/knotes
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kontact() {
- pkgdesc='Personal Information Manager'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/kontact/"
- install='kdepim.install'
- conflcits=('kdepim-kontactinterfaces')
- replaces=('kdepim-kontactinterfaces')
- for i in kontact/src doc/kontact \
- kontact/plugins/summary kontact/plugins/specialdates; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-korganizer() {
- pkgdesc='Calendar and Scheduling Program'
- depends=('kdepim-libkdepim')
- url="http://kde.org/applications/office/korganizer"
- install='kdepim.install'
- cd "${srcdir}"/build/korganizer
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/korganizer
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/korganizer
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-kresources() {
- pkgdesc='KDE PIM resources'
- depends=('kdepim-libkdepim')
- url='http://pim.kde.org'
- cd "${srcdir}"/build/kresources
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-ktimetracker() {
- pkgdesc='Personal Time Tracker'
- depends=('kdepim-kresources')
- url="http://kde.org/applications/utilities/ktimetracker/"
- install='kdepim.install'
- cd "${srcdir}"/build/ktimetracker
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/doc/ktimetracker
- make DESTDIR="${pkgdir}" install
- cd "${srcdir}"/build/kontact/plugins/ktimetracker
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdepim-libkdepim() {
- pkgdesc='Library for KDE PIM'
- groups=()
- depends=('kde-agent' 'kdepim-runtime')
- url='http://pim.kde.org'
- conflicts=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
- 'kdepim-strigi-analyzer' 'kdepim-akonadi')
- replaces=('kdepim-icons' 'kdepim-libkleo' 'kdepim-libkpgp'
- 'kdepim-strigi-analyzer' 'kdepim-akonadi')
- for i in akonadi_next calendarsupport calendarviews incidenceeditor-ng \
- kdgantt2 libkdepim libkdepimdbusinterfaces libkleo libkpgp \
- messagecomposer messagecore messagelist messageviewer icons \
- strigi-analyzer templateparser plugins/messageviewer \
- plugins/ktexteditor; do
- cd "${srcdir}"/build/${i}
- make DESTDIR="${pkgdir}" install
- done
-}
-
-package_kdepim-wizards() {
- pkgdesc='KDE Groupware Wizard'
- depends=('kdepim-kresources')
- url='http://pim.kde.org'
- cd "${srcdir}"/build/wizards
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdepim/kdepim.install b/staging/kdepim/kdepim.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdepim/kdepim.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdepimlibs/PKGBUILD b/staging/kdepimlibs/PKGBUILD
deleted file mode 100644
index 04ec4d14f..000000000
--- a/staging/kdepimlibs/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144214 2011-12-04 09:37:33Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=kdepimlibs
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="KDE PIM Libraries"
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'cyrus-sasl' 'openldap')
-install='kdepimlibs.install'
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a539e29557c0a30779e752b9349b3a0c000ffbba')
-
-build() {
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd $srcdir/build
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdepimlibs/kdepimlibs.install b/staging/kdepimlibs/kdepimlibs.install
deleted file mode 100644
index 99262607c..000000000
--- a/staging/kdepimlibs/kdepimlibs.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdeplasma-addons/PKGBUILD b/staging/kdeplasma-addons/PKGBUILD
deleted file mode 100644
index 69c374746..000000000
--- a/staging/kdeplasma-addons/PKGBUILD
+++ /dev/null
@@ -1,603 +0,0 @@
-# $Id: PKGBUILD 144179 2011-12-04 09:19:22Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeplasma-addons
-pkgname=('kdeplasma-addons-applets-bball'
- 'kdeplasma-addons-applets-binary-clock'
- 'kdeplasma-addons-applets-blackboard'
- 'kdeplasma-addons-applets-bookmarks'
- 'kdeplasma-addons-applets-bubblemon'
- 'kdeplasma-addons-applets-calculator'
- 'kdeplasma-addons-applets-charselect'
- 'kdeplasma-addons-applets-comic'
- 'kdeplasma-addons-applets-community'
- 'kdeplasma-addons-applets-dict'
- 'kdeplasma-addons-applets-eyes'
- 'kdeplasma-addons-applets-fifteenpuzzle'
- 'kdeplasma-addons-applets-filewatcher'
- 'kdeplasma-addons-applets-frame'
- 'kdeplasma-addons-applets-fuzzy-clock'
- 'kdeplasma-addons-applets-incomingmsg'
- 'kdeplasma-addons-applets-kdeobservatory'
- 'kdeplasma-addons-applets-kimpanel'
- 'kdeplasma-addons-applets-knowledgebase'
- 'kdeplasma-addons-applets-kolourpicker'
- 'kdeplasma-addons-applets-konqprofiles'
- 'kdeplasma-addons-applets-konsoleprofiles'
- 'kdeplasma-addons-applets-lancelot'
- 'kdeplasma-addons-applets-leavenote'
- 'kdeplasma-addons-applets-life'
- 'kdeplasma-addons-applets-luna'
- 'kdeplasma-addons-applets-magnifique'
- 'kdeplasma-addons-applets-mediaplayer'
- 'kdeplasma-addons-applets-microblog'
- 'kdeplasma-addons-applets-news'
- 'kdeplasma-addons-applets-notes'
- 'kdeplasma-addons-applets-nowplaying'
- 'kdeplasma-addons-applets-paste'
- 'kdeplasma-addons-applets-pastebin'
- 'kdeplasma-addons-applets-plasmaboard'
- 'kdeplasma-addons-applets-previewer'
- 'kdeplasma-addons-applets-qalculate'
- 'kdeplasma-addons-applets-rememberthemilk'
- 'kdeplasma-addons-applets-rssnow'
- 'kdeplasma-addons-applets-showdashboard'
- 'kdeplasma-addons-applets-showdesktop'
- 'kdeplasma-addons-applets-social-news'
- 'kdeplasma-addons-applets-spellcheck'
- 'kdeplasma-addons-applets-systemloadviewer'
- 'kdeplasma-addons-applets-timer'
- 'kdeplasma-addons-applets-unitconverter'
- 'kdeplasma-addons-applets-weather'
- 'kdeplasma-addons-applets-weatherstation'
- 'kdeplasma-addons-applets-webslice'
- 'kdeplasma-addons-containments'
- 'kdeplasma-addons-libs'
- 'kdeplasma-addons-runners-audioplayercontrol'
- 'kdeplasma-addons-runners-browserhistory'
- 'kdeplasma-addons-runners-characters'
- 'kdeplasma-addons-runners-contacts'
- 'kdeplasma-addons-runners-converter'
- 'kdeplasma-addons-runners-datetime'
- 'kdeplasma-addons-runners-events'
- 'kdeplasma-addons-runners-katesessions'
- 'kdeplasma-addons-runners-konquerorsessions'
- 'kdeplasma-addons-runners-konsolesessions'
- 'kdeplasma-addons-runners-kopete'
- 'kdeplasma-addons-runners-mediawiki'
- 'kdeplasma-addons-runners-spellchecker'
- 'kdeplasma-addons-wallpapers-mandelbrot'
- 'kdeplasma-addons-wallpapers-marble'
- 'kdeplasma-addons-wallpapers-pattern'
- 'kdeplasma-addons-wallpapers-virus'
- 'kdeplasma-addons-wallpapers-weather')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL')
-groups=('kde' 'kdeplasma-addons')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble'
- 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('2bbf77d77e809733e6a74ff5688e6ff5487bc8bf')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdeplasma-addons-applets-bball() {
- pkgdesc='A bouncy ball for plasma'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/bball
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-binary-clock() {
- pkgdesc='Time displayed in binary format'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/binary-clock
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-blackboard() {
- pkgdesc='Black Board'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/blackboard
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bookmarks() {
- pkgdesc='Quick Access to the Bookmarks'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/bookmarks
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-bubblemon() {
- pkgdesc='A pretty bubble that monitors your system.'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/bubblemon
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-calculator() {
- pkgdesc='Calculate simple sums'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/calculator
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-charselect() {
- pkgdesc='View, select, and copy characters from a font collection'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/charselect
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-comic() {
- pkgdesc='View comic strips from the Internet'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/comic
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-community() {
- pkgdesc='Communicate using the Social Desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/community
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-dict() {
- pkgdesc='Look up the meaning of words and their translation into different languages'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/dict
- make DESTDIR=$pkgdir install
- # FIXME
- # /usr/share/icons/oxygen/scalable/apps/accessories-dictionary.svgz
- rm -rf $pkgdir/usr/share/icons
-}
-
-package_kdeplasma-addons-applets-eyes() {
- pkgdesc='XEyes clone'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/eyes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fifteenpuzzle() {
- pkgdesc='Put the pieces in order'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/fifteenPuzzle
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-filewatcher() {
- pkgdesc='Watch for changes in specified files'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/fileWatcher
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-frame() {
- pkgdesc='Display your favorite pictures'
- depends=('kdebase-workspace' 'libkexiv2')
- cd $srcdir/build/applets/frame
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-fuzzy-clock() {
- pkgdesc='Time displayed in a less precise format'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/fuzzy-clock
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-incomingmsg() {
- pkgdesc='Notification of new messages'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/incomingmsg
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kdeobservatory() {
- pkgdesc='Visualize the KDE ecosystem'
- depends=('kdebase-workspace' 'qwt')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/kdeobservatory
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kimpanel() {
- pkgdesc='A generic input method panel for Oriental languages'
- depends=('kdebase-workspace')
- optdepends=('scim: SCIM backend'
- 'fcitx: FCITX backend')
- cd $srcdir/build/applets/kimpanel
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-knowledgebase() {
- pkgdesc='Opendesktop Knowledgebase'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/knowledgebase
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-kolourpicker() {
- pkgdesc='Pick a color from the desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/kolourpicker
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konqprofiles() {
- pkgdesc='List and launch Konqueror profiles'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/konqprofiles
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-konsoleprofiles() {
- pkgdesc='List and launch Konsole profiles'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/konsoleprofiles
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-lancelot() {
- pkgdesc='Launcher to start applications'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- replaces=('lancelot')
- provides=('lancelot')
- conflicts=('lancelot')
- install='kdeplasma-addons-applets-lancelot.install'
- cd $srcdir/build/applets/lancelot
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-leavenote() {
- pkgdesc='Leave notes for users while they are away'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/leavenote
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-life() {
- pkgdesc='Life'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/life
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-luna() {
- pkgdesc='Display moon phases for your location'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/luna
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-magnifique() {
- pkgdesc='A magnification glass for the Plasma desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/magnifique
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-mediaplayer() {
- pkgdesc='Widget that can play video and sound'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/mediaplayer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-microblog() {
- pkgdesc='Update and view your microblog status.'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/microblog
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-news() {
- pkgdesc='Show news from various sources'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/news
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-notes() {
- pkgdesc='Desktop sticky notes'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/notes
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-nowplaying() {
- pkgdesc='Displays currently playing audio'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/nowplaying
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-paste() {
- pkgdesc='Paste text snippets'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/paste
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-pastebin() {
- pkgdesc='Paste text/images to a remote server'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/pastebin
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-plasmaboard() {
- pkgdesc='A virtual, on-screen keyboard'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/plasmaboard
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-previewer() {
- pkgdesc='Preview This File'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/previewer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-qalculate() {
- pkgdesc='A powerful mathematical equation solver'
- depends=('kdebase-workspace')
- install='kdeplasma-addons-applets.install'
- cd $srcdir/build/applets/qalculate
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rememberthemilk() {
- pkgdesc='Remember The Milk Todo list applet'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/rememberthemilk
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-rssnow() {
- pkgdesc='Show news from various sources'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/rssnow
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdashboard() {
- pkgdesc='Show the Plasma widget dashboard above other windows'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/showdashboard
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-showdesktop() {
- pkgdesc='Show the Plasma desktop'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/showdesktop
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-social-news() {
- pkgdesc='Stay informed with the Social Desktop'
- replaces=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
- conflicts=('kdeplasma-addons-applets-opendesktop' 'kdeplasma-addons-applets-opendesktop-activities')
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/social-news
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-spellcheck() {
- pkgdesc='Fast spell checking'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/spellcheck
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-systemloadviewer() {
- pkgdesc='Tiny CPU/RAM/Swap monitor'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/systemloadviewer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-timer() {
- pkgdesc='Countdown over a specified time period'
- depends=('kdebase-workspace')
- cd $srcdir/build/applets/timer
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-unitconverter() {
- pkgdesc='Plasmoid for converting units'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/unitconverter
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weather() {
- pkgdesc='Displays Weather information'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/weather
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-weatherstation() {
- pkgdesc='Weather reports with an LCD display style'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/weatherstation
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-applets-webslice() {
- pkgdesc='Show a part of a webpage'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/applets/webslice
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-containments() {
- pkgdesc='Activities types for Plasma shells'
- depends=('kdebase-workspace')
- cd $srcdir/build/containments
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-libs() {
- pkgdesc='Plasma Addon Library'
- depends=('kdebase-workspace')
- groups=()
- replaces=('kdeplasma-addons-dataengines')
- provides=('kdeplasma-addons-dataengines')
- conflicts=('kdeplasma-addons-dataengines')
- cd $srcdir/build/libs
- make DESTDIR=$pkgdir install
- cd $srcdir/build/dataengines
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-audioplayercontrol() {
- pkgdesc='Allows to control MPRIS audio players (it is able to search through Amarok´s collection, too)'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/audioplayercontrol
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-browserhistory() {
- pkgdesc='Searches in Konqueror´s history'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/browserhistory
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-characters() {
- pkgdesc='special Characters'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/characters
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-contacts() {
- pkgdesc='Finds entries in your address book'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/contacts
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-converter() {
- pkgdesc='Convert values to different units'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/runners/converter
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-datetime() {
- pkgdesc='The current date and time, locally or in any timezone'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/datetime
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-events() {
- pkgdesc='Calendar Events runner'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/events
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-katesessions() {
- pkgdesc='Matches Kate Sessions'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/katesessions
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konquerorsessions() {
- pkgdesc='Matches Konqueror Sessions'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/konquerorsessions
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-konsolesessions() {
- pkgdesc='Matches Konsole Sessions'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/konsolesessions
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-kopete() {
- pkgdesc='Kopete Contact runner'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/kopete
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-mediawiki() {
- pkgdesc='Search on Wikitravel'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/mediawiki
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-runners-spellchecker() {
- pkgdesc='Check the spelling of a word'
- depends=('kdebase-workspace')
- cd $srcdir/build/runners/spellchecker
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-mandelbrot() {
- pkgdesc='Mandelbrot'
- depends=('kdebase-workspace')
- cd $srcdir/build/wallpapers/mandelbrot
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-marble() {
- pkgdesc='Globe'
- depends=('kdebase-workspace' 'kdeedu-marble')
- cd $srcdir/build/wallpapers/marble
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-pattern() {
- pkgdesc='Pattern'
- depends=('kdebase-workspace')
- cd $srcdir/build/wallpapers/pattern
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-virus() {
- pkgdesc='Virus'
- depends=('kdebase-workspace')
- cd $srcdir/build/wallpapers/virus
- make DESTDIR=$pkgdir install
-}
-
-package_kdeplasma-addons-wallpapers-weather() {
- pkgdesc='Weather'
- depends=('kdebase-workspace' 'kdeplasma-addons-libs')
- cd $srcdir/build/wallpapers/weather
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install b/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
deleted file mode 100644
index ce5c32e1b..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets-lancelot.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdeplasma-addons/kdeplasma-addons-applets.install b/staging/kdeplasma-addons/kdeplasma-addons-applets.install
deleted file mode 100644
index c4ef46ba8..000000000
--- a/staging/kdeplasma-addons/kdeplasma-addons-applets.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-} \ No newline at end of file
diff --git a/staging/kdesdk-kate/PKGBUILD b/staging/kdesdk-kate/PKGBUILD
deleted file mode 100644
index 9341b1b22..000000000
--- a/staging/kdesdk-kate/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# $Id: PKGBUILD 144120 2011-12-04 09:06:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgbase=kdesdk-kate
-pkgname=('kdebase-kwrite'
- 'kdesdk-kate')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-makedepends=('kdelibs ''cmake' 'automoc4')
-source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.bz2"
- 'pkgbuild-syntax-highlight.patch')
-sha1sums=('b808f01213e0e44607e8f2577f9d1b4f88e14388'
- 'ab0c5d2a796b0f283154799add161c99f48ffcd5')
-
-build() {
- cd "${srcdir}"/kate-${pkgver}
- patch -p1 -i "${srcdir}"/pkgbuild-syntax-highlight.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../kate-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DBUILD_KTEXTEDITOR=OFF
- make
-}
-
-package_kdebase-kwrite() {
- pkgdesc="Text Editor"
- depends=('kdebase-runtime')
- groups=('kde' 'kdebase')
- install='kdebase-kwrite.install'
-
- cd "${srcdir}"/build/kwrite
- make DESTDIR="${pkgdir}" install
-
- cd "${srcdir}"/build/part
- make DESTDIR="${pkgdir}" install
-
- cd "${srcdir}"/build/doc/kwrite
- make DESTDIR="${pkgdir}" install
-}
-
-package_kdesdk-kate() {
- pkgdesc="Advanced Text Editor"
- depends=('kdebase-kwrite')
- groups=('kde' 'kdesdk')
- install='kdesdk-kate.install'
-
- cd "${srcdir}"/build/kate
- make DESTDIR="${pkgdir}" install
-
- cd "${srcdir}"/build/doc/kate
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kdesdk-kate/kdebase-kwrite.install b/staging/kdesdk-kate/kdebase-kwrite.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdesdk-kate/kdebase-kwrite.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdesdk-kate/kdesdk-kate.install b/staging/kdesdk-kate/kdesdk-kate.install
deleted file mode 100644
index 81ce5c4b0..000000000
--- a/staging/kdesdk-kate/kdesdk-kate.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch b/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch
deleted file mode 100644
index 3c43eca0f..000000000
--- a/staging/kdesdk-kate/pkgbuild-syntax-highlight.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kate-4.6.80/part/syntax/data/bash.xml~ 2011-05-23 21:20:34.295137123 +0000
-+++ kate-4.6.80/part/syntax/data/bash.xml 2011-05-23 21:20:54.581993368 +0000
-@@ -8,7 +8,7 @@
- <!ENTITY noword "(?![\w$+-])"> <!-- no word, $, + or - following -->
- <!ENTITY pathpart "([\w_@.&#37;*?+-]|\\ )"> <!-- valid character in a file name -->
- ]>
--<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-+<language name="Bash" version="2.12" kateversion="2.4" section="Scripts" extensions="*.sh;*.bash;*.ebuild;*.eclass;.bashrc;.bash_profile;.bash_login;.profile;PKGBUILD" mimetype="application/x-shellscript" casesensitive="1" author="Wilbert Berendsen (wilbert@kde.nl)" license="LGPL">
-
- <!-- (c) 2004 by Wilbert Berendsen (wilbert@kde.nl)
- Changes by Matthew Woehlke (mw_triad@users.sourceforge.net)
diff --git a/staging/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD
deleted file mode 100644
index 4b7174f41..000000000
--- a/staging/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,247 +0,0 @@
-# $Id: PKGBUILD 144180 2011-12-04 09:19:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdesdk
-pkgname=('kdesdk-cervisia'
- 'kdesdk-dolphin-plugins'
- 'kdesdk-kapptemplate'
- 'kdesdk-kcachegrind'
- 'kdesdk-kdeaccounts-plugin'
- 'kdesdk-kdepalettes'
- 'kdesdk-kioslave'
- 'kdesdk-kmtrace'
- 'kdesdk-kompare'
- 'kdesdk-kpartloader'
- 'kdesdk-kprofilemethod'
-# 'kdesdk-kspy'
- 'kdesdk-kstartperf'
- 'kdesdk-kuiviewer'
- 'kdesdk-lokalize'
- 'kdesdk-okteta'
- 'kdesdk-poxml'
-# 'kdesdk-scheck'
- 'kdesdk-scripts'
- 'kdesdk-strigi-analyzer'
- 'kdesdk-umbrello')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'subversion' 'antlr2'
- 'kdepimlibs' 'kdebase-lib')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
- 'fix-python2-path.patch')
-sha1sums=('3a0f61204653dc3f9f975732b6f67659c60ecaf3'
- 'd05ca0231869c484fd3861955d960a60aff7dcfb')
-
-build() {
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- # Fix python2 path
- patch -Np1 -i ${srcdir}/fix-python2-path.patch
- sed -i -e "s|#![ ]*/usr/bin/python$|#!/usr/bin/python2|" \
- -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \
- $(find . -name '*.py')
-
- cd ${srcdir}
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdesdk-cervisia() {
- pkgdesc='CVS Frontend'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/cervisia/"
- install='kdesdk.install'
- cd $srcdir/build/cervisia
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/cervisia
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-dolphin-plugins() {
- pkgdesc='Extra Dolphin plugins'
- depends=('kdebase-dolphin' 'subversion' 'git' 'kdesdk-kompare')
- install='kdesdk.install'
- cd $srcdir/build/dolphin-plugins/git
- make DESTDIR=$pkgdir install
- cd $srcdir/build/dolphin-plugins/svn
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kapptemplate() {
- pkgdesc='KDE Template Generator'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/kapptemplate/"
- install='kdesdk.install'
- cd $srcdir/build/kapptemplate
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kapptemplate
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kcachegrind() {
- pkgdesc='Visualization of Performance Profiling Data'
- depends=('kdebase-runtime' 'python2')
- optdepends=('php: PHP support')
- url="http://kde.org/applications/development/kcachegrind/"
- install='kdesdk.install'
- cd $srcdir/build/kcachegrind
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kcachegrind
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdeaccounts-plugin() {
- pkgdesc='KDE Repository Accounts'
- depends=('kdepim-runtime')
- cd $srcdir/build/kdeaccounts-plugin
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kdepalettes() {
- pkgdesc='Palettes for the Gimp that match the KDE standard color palette'
- optdepends=('gimp')
- install -D -m644 $srcdir/${pkgbase}-${pkgver}/kdepalettes/KDE_Gimp \
- $pkgdir/usr/share/gimp/2.0/palettes/KDE.gpl
-}
-
-package_kdesdk-kioslave() {
- pkgdesc='KDED Subversion Module'
- depends=('kdebase-runtime' 'subversion')
- cd $srcdir/build/kioslave
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kmtrace() {
- pkgdesc='A KDE tool to assist with malloc debugging using glibc´s "mtrace" functionality'
- depends=('kdebase-runtime')
- cd $srcdir/build/kmtrace
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kmtrace
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kompare() {
- pkgdesc='Diff/Patch Frontend'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/kompare/"
- install='kdesdk.install'
- cd $srcdir/build/kompare
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kompare
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kpartloader() {
- pkgdesc='A test application for KParts'
- depends=('kdebase-runtime')
- install='kdesdk.install'
- cd $srcdir/build/kpartloader
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kprofilemethod() {
- pkgdesc='Macros helping to profile'
- cd $srcdir/build/kprofilemethod
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kspy() {
- pkgdesc='An Object Inspector for Qt/KDE applications'
- depends=('kdebase-runtime')
- cd $srcdir/build/kspy
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kstartperf() {
- pkgdesc='Startup time measurement tool for KDE applications'
- depends=('kdebase-runtime')
- cd $srcdir/build/kstartperf
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kuiviewer() {
- pkgdesc='Qt Designer UI File Viewer'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/kuiviewer/"
- install='kdesdk.install'
- cd $srcdir/build/kuiviewer
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-lokalize() {
- pkgdesc='Computer-Aided Translation System'
- depends=('kdebase-runtime' 'kdebindings-python')
- url="http://kde.org/applications/development/lokalize/"
- optdepends=('translate-toolkit: enable extra python script')
- install='kdesdk.install'
- cd $srcdir/build/lokalize
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/lokalize
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-okteta() {
- pkgdesc='Hex Editor'
- depends=('kdebase-runtime')
- replaces=('kdeutils-okteta')
- conflicts=('kdeutils-okteta')
- url="http://kde.org/applications/utilities/okteta"
- install='kdesdk-okteta.install'
- cd $srcdir/build/okteta
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/okteta
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-poxml() {
- pkgdesc='Translates DocBook XML files using gettext po files'
- depends=('qt' 'antlr2')
- cd $srcdir/build/poxml
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/poxml
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scheck() {
- pkgdesc='An interface style to highlight accel and style guide conflicts'
- depends=('kdebase-runtime')
- cd $srcdir/build/scheck
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-scripts() {
- pkgdesc='KDE SDK scripts'
- depends=('python2')
- cd $srcdir/build/scripts
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/scripts
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-strigi-analyzer() {
- pkgdesc='Strigi-Analyzer for KDE SDK'
- depends=('kdelibs')
- cd $srcdir/build/strigi-analyzer
- make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-umbrello() {
- pkgdesc='UML Modeller'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/development/umbrello/"
- install='kdesdk.install'
- cd $srcdir/build/umbrello
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/umbrello
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdesdk/fix-python2-path.patch b/staging/kdesdk/fix-python2-path.patch
deleted file mode 100644
index c2c0745d1..000000000
--- a/staging/kdesdk/fix-python2-path.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree~ 2010-11-24 11:53:38.586666671 +0100
-+++ kdesdk-4.5.80/kcachegrind/converters/hotshot2calltree 2010-11-24 11:53:38.623333337 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # _*_ coding: latin1 _*_
-
- #
---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~ 2010-11-24 11:22:42.120000002 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py 2010-11-24 11:22:42.146666670 +0100
-@@ -114,7 +114,7 @@
- print >>sys.stderr, "Execution failed:", e
-
- cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname)
-- if os.name!='nt': cmd='python '+cmd
-+ if os.name!='nt': cmd='python2 '+cmd
- else: cmd=cmd.replace('/','\\')
- os.system(cmd)
-
---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~ 2010-11-24 11:24:10.853333336 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py 2010-11-24 11:24:10.883333336 +0100
-@@ -42,7 +42,7 @@
- xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf)
-
- ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0]
-- os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
-+ os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
-
- try: convert()
- except: print 'error occured'
---- kdesdk-4.5.80/scripts/rename_source_files~ 2010-11-24 11:45:41.040000004 +0100
-+++ kdesdk-4.5.80/scripts/rename_source_files 2010-11-24 11:45:41.093333336 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
- #
- # Copyright David Faure <faure@kde.org>, License LGPL v2
- #
---- kdesdk-4.5.80/scripts/svn2log.sh~ 2010-11-24 11:46:24.863333337 +0100
-+++ kdesdk-4.5.80/scripts/svn2log.sh 2010-11-24 11:46:24.896666669 +0100
-@@ -17,6 +17,6 @@
- svn cat svn://anonsvn.kde.org/home/kde/trunk/kde-common/accounts > /tmp/accounts.$PPID
-
- echo "Creating changelog...";
--svn log -v --xml $1 | python $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-+svn log -v --xml $1 | python2 $CURRENT/svn2log.py --users=/tmp/accounts.$PPID --users-charset=UTF8
-
- rm /tmp/accounts.$PPID
---- kdesdk-4.5.80/scripts/kde_generate_export_header~ 2010-11-24 11:48:49.696666669 +0100
-+++ kdesdk-4.5.80/scripts/kde_generate_export_header 2010-11-24 11:48:49.753333338 +0100
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /usr/bin/env python2
-
- import os, sys, string
-
---- kdesdk-4.5.80/scripts/reviewboarddiff~ 2010-11-24 11:49:37.686666670 +0100
-+++ kdesdk-4.5.80/scripts/reviewboarddiff 2010-11-24 11:49:37.740000003 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- # encoding: utf-8
- #
- # Generates reviewboard compatible diffs from git-svn repositories.
diff --git a/staging/kdesdk/kdesdk-okteta.install b/staging/kdesdk/kdesdk-okteta.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/staging/kdesdk/kdesdk-okteta.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdesdk/kdesdk.install b/staging/kdesdk/kdesdk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdesdk/kdesdk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdetoys/PKGBUILD b/staging/kdetoys/PKGBUILD
deleted file mode 100644
index 50dbfe8e3..000000000
--- a/staging/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 144181 2011-12-04 09:19:28Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
- 'kdetoys-kteatime'
- 'kdetoys-ktux')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdetoys')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-workspace')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('f929e598180f420d7fc6e4642ed56af9eee5a22b')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdetoys-amor() {
- pkgdesc='On-Screen Creature'
- depends=('kdebase-runtime')
- install='kdetoys.install'
- cd $srcdir/build/amor
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/amor
- make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-kteatime() {
- pkgdesc='Tea Cooker'
- depends=('kdebase-runtime')
- install='kdetoys.install'
- cd $srcdir/build/kteatime
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kteatime
- make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-ktux() {
- pkgdesc='KTux'
- depends=('kdebase-workspace' )
- install='kdetoys.install'
- cd $srcdir/build/ktux
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdetoys/kdetoys.install b/staging/kdetoys/kdetoys.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdetoys/kdetoys.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdeutils/PKGBUILD b/staging/kdeutils/PKGBUILD
deleted file mode 100644
index c5e2b8fbd..000000000
--- a/staging/kdeutils/PKGBUILD
+++ /dev/null
@@ -1,191 +0,0 @@
-# $Id: PKGBUILD 145854 2012-01-03 08:13:43Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeutils
-pkgname=('kdeutils-ark'
- 'kdeutils-filelight'
- 'kdeutils-kcalc'
- 'kdeutils-kcharselect'
- 'kdeutils-kdf'
- 'kdeutils-kfloppy'
- 'kdeutils-kgpg'
- 'kdeutils-kremotecontrol'
- 'kdeutils-ktimer'
- 'kdeutils-kwallet'
- 'kdeutils-printer-applet'
- 'kdeutils-superkaramba'
- 'kdeutils-sweeper')
-pkgver=4.7.4
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeutils')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-lib' 'kdebase-workspace'
- 'kdebindings-python' 'system-config-printer-common' 'libarchive' 'qimageblitz'
- 'qjson')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('4630f01f36558eb5494fc562086fbd4e488e411e')
-
-build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
-
- # Use Python2
- sed -i 's|/usr/bin/python|/usr/bin/python2|' \
- kcharselect/kcharselect-generate-datafile.py \
- superkaramba/examples/richtext/rtext.py
- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' \
- printer-applet/{authconn,debug,monitor,printer-applet,statereason}.py
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DPYTHON_EXECUTABLE=/usr/bin/python2
- make
-}
-
-package_kdeutils-ark() {
- pkgdesc='Archiving Tool'
- depends=('kdebase-runtime' 'kdebase-lib' 'libarchive')
- optdepends=('p7zip' 'zip' 'unzip' 'unrar')
- url="http://kde.org/applications/utilities/ark/"
- cd $srcdir/build/ark
- make DESTDIR=$pkgdir install
- cd $srcdir/build/ark/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-filelight() {
- pkgdesc='View disk usage information'
- depends=('kdebase-runtime' 'qimageblitz')
- replaces=('filelight')
- conflicts=('filelight')
- install='kdeutils.install'
- url="http://methylblue.com/filelight/"
- cd $srcdir/build/filelight
- make DESTDIR=$pkgdir install
- cd $srcdir/build/filelight/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcalc() {
- pkgdesc='Scientific Calculator'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kcalc/"
- cd $srcdir/build/kcalc
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kcalc/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kcharselect() {
- pkgdesc='Character Selector'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kcharselect/"
- cd $srcdir/build/kcharselect
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kcharselect/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kdf() {
- pkgdesc='View Disk Usage'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/kdiskfree/"
- install='kdeutils.install'
- cd $srcdir/build/kdf
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kdf/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kfloppy() {
- pkgdesc='Floppy Formatter'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kfloppy/"
- install='kdeutils.install'
- cd $srcdir/build/kfloppy
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kfloppy/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kgpg() {
- pkgdesc='A GnuPG frontend'
- depends=('kdepim-runtime' 'kde-agent')
- url="http://kde.org/applications/utilities/kgpg"
- install='kdeutils.install'
- cd $srcdir/build/kgpg
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kgpg/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kremotecontrol() {
- pkgdesc='Configure your remote controls for use with applications'
- replaces=('kdeutils-kdelirc')
- conflicts=('kdeutils-kdelirc')
- depends=('kdebase-workspace')
- url="http://kde.org/applications/utilities/kremotecontrol"
- install='kdeutils.install'
- cd $srcdir/build/kremotecontrol
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kremotecontrol/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-ktimer() {
- pkgdesc='Countdown Launcher'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/ktimer"
- install='kdeutils.install'
- cd $srcdir/build/ktimer
- make DESTDIR=$pkgdir install
- cd $srcdir/build/ktimer/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-kwallet() {
- pkgdesc='Wallet Management Tool'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/system/kwalletmanager/"
- install='kdeutils.install'
- cd $srcdir/build/kwallet
- make DESTDIR=$pkgdir install
- cd $srcdir/build/kwallet/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-printer-applet() {
- pkgdesc='System tray icon for managing print jobs'
- depends=('kdebase-runtime' 'kdebindings-python' 'system-config-printer-common')
- url="http://kde.org/applications/system/printerapplet/"
- cd $srcdir/build/printer-applet
- make DESTDIR=$pkgdir install
- cd $srcdir/build/printer-applet/doc
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-superkaramba() {
- pkgdesc='An engine for cool desktop eyecandy'
- depends=('kdebase-runtime' 'kdebindings-python' 'qimageblitz')
- url="http://kde.org/applications/utilities/superkaramba"
- install='kdeutils.install'
- cd $srcdir/build/superkaramba
- make DESTDIR=$pkgdir install
-}
-
-package_kdeutils-sweeper() {
- pkgdesc='System Cleaner'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/sweeper/"
- cd $srcdir/build/sweeper
- make DESTDIR=$pkgdir install
- cd $srcdir/build/sweeper/doc
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdeutils/kdeutils.install b/staging/kdeutils/kdeutils.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdeutils/kdeutils.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kdewebdev/PKGBUILD b/staging/kdewebdev/PKGBUILD
deleted file mode 100644
index 1ab9ce284..000000000
--- a/staging/kdewebdev/PKGBUILD
+++ /dev/null
@@ -1,67 +0,0 @@
-# $Id: PKGBUILD 144183 2011-12-04 09:19:34Z andrea $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdewebdev
-pkgname=('kdewebdev-kfilereplace'
- 'kdewebdev-kimagemapeditor'
- 'kdewebdev-klinkstatus'
- 'kdewebdev-kommander')
-pkgver=4.7.4
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdewebdev')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepim-runtime'
- 'boost')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-sha1sums=('1e37e877d4f5ec8f6dcd05e828b4a8f0fd743d2c')
-
-build() {
- cd $srcdir
- mkdir build
- cd build
- cmake ../${pkgbase}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package_kdewebdev-kfilereplace() {
- pkgdesc='Search & Replace Tool'
- depends=('kdebase-runtime')
- url="http://kde.org/applications/utilities/kfilereplace/"
- install='kdewebdev.install'
- cd $srcdir/build/kfilereplace
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kfilereplace
- make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kimagemapeditor() {
- pkgdesc='HTML Image Map Editor'
- depends=('kdebase-runtime')
- install='kdewebdev.install'
- cd $srcdir/build/kimagemapeditor
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/kimagemapeditor
- make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-klinkstatus() {
- pkgdesc='Link Checker'
- depends=('kdepim-runtime' 'tidyhtml')
- install='kdewebdev.install'
- cd $srcdir/build/klinkstatus
- make DESTDIR=$pkgdir install
- cd $srcdir/build/doc/klinkstatus
- make DESTDIR=$pkgdir install
-}
-
-package_kdewebdev-kommander() {
- pkgdesc='Executor for Kommander dialogs'
- depends=('kdebase-runtime')
- cd $srcdir/build/kommander
- make DESTDIR=$pkgdir install
-}
diff --git a/staging/kdewebdev/kdewebdev.install b/staging/kdewebdev/kdewebdev.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kdewebdev/kdewebdev.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/kwebkitpart/PKGBUILD b/staging/kwebkitpart/PKGBUILD
deleted file mode 100644
index 9c249c12e..000000000
--- a/staging/kwebkitpart/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 145154 2011-12-18 09:29:04Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kwebkitpart
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="A WebKit browser component for KDE"
-url="http://opendesktop.org/content/show.php?content=127960"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('e736d7b26cf6e3c0eed837837b3f032b')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/kwebkitpart/kwebkitpart.install b/staging/kwebkitpart/kwebkitpart.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/kwebkitpart/kwebkitpart.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/libarchive/PKGBUILD b/staging/libarchive/PKGBUILD
deleted file mode 100644
index ace8bb47e..000000000
--- a/staging/libarchive/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 145831 2012-01-02 19:21:38Z dreisner $
-# Maintainer: Dan McGee <dan@archlinux.org>
-pkgname=libarchive
-pkgver=3.0.2
-pkgrel=1
-pkgdesc="library that can create and read several streaming archive formats"
-arch=('i686' 'x86_64')
-url="http://libarchive.googlecode.com/"
-license=('BSD')
-depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz")
-md5sums=('4df33cb107c9702c80473e0794ddf833')
-sha256sums=('b27a10182f4fc3f69d01419a59ddb16fccf5df8c4b166008c04f41905e29fd74')
-
-# keep an upgrade path for older installations
-PKGEXT='.pkg.tar.gz'
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --without-xml2
- make
-}
-
-check() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # currently fails in a minor test involving atime updates (#60)
- make check || :
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -D -m644 COPYING "$pkgdir"/usr/share/licenses/libarchive/COPYING
-}
diff --git a/staging/libarchive/release-2.8-fixes.patch b/staging/libarchive/release-2.8-fixes.patch
deleted file mode 100644
index c21eeaa7b..000000000
--- a/staging/libarchive/release-2.8-fixes.patch
+++ /dev/null
@@ -1,234 +0,0 @@
-Index: build/cmake/config.h.in
-===================================================================
---- build/cmake/config.h.in (revision 3670)
-+++ build/cmake/config.h.in (revision 3737)
-@@ -1,5 +1,8 @@
- /* config.h. Generated from config.h.cmake by cmake configure */
-
-+/* Define ZLIB_WINAPI if zlib was built on Visual Studio. */
-+#cmakedefine ZLIB_WINAPI 1
-+
- /* MD5 via ARCHIVE_HASH_MD5_LIBC supported. */
- #cmakedefine ARCHIVE_HASH_MD5_LIBC
-
-Index: libarchive/archive_read_support_format_all.c
-===================================================================
---- libarchive/archive_read_support_format_all.c (revision 3670)
-+++ libarchive/archive_read_support_format_all.c (revision 3737)
-@@ -1,5 +1,5 @@
- /*-
-- * Copyright (c) 2003-2007 Tim Kientzle
-+ * Copyright (c) 2003-2011 Tim Kientzle
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
-@@ -39,5 +39,13 @@
- archive_read_support_format_tar(a);
- archive_read_support_format_xar(a);
- archive_read_support_format_zip(a);
-+
-+ /* Note: We always return ARCHIVE_OK here, even if some of the
-+ * above return ARCHIVE_WARN. The intent here is to enable
-+ * "as much as possible." Clients who need specific
-+ * compression should enable those individually so they can
-+ * verify the level of support. */
-+ /* Clear any warning messages set by the above functions. */
-+ archive_clear_error(a);
- return (ARCHIVE_OK);
- }
-Index: libarchive/archive_write_disk.c
-===================================================================
---- libarchive/archive_write_disk.c (revision 3670)
-+++ libarchive/archive_write_disk.c (revision 3737)
-@@ -1513,6 +1513,22 @@
- }
-
- #if defined(_WIN32) || defined(__CYGWIN__)
-+static int
-+guidword(const char *p, int n)
-+{
-+ int i;
-+
-+ for (i = 0; i < n; i++) {
-+ if ((*p >= '0' && *p <= '9') ||
-+ (*p >= 'a' && *p <= 'f') ||
-+ (*p >= 'A' && *p <= 'F'))
-+ p++;
-+ else
-+ return (-1);
-+ }
-+ return (0);
-+}
-+
- /*
- * 1. Convert a path separator from '\' to '/' .
- * We shouldn't check multi-byte character directly because some
-@@ -1521,26 +1537,92 @@
- * 2. Replace unusable characters in Windows with underscore('_').
- * See also : http://msdn.microsoft.com/en-us/library/aa365247.aspx
- */
--static void
-+static int
- cleanup_pathname_win(struct archive_write_disk *a)
- {
- wchar_t wc;
- char *p;
- size_t alen, l;
-
-- alen = 0;
-- l = 0;
-- for (p = a->name; *p != '\0'; p++) {
-- ++alen;
-- if (*p == '\\')
-- l = 1;
-+ p = a->name;
-+ /* Skip leading "\\.\" or "\\?\" or "\\?\UNC\" or
-+ * "\\?\Volume{GUID}\"
-+ * (absolute path prefixes used by Windows API) */
-+ if ((p[0] == '\\' || p[0] == '/') && (p[1] == '\\' || p[1] == '/' ) &&
-+ (p[2] == '.' || p[2] == '?') && (p[3] == '\\' || p[3] == '/'))
-+ {
-+ /* A path begin with "\\?\UNC\" */
-+ if (p[2] == '?' &&
-+ (p[4] == 'U' || p[4] == 'u') &&
-+ (p[5] == 'N' || p[5] == 'n') &&
-+ (p[6] == 'C' || p[6] == 'c') &&
-+ (p[7] == '\\' || p[7] == '/'))
-+ p += 8;
-+ /* A path begin with "\\?\Volume{GUID}\" */
-+ else if (p[2] == '?' &&
-+ (p[4] == 'V' || p[4] == 'v') &&
-+ (p[5] == 'O' || p[5] == 'o') &&
-+ (p[6] == 'L' || p[6] == 'l') &&
-+ (p[7] == 'U' || p[7] == 'u') &&
-+ (p[8] == 'M' || p[8] == 'm') &&
-+ (p[9] == 'E' || p[9] == 'e') &&
-+ p[10] == '{') {
-+ if (guidword(p+11, 8) == 0 && p[19] == '-' &&
-+ guidword(p+20, 4) == 0 && p[24] == '-' &&
-+ guidword(p+25, 4) == 0 && p[29] == '-' &&
-+ guidword(p+30, 4) == 0 && p[34] == '-' &&
-+ guidword(p+35, 12) == 0 && p[47] == '}' &&
-+ (p[48] == '\\' || p[48] == '/'))
-+ p += 49;
-+ else
-+ p += 4;
-+ /* A path begin with "\\.\PhysicalDriveX" */
-+ } else if (p[2] == '.' &&
-+ (p[4] == 'P' || p[4] == 'p') &&
-+ (p[5] == 'H' || p[5] == 'h') &&
-+ (p[6] == 'Y' || p[6] == 'y') &&
-+ (p[7] == 'S' || p[7] == 's') &&
-+ (p[8] == 'I' || p[8] == 'i') &&
-+ (p[9] == 'C' || p[9] == 'c') &&
-+ (p[9] == 'A' || p[9] == 'a') &&
-+ (p[9] == 'L' || p[9] == 'l') &&
-+ (p[9] == 'D' || p[9] == 'd') &&
-+ (p[9] == 'R' || p[9] == 'r') &&
-+ (p[9] == 'I' || p[9] == 'i') &&
-+ (p[9] == 'V' || p[9] == 'v') &&
-+ (p[9] == 'E' || p[9] == 'e') &&
-+ (p[10] >= '0' && p[10] <= '9') &&
-+ p[11] == '\0') {
-+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+ "Path is a physical drive name");
-+ return (ARCHIVE_FAILED);
-+ } else
-+ p += 4;
-+ }
-+
-+ /* Skip leading drive letter from archives created
-+ * on Windows. */
-+ if (((p[0] >= 'a' && p[0] <= 'z') ||
-+ (p[0] >= 'A' && p[0] <= 'Z')) &&
-+ p[1] == ':') {
-+ if (p[2] == '\0') {
-+ archive_set_error(&a->archive, ARCHIVE_ERRNO_MISC,
-+ "Path is a drive name");
-+ return (ARCHIVE_FAILED);
-+ }
-+ if (p[2] == '\\' || p[2] == '/')
-+ p += 3;
-+ }
-+
-+ for (; *p != '\0'; p++) {
- /* Rewrite the path name if its character is a unusable. */
- if (*p == ':' || *p == '*' || *p == '?' || *p == '"' ||
- *p == '<' || *p == '>' || *p == '|')
- *p = '_';
- }
-- if (alen == 0 || l == 0)
-- return;
-+ alen = p - a->name;
-+ if (alen == 0 || strchr(a->name, '\\') == NULL)
-+ return (ARCHIVE_OK);
- /*
- * Convert path separator.
- */
-@@ -1560,6 +1642,7 @@
- p += l;
- alen -= l;
- }
-+ return (ARCHIVE_OK);
- }
- #endif
-
-@@ -1583,7 +1666,8 @@
- }
-
- #if defined(_WIN32) || defined(__CYGWIN__)
-- cleanup_pathname_win(a);
-+ if (cleanup_pathname_win(a) != ARCHIVE_OK)
-+ return (ARCHIVE_FAILED);
- #endif
- /* Skip leading '/'. */
- if (*src == '/')
-Index: libarchive/archive_util.c
-===================================================================
---- libarchive/archive_util.c (revision 3670)
-+++ libarchive/archive_util.c (revision 3737)
-@@ -155,6 +155,7 @@
- {
- archive_string_empty(&a->error_string);
- a->error = NULL;
-+ a->archive_error_number = 0;
- }
-
- void
-Index: libarchive/archive_read_extract.c
-===================================================================
---- libarchive/archive_read_extract.c (revision 3670)
-+++ libarchive/archive_read_extract.c (revision 3737)
-@@ -108,7 +108,7 @@
- if (r != ARCHIVE_OK)
- /* If _write_header failed, copy the error. */
- archive_copy_error(&a->archive, ad);
-- else if (archive_entry_size(entry) > 0)
-+ else if (!archive_entry_size_is_set(entry) || archive_entry_size(entry) > 0)
- /* Otherwise, pour data into the entry. */
- r = copy_data(_a, ad);
- r2 = archive_write_finish_entry(ad);
-Index: CMakeLists.txt
-===================================================================
---- CMakeLists.txt (revision 3670)
-+++ CMakeLists.txt (revision 3737)
-@@ -154,6 +154,13 @@
- SET(HAVE_ZLIB_H 1)
- INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
- LIST(APPEND ADDITIONAL_LIBS ${ZLIB_LIBRARIES})
-+ IF(WIN32 AND NOT CYGWIN)
-+ SET(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
-+ SET(CMAKE_REQUIRED_LIBRARIES ${ZLIB_LIBRARIES})
-+ CHECK_C_SOURCE_Runs(
-+ "#ifndef ZLIB_WINAPI\n#define ZLIB_WINAPI\n#endif\n#include <zlib.h>\nint main() {uLong f = zlibCompileFlags(); return (f&(1U<<10))?0:-1; }"
-+ ZLIB_WINAPI)
-+ ENDIF(WIN32 AND NOT CYGWIN)
- ENDIF(ZLIB_FOUND)
- MARK_AS_ADVANCED(CLEAR ZLIB_INCLUDE_DIR)
- MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
-
-Property changes on: .
-___________________________________________________________________
-Modified: svn:mergeinfo
- Merged /trunk:r1989,3247,3722
-
diff --git a/staging/libkdcraw/PKGBUILD b/staging/libkdcraw/PKGBUILD
deleted file mode 100644
index a853eafd7..000000000
--- a/staging/libkdcraw/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144130 2011-12-04 09:06:32Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdcraw
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="A C++ interface used to decode RAW picture"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'lcms')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f97516a2da26da3c15075a007bec7c8f9860379b')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkdcraw/libkdcraw.install b/staging/libkdcraw/libkdcraw.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libkdcraw/libkdcraw.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/libkdeedu/PKGBUILD b/staging/libkdeedu/PKGBUILD
deleted file mode 100644
index 451bada83..000000000
--- a/staging/libkdeedu/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144128 2011-12-04 09:06:26Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkdeedu
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="Libraries used by KDE Education applications"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-replaces=('kdeedu-libkdeedu' 'kdeedu-data')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('2f508c6efa9ef9561d25578000c7d5bb5ed1c5ee')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkdeedu/libkdeedu.install b/staging/libkdeedu/libkdeedu.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libkdeedu/libkdeedu.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/libkexiv2/PKGBUILD b/staging/libkexiv2/PKGBUILD
deleted file mode 100644
index 26a20c532..000000000
--- a/staging/libkexiv2/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 144131 2011-12-04 09:06:35Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkexiv2
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="A library to manipulate pictures metadata"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('19031140c87d9d7003fef564b6927c6f69d7e3d3')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkipi/PKGBUILD b/staging/libkipi/PKGBUILD
deleted file mode 100644
index f348dfff8..000000000
--- a/staging/libkipi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144133 2011-12-04 09:12:37Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libkipi
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="An interface to use kipi-plugins from a KDE application"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('3225ac0c55f5e4fef71a8baee8d3c49efff6adbf')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libkipi/libkipi.install b/staging/libkipi/libkipi.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libkipi/libkipi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/libksane/PKGBUILD b/staging/libksane/PKGBUILD
deleted file mode 100644
index 0eb2780a1..000000000
--- a/staging/libksane/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 144134 2011-12-04 09:13:40Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=libksane
-pkgver=4.7.4
-pkgrel=1
-pkgdesc="An image scanning library"
-url="http://kde.org/"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL')
-depends=('kdelibs' 'sane')
-makedepends=('cmake' 'automoc4')
-replaces=('kdegraphics-libs')
-conflicts=('kdegraphics-libs')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('3c7a8d5b7fd80175684a0373fae26197e8158565')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/libksane/libksane.install b/staging/libksane/libksane.install
deleted file mode 100644
index e70c054ec..000000000
--- a/staging/libksane/libksane.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/opencv/PKGBUILD b/staging/opencv/PKGBUILD
deleted file mode 100644
index 99620b4cd..000000000
--- a/staging/opencv/PKGBUILD
+++ /dev/null
@@ -1,119 +0,0 @@
-# $Id: PKGBUILD 146240 2012-01-06 22:16:16Z eric $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgbase=opencv
-pkgname=('opencv' 'opencv-docs' 'opencv-samples')
-_realname=OpenCV
-pkgver=2.3.1_a
-_realver=2.3.1
-pkgrel=3
-pkgdesc="Open Source Computer Vision Library"
-arch=('i686' 'x86_64')
-license=('BSD')
-url="http://opencv.willowgarage.com/"
-depends=('jasper' 'gstreamer0.10-base' 'openexr'
- 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils')
-makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2')
-optdepends=('opencv-docs'
- 'opencv-samples'
- 'eigen2'
- 'python2-numpy: Python 2.x interface')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${_realver}a.tar.bz2")
-md5sums=('82e4b6bfa349777233eea09b075e931e')
-
-_cmakeopts=('-D CMAKE_BUILD_TYPE=Release'
- '-D CMAKE_INSTALL_PREFIX=/usr'
- '-D CMAKE_SKIP_RPATH=ON'
- '-D BUILD_TESTS=OFF'
- '-D ENABLE_SSE=ON'
- '-D ENABLE_SSE2=ON'
- '-D ENABLE_SSE3=OFF'
- '-D ENABLE_SSSE3=OFF'
- '-D ENABLE_SSE41=OFF'
- '-D ENABLE_SSE42=OFF'
- '-D BUILD_EXAMPLES=ON'
- '-D INSTALL_C_EXAMPLES=ON'
- '-D INSTALL_PYTHON_EXAMPLES=ON'
- '-D WITH_XINE=ON'
- '-D WITH_QT=OFF'
- '-D WITH_QT_OPENGL=OFF'
- '-D WITH_UNICAP=OFF'
- '-D WITH_PVAPI=OFF'
- '-D WITH_OPENNI=OFF'
- '-D WITH_TBB=OFF'
- '-D WITH_IPP=OFF'
- '-D WITH_CUDA=OFF'
- '-D USE_FAST_MATH=ON')
-
-build() {
- cd "$srcdir/$_realname-$_realver"
-
- # x64, i.e "Athlon64" and upwards, can use SSE3
- [ $CARCH = x86_64 ] && \
- _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON}
-
- cmake ${_cmakeopts[@]} .
-
- make
-}
-
-package_opencv() {
- cd "$srcdir/$_realname-$_realver"
-
- make DESTDIR="$pkgdir" install
-
- # install license file
- install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- cd "$pkgdir/usr/share"
-
- # prepare FSH-friendly dirs
- if [ -d OpenCV ]; then
- mv opencv/samples OpenCV/
- rm -r opencv
- mv OpenCV opencv
- fi
-
- # separate docs package; also be -R friendly
- [ -d opencv/doc ] && mv opencv/doc "$srcdir/opencv-doc"
-
- # separate samples package
- [ -d opencv/samples ] && mv opencv/samples "$srcdir/opencv-samples"
-}
-
-package_opencv-docs() {
- pkgdesc+=" (documentation)"
- unset depends
- unset optdepends
- options=('docs')
-
- cd "$srcdir"
-
- mkdir -p "$pkgdir/usr/share/doc"
- cp -r opencv-doc "$pkgdir/usr/share/doc/opencv"
-
- # install license file
- install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_opencv-samples() {
- pkgdesc+=" (samples)"
- depends=('bash')
- unset optdepends
- unset options
-
- cd "$srcdir"
-
- mkdir -p "$pkgdir/usr/share/opencv"
- cp -r opencv-samples "$pkgdir/usr/share/opencv/samples"
-
- # install license file
- install -Dm644 "$srcdir/$_realname-$_realver/doc/license.txt" \
- "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/staging/oxine/PKGBUILD b/staging/oxine/PKGBUILD
deleted file mode 100644
index 89f7836a7..000000000
--- a/staging/oxine/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 145923 2012-01-04 04:10:29Z eric $
-# Maintainer: Alexander Baldeck <alexander@archlinux.org>
-# Contributor: Rouslan Solomakhin <rouslan@localnet.com>
-# Contributor: dorphell <dorphell@archlinux.org>
-
-pkgname=oxine
-pkgver=0.7.1
-pkgrel=5
-pkgdesc="A lightweight, purely osd based xine frontend for set-top boxes and home entertainment systems"
-arch=('i686' 'x86_64')
-url="http://oxine.sourceforge.net/"
-license=('GPL')
-depends=('xine-lib' 'libexif' 'eject' 'libcdio' 'curl' 'libxtst')
-source=(http://downloads.sourceforge.net/sourceforge/oxine/${pkgname}-${pkgver}.tar.gz)
-md5sums=('2a2d05ee21892624e35cf539e532c0dd')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's|#include <curl/types.h>||' configure src/download.c
- ./configure --prefix=/usr --disable-hal --without-jsw --disable-extractor \
- --without-imagemagick --disable-gdkpixbuf --disable-weather
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/pyqt/PKGBUILD b/staging/pyqt/PKGBUILD
deleted file mode 100644
index 2f25ac7ed..000000000
--- a/staging/pyqt/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 145129 2011-12-17 09:34:44Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgbase=pyqt
-pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.8.6
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
- 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('9bfd7b08b8e438b83cc50d5c58191f97')
-
-build() {
- cd "${srcdir}"
- cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
- cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
- python configure.py \
- --confirm-license \
- --qsci-api
-
- # Thanks Gerardo for the rpath fix
- find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
- make
-
- ### Python2 version ###
- cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
- python2 configure.py \
- --confirm-license \
- -v /usr/share/sip \
- --qsci-api
-
- # Thanks Gerardo for the rpath fix
- find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
- make
-}
-
-package_pyqt(){
- pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
- depends=('qtwebkit' 'python-sip')
- optdepends=('phonon: enable audio and video in PyQt applications'
- 'qscintilla: QScintilla API'
- 'qt-assistant-compat: add PyQt online help in Qt Assistant')
- replaces=('python-qt')
- provides=('python-qt')
-
- cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
- # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python2-pyqt(){
- pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
- depends=('pyqt' 'python2-sip' 'dbus-python')
- optdepends=('phonon: enable audio and video in PyQt applications'
- 'python-opengl: enable OpenGL 3D graphics in PyQt applications'
- 'qscintilla: QScintilla API'
- 'qt-assistant-compat: add PyQt online help in Qt Assistant')
- replaces=('python2-qt')
- provides=('python2-qt')
- options=('!emptydirs')
-
- cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
- # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
- # Provided by pyqt
- rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
- rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
- rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
-}
diff --git a/staging/qt/PKGBUILD b/staging/qt/PKGBUILD
deleted file mode 100644
index 0ffd9d6ff..000000000
--- a/staging/qt/PKGBUILD
+++ /dev/null
@@ -1,126 +0,0 @@
-# $Id: PKGBUILD 145152 2011-12-18 05:35:52Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
- 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
- 'mysql' 'unixodbc' 'cups' 'gtk2')
-options=('!libtool')
-_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
-source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
- 'assistant.desktop' 'designer.desktop' 'linguist.desktop'
- 'qtconfig.desktop')
-md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
- 'fc211414130ab2764132e7370f8e5caa'
- '85179f5e0437514f8639957e1d8baf62'
- 'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd')
-
-build() {
- cd "${srcdir}"/${_pkgfqn}
-
- export QT4DIR="${srcdir}"/${_pkgfqn}
- export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
- sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf
- sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
- sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-
- ./configure -confirm-license -opensource \
- -prefix /usr \
- -docdir /usr/share/doc/qt \
- -plugindir /usr/lib/qt/plugins \
- -importdir /usr/lib/qt/imports \
- -datadir /usr/share/qt \
- -translationdir /usr/share/qt/translations \
- -sysconfdir /etc \
- -examplesdir /usr/share/doc/qt/examples \
- -demosdir /usr/share/doc/qt/demos \
- -plugin-sql-{psql,mysql,sqlite,odbc} \
- -system-sqlite \
- -no-phonon \
- -no-phonon-backend \
- -no-webkit \
- -graphicssystem raster \
- -openssl-linked \
- -nomake demos \
- -nomake examples \
- -nomake docs \
- -silent \
- -no-rpath \
- -optimized-qmake \
- -reduce-relocations \
- -dbus-linked \
- -no-openvg
- make
-}
-
-package_qt() {
- pkgdesc='A cross-platform application and UI framework'
- depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
- 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
- optdepends=('postgresql-libs: PostgreSQL driver'
- 'libmysqlclient: MySQL driver'
- 'unixodbc: ODBC driver'
- 'libxinerama: Xinerama support'
- 'libxcursor: Xcursor support'
- 'libxfixes: Xfixes support')
- install='qt.install'
-
- cd "${srcdir}"/${_pkgfqn}
- make INSTALL_ROOT="${pkgdir}" install
-
- # install missing icons and desktop files
- for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
- size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -p -D -m644 ${icon} \
- "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
- done
- install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \
- "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
- install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \
- "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
- install -p -D -m644 tools/designer/src/designer/images/designer.png \
- "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
- install -d "${pkgdir}/usr/share/applications"
- install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
- "${pkgdir}/usr/share/applications/"
-
- # install license addition
- install -D -m644 LGPL_EXCEPTION.txt \
- ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
- # Fix wrong path in pkgconfig files
- find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
- -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-
- # Fix wrong path in prl files
- find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-}
-
-package_qt-private-headers(){
- pkgdesc="Qt private headers for development"
- depends=("qt=${pkgver}")
-
- install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
- install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
-
- for i in QtCore QtDeclarative QtGui QtScript; do
- cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \
- "${pkgdir}"/usr/include/${i}/
- done
-
- for i in corelib declarative gui script; do
- cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
- done
-}
diff --git a/staging/qt/assistant.desktop b/staging/qt/assistant.desktop
deleted file mode 100644
index a9e98c44b..000000000
--- a/staging/qt/assistant.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Assistant
-Comment=Shows Qt documentation and examples
-Exec=/usr/bin/assistant
-Icon=assistant
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;
diff --git a/staging/qt/designer.desktop b/staging/qt/designer.desktop
deleted file mode 100644
index 9b7b6e9aa..000000000
--- a/staging/qt/designer.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Qt Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt applications
-Exec=/usr/bin/designer
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/staging/qt/linguist.desktop b/staging/qt/linguist.desktop
deleted file mode 100644
index 8cbe86599..000000000
--- a/staging/qt/linguist.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Linguist
-Comment=Add translations to Qt applications
-Exec=/usr/bin/linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/staging/qt/qt.install b/staging/qt/qt.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/staging/qt/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/staging/qt/qtconfig.desktop b/staging/qt/qtconfig.desktop
deleted file mode 100644
index 46dcf9e3d..000000000
--- a/staging/qt/qtconfig.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Config
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
diff --git a/staging/qt3/PKGBUILD b/staging/qt3/PKGBUILD
deleted file mode 100644
index a10f5f15f..000000000
--- a/staging/qt3/PKGBUILD
+++ /dev/null
@@ -1,133 +0,0 @@
-# $Id: PKGBUILD 145099 2011-12-17 01:36:17Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=qt3
-pkgver=3.3.8
-pkgrel=21
-pkgdesc="The QT3 gui toolkit"
-arch=('i686' 'x86_64')
-url="http://www.trolltech.com/products/qt/index.html"
-license=('GPL')
-depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft'
- 'libxrandr' 'libmng')
-makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3')
-optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
-options=('!libtool')
-install=qt.install
-source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2
- qt.profile qt3-png14.patch qt-copy-kde-patches.tar.bz2
- qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff
- mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
-sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7'
- 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
- 'c8ea644266f4d6d6be9adf894f03138b8eca3fc2'
- '9cb2e5bec782069692ee337cfa171539d9d73753'
- '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
- 'ca5ecb29c7f1c826d48703339a3371038e306bb7'
- 'd928ff55adb52c4bab2fb268df022651551cd70c'
- 'bb6aad81cce143c23ff7840b1d79f6b2007a0c04'
- '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17'
- '1346320614f6f86fbeb10b9fbad721dea29f5b61'
- 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f')
-
-# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
-# other qt-patches come from fedora and gentoo
-
-build() {
- unset QMAKESPEC
- export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
- export PATH=${QTDIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
- export QMAKESPEC=$QTDIR/mkspecs/linux-g++
- cd "${srcdir}"/qt-x11-free-${pkgver}
- # apply qt patches from kde.org
- for i in ../qt-copy-kde-patches/*; do
- patch -Np0 -i $i
- done
- # apply other qt patches and one security fix from debian/gentoo
- for i in ../qt-patches/*; do
- patch -Np1 -i $i
- done
- # fix utf8 bug
- patch -p0 -i "${srcdir}"/utf8-bug-qt3.diff
- # fix asia fonts
- patch -p0 -i "${srcdir}"/qt-font-default-subst.diff
- # fix segfaults on exit when using mysql DB driver
- patch -p0 -i "${srcdir}"/mysql.patch
- # fix CJK font/chars select error (FS#11245)
- patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff
- # fix build problem against new unixODBC
- patch -p1 -i "${srcdir}"/qt-odbc.patch
- # fix build with gcc 4.6.0
- patch -p1 -i "${srcdir}"/gcc-4.6.patch
-
- patch -p0 -i "${srcdir}"/qt3-png14.patch
- # start compiling qt
- sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
- rm -rf doc/html examples tutorial
- sed -i "s|sub-tutorial sub-examples||" Makefile
- sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
- sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
- sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
- sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
- sed -i "s|read acceptance|acceptance=yes|" configure
-
- # remove unwanted mkspecs
- rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
-
- if [ "$CARCH" = "x86_64" ]; then
- export ARCH="-64"
- else unset ARCH
- fi
-
- ./configure -prefix /opt/qt \
- -platform linux-g++$ARCH \
- -system-zlib \
- -qt-gif \
- -release \
- -shared \
- -sm \
- -nis \
- -thread \
- -stl \
- -system-lib{png,jpeg,mng} \
- -no-g++-exceptions \
- -plugin-sql-{mysql,psql,sqlite,odbc}
-
- # fix /opt/qt/lib path
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile
-
- cd "${srcdir}"/qt-x11-free-${pkgver}
- make -C qmake
- cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql
- "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
- cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql
- "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
-
- cd "${srcdir}"/qt-x11-free-${pkgver}
- # fix the broken makefiles
- #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
- make
-}
-
-package() {
- cd "${srcdir}"/qt-x11-free-${pkgver}
- make INSTALL_ROOT="${pkgdir}" install
- rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations}
- sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
- install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
- install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
- ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config
- rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
-
- # install man pages
- install -d -m755 "${pkgdir}"/opt/qt/man
- cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
-
- install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
- echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf
-}
diff --git a/staging/qt3/eastern_asian_languagues.diff b/staging/qt3/eastern_asian_languagues.diff
deleted file mode 100644
index 7c25eef7d..000000000
--- a/staging/qt3/eastern_asian_languagues.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200
-+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200
-@@ -966,20 +966,22 @@
-
- #ifdef Q_WS_X11
- if (script == QFont::Han) {
-- // modify script according to locale
-- static QFont::Script defaultHan = QFont::UnknownScript;
-- if (defaultHan == QFont::UnknownScript) {
-- QCString locale = setlocale(LC_ALL, NULL);
-- if (locale.contains("ko"))
-- defaultHan = QFont::Han_Korean;
-- else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
-- defaultHan = QFont::Han_TraditionalChinese;
-- else if (locale.contains("zh"))
-- defaultHan = QFont::Han_SimplifiedChinese;
-- else
-- defaultHan = QFont::Han_Japanese;
-- }
-- script = defaultHan;
-+ // modify script according to locale
-+ static QFont::Script defaultHan;
-+ QCString locale = setlocale(LC_ALL, NULL);
-+
-+ if (locale.contains("ko"))
-+ defaultHan = QFont::Han_Korean;
-+ else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
-+ defaultHan = QFont::Han_TraditionalChinese;
-+ else if (locale.contains("zh"))
-+ defaultHan = QFont::Han_SimplifiedChinese;
-+ else if (locale.contains("ja"))
-+ defaultHan = QFont::Han_Japanese;
-+ else
-+ defaultHan = QFont::Han; // don't change
-+
-+ script = defaultHan;
- }
- #endif
-
diff --git a/staging/qt3/gcc-4.6.patch b/staging/qt3/gcc-4.6.patch
deleted file mode 100644
index bcbffcea6..000000000
--- a/staging/qt3/gcc-4.6.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h
---- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600
-@@ -49,6 +49,7 @@
- #include "qvaluelist.h"
- #endif // QT_H
-
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <map>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h
---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600
-@@ -47,6 +47,7 @@
- #include "qdatastream.h"
- #endif // QT_H
-
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <list>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h
---- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600
-@@ -45,6 +45,7 @@
- #include "qdatastream.h"
- #endif // QT_H
-
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <vector>
- #endif
diff --git a/staging/qt3/mysql.patch b/staging/qt3/mysql.patch
deleted file mode 100644
index 5f61edc67..000000000
--- a/staging/qt3/mysql.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/sql/drivers/mysql/qsql_mysql.cpp
-+++ src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -37,7 +37,6 @@
- #include "qsql_mysql.h"
- #include <private/qsqlextension_p.h>
-
--#include <qapplication.h>
- #include <qdatetime.h>
- #include <qvaluevector.h>
- #include <qsqlrecord.h>
-@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
- }
-
- /////////////////////////////////////////////////////////
--static void qServerEnd()
--{
--#ifndef Q_NO_MYSQL_EMBEDDED
--# if MYSQL_VERSION_ID >= 40000
-- mysql_server_end();
--# endif // MYSQL_VERSION_ID
--#endif // Q_NO_MYSQL_EMBEDDED
--}
-
- static void qServerInit()
- {
-@@ -366,9 +357,7 @@ static void qServerInit()
- qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
- # endif
- }
-- qAddPostRoutine(qServerEnd);
- init = TRUE;
--
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
- }
-@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
- QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
- delete ext;
- }
-+#ifndef Q_NO_MYSQL_EMBEDDED
-+# if MYSQL_VERSION_ID > 40000
-+ mysql_server_end();
-+# endif
-+#endif
- }
-
- bool QMYSQLDriver::hasFeature( DriverFeature f ) const
diff --git a/staging/qt3/qt-copy-kde-patches.tar.bz2 b/staging/qt3/qt-copy-kde-patches.tar.bz2
deleted file mode 100644
index 19d899963..000000000
--- a/staging/qt3/qt-copy-kde-patches.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/staging/qt3/qt-font-default-subst.diff b/staging/qt3/qt-font-default-subst.diff
deleted file mode 100644
index 3e286f74e..000000000
--- a/staging/qt3/qt-font-default-subst.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/kernel/qfontdatabase_x11.cpp
-+++ src/kernel/qfontdatabase_x11.cpp
-@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s
- if (script == QFont::Latin)
- // add Euro character
- FcCharSetAddChar(cs, 0x20ac);
-- if (script == QFont::Han_SimplifiedChinese)
-- FcCharSetAddChar(cs, 0x3400);
-- if (script == QFont::Han_TraditionalChinese){
-- FcCharSetAddChar(cs, 0x3435);
-- FcCharSetAddChar(cs, 0xE000);
-- FcCharSetAddChar(cs, 0xF6B1);
-- }
-- if (script == QFont::MiscellaneousSymbols)
-- FcCharSetAddChar(cs, 0x2714);
- FcPatternAddCharSet(pattern, FC_CHARSET, cs);
- FcCharSetDestroy(cs);
- }
-@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c
- FcPatternPrint(pattern);
- #endif
-
-+ // XftFontMatch calls the right ConfigSubstitute variants, but as we use
-+ // FcFontMatch/Sort here we have to do it manually.
- FcConfigSubstitute(0, pattern, FcMatchPattern);
-+ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
-+
- // qDebug("1: pattern contains:");
- // FcPatternPrint(pattern);
-
-@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c
- value.u.s = (const FcChar8 *)cs.data();
- FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
- }
--#ifdef FONT_MATCH_DEBUG
-- printf("final pattern contains:\n");
-- FcPatternPrint(pattern);
--#endif
- }
-
- if (script != QFont::Unicode) {
-@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c
- if (script == QFont::Latin)
- // add Euro character
- FcCharSetAddChar(cs, 0x20ac);
-- if (script == QFont::Han_SimplifiedChinese)
-- FcCharSetAddChar(cs, 0x3400);
-- if (script == QFont::Han_TraditionalChinese) {
-- FcCharSetAddChar(cs, 0x3435);
-- FcCharSetAddChar(cs, 0xE000);
-- FcCharSetAddChar(cs, 0xF6B1);
-- }
-- if (script == QFont::MiscellaneousSymbols)
-- FcCharSetAddChar(cs, 0x2714);
- FcPatternAddCharSet(pattern, FC_CHARSET, cs);
- FcCharSetDestroy(cs);
- }
-
-+#ifdef FONT_MATCH_DEBUG
-+ printf("final pattern contains:\n");
-+ FcPatternPrint(pattern);
-+#endif
-+
- QFontEngine *fe = 0;
-
- for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
---- src/kernel/qfontdatabase.cpp
-+++ src/kernel/qfontdatabase.cpp
-@@ -554,7 +554,7 @@ static const unsigned short sample_chars
- // GeometricSymbols,
- { 0x2500, 0x0 },
- // MiscellaneousSymbols,
-- { 0x2640, 0x0 },
-+ { 0x2640, 0x2714, 0x0 },
- // EnclosedAndSquare,
- { 0x2460, 0x0 },
- // Braille,
diff --git a/staging/qt3/qt-odbc.patch b/staging/qt3/qt-odbc.patch
deleted file mode 100644
index 6f21e3cf1..000000000
--- a/staging/qt3/qt-odbc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100
-+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100
-@@ -57,13 +57,13 @@
- #endif
-
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#ifdef SQLLEN
-+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLLEN SQLLEN
- #else
- # define QSQLLEN SQLINTEGER
- #endif
-
--#ifdef SQLULEN
-+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLULEN SQLULEN
- #else
- # define QSQLULEN SQLUINTEGER
diff --git a/staging/qt3/qt-patches.tar.bz2 b/staging/qt3/qt-patches.tar.bz2
deleted file mode 100644
index 3f4aee171..000000000
--- a/staging/qt3/qt-patches.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/staging/qt3/qt.install b/staging/qt3/qt.install
deleted file mode 100644
index 6d042daae..000000000
--- a/staging/qt3/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- post_remove
-}
-
-post_upgrade() {
- post_remove
-}
-
-post_remove() {
- # this can be removed in future versions
- sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
-}
diff --git a/staging/qt3/qt.profile b/staging/qt3/qt.profile
deleted file mode 100644
index ed4d232ae..000000000
--- a/staging/qt3/qt.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export QTDIR=/opt/qt
-export QT_XFT=true
-export PATH=$PATH:$QTDIR/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
diff --git a/staging/qt3/qt3-png14.patch b/staging/qt3/qt3-png14.patch
deleted file mode 100644
index e8a194529..000000000
--- a/staging/qt3/qt3-png14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/kernel/qpngio.cpp.orig 2010-01-16 22:02:41.000000000 +0100
-+++ src/kernel/qpngio.cpp 2010-01-16 22:03:56.000000000 +0100
-@@ -159,7 +159,7 @@
- image.setColor( i, qRgba(c,c,c,0xff) );
- }
- if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
-- const int g = info_ptr->trans_values.gray;
-+ const int g = info_ptr->trans_color.gray;
- if (g < ncols) {
- image.setAlphaBuffer(TRUE);
- image.setColor(g, image.color(g) & RGB_MASK);
-@@ -187,7 +187,7 @@
- info_ptr->palette[i].red,
- info_ptr->palette[i].green,
- info_ptr->palette[i].blue,
-- info_ptr->trans[i]
-+ info_ptr->trans_alpha[i]
- )
- );
- i++;
-@@ -321,9 +321,9 @@
- png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
- if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
- QRgb trans = 0xFF000000 | qRgb(
-- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
-- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
-- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
-+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
-+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
-+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
- for (uint y=0; y<height; y++) {
- for (uint x=0; x<info_ptr->width; x++) {
- if (((uint**)jt)[y][x] == trans) {
diff --git a/staging/qt3/utf8-bug-qt3.diff b/staging/qt3/utf8-bug-qt3.diff
deleted file mode 100644
index 43e84a99f..000000000
--- a/staging/qt3/utf8-bug-qt3.diff
+++ /dev/null
@@ -1,101 +0,0 @@
---- src/codecs/qutfcodec.cpp
-+++ src/codecs/qutfcodec.cpp
-@@ -154,6 +154,7 @@
-
- class QUtf8Decoder : public QTextDecoder {
- uint uc;
-+ uint min_uc;
- int need;
- bool headerDone;
- public:
-@@ -167,8 +168,9 @@
- result.setLength( len ); // worst case
- QChar *qch = (QChar *)result.unicode();
- uchar ch;
-+ int error = -1;
- for (int i=0; i<len; i++) {
-- ch = *chars++;
-+ ch = chars[i];
- if (need) {
- if ( (ch&0xc0) == 0x80 ) {
- uc = (uc << 6) | (ch & 0x3f);
-@@ -182,6 +184,8 @@
- *qch++ = QChar(high);
- *qch++ = QChar(low);
- headerDone = TRUE;
-+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+ *qch++ = QChar::replacement;
- } else {
- if (headerDone || QChar(uc) != QChar::byteOrderMark)
- *qch++ = uc;
-@@ -190,6 +194,7 @@
- }
- } else {
- // error
-+ i = error;
- *qch++ = QChar::replacement;
- need = 0;
- }
-@@ -200,12 +205,21 @@
- } else if ((ch & 0xe0) == 0xc0) {
- uc = ch & 0x1f;
- need = 1;
-+ error = i;
-+ min_uc = 0x80;
- } else if ((ch & 0xf0) == 0xe0) {
- uc = ch & 0x0f;
- need = 2;
-+ error = i;
-+ min_uc = 0x800;
- } else if ((ch&0xf8) == 0xf0) {
- uc = ch & 0x07;
- need = 3;
-+ error = i;
-+ min_uc = 0x10000;
-+ } else {
-+ // error
-+ *qch++ = QChar::replacement;
- }
- }
- }
---- src/tools/qstring.cpp
-+++ src/tools/qstring.cpp
-@@ -5805,6 +5805,7 @@
- result.setLength( len ); // worst case
- QChar *qch = (QChar *)result.unicode();
- uint uc = 0;
-+ uint min_uc = 0;
- int need = 0;
- int error = -1;
- uchar ch;
-@@ -5822,6 +5823,12 @@
- unsigned short low = uc%0x400 + 0xdc00;
- *qch++ = QChar(high);
- *qch++ = QChar(low);
-+ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+ // overlong seqence, UTF16 surrogate or BOM
-+ i = error;
-+ qch = addOne(qch, result);
-+ *qch++ = QChar(0xdbff);
-+ *qch++ = QChar(0xde00+((uchar)utf8[i]));
- } else {
- *qch++ = uc;
- }
-@@ -5844,14 +5851,17 @@
- uc = ch & 0x1f;
- need = 1;
- error = i;
-+ min_uc = 0x80;
- } else if ((ch & 0xf0) == 0xe0) {
- uc = ch & 0x0f;
- need = 2;
- error = i;
-+ min_uc = 0x800;
- } else if ((ch&0xf8) == 0xf0) {
- uc = ch & 0x07;
- need = 3;
- error = i;
-+ min_uc = 0x10000;
- } else {
- // Error
- qch = addOne(qch, result);
diff --git a/staging/qtwebkit/PKGBUILD b/staging/qtwebkit/PKGBUILD
deleted file mode 100644
index 53666ea00..000000000
--- a/staging/qtwebkit/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 145102 2011-12-17 02:25:25Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=qtwebkit
-pkgver=2.2.0
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://trac.webkit.org/wiki/QtWebKit'
-pkgdesc='An open source web browser engine (Qt port)'
-license=('LGPL2.1' 'GPL3')
-depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base')
-makedepends=('python2' 'mesa' 'chrpath')
-conflicts=('qt<4.8')
-source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
- 'python2-path.patch')
-sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'
- 'b0ef3d5596171e3900a685df9bcfac3068ad6330')
-
-build() {
- cd "${srcdir}"/QtWebKit-${pkgver}
-
- patch -p1 -i "${srcdir}"/python2-path.patch
-
- cd Tools/Scripts
- ./build-webkit --qt \
- --prefix=/usr \
- --makeargs="${MAKEFLAGS}" \
- --release \
- --3d-canvas
-}
-
-package() {
- cd "${srcdir}"/QtWebKit-${pkgver}
- make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
-
- # Fix RPATH
- chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so
-}
diff --git a/staging/qtwebkit/python2-path.patch b/staging/qtwebkit/python2-path.patch
deleted file mode 100644
index 2e270e6fc..000000000
--- a/staging/qtwebkit/python2-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~ 2011-10-20 22:39:56.044519075 +0000
-+++ QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro 2011-10-20 22:41:21.302047082 +0000
-@@ -88,5 +88,5 @@
- retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h
- retgen.wkScript = $$PWD/create_regex_tables
- retgen.input = retgen.wkScript
--retgen.commands = python $$retgen.wkScript > ${QMAKE_FILE_OUT}
-+retgen.commands = python2 $$retgen.wkScript > ${QMAKE_FILE_OUT}
- addExtraCompiler(retgen)
---- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~ 2011-10-20 22:44:23.827225580 +0000
-+++ QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri 2011-10-20 22:44:38.550707819 +0000
-@@ -640,7 +640,7 @@
- inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl
- inspectorJSON.input = INSPECTOR_JSON
- inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl
--inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
-+inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
- inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl
- inspectorJSON.wkAddOutputToSources = false
- addExtraCompiler(inspectorJSON)
-@@ -723,7 +723,7 @@
- entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp
- entities.input = HTML_ENTITIES
- entities.wkScript = $$PWD/html/parser/create-html-entity-table
--entities.commands = python $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
-+entities.commands = python2 $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
- entities.clean = ${QMAKE_FILE_OUT}
- entities.depends = $$PWD/html/parser/create-html-entity-table
- addExtraCompiler(entities)
diff --git a/staging/unixodbc/PKGBUILD b/staging/unixodbc/PKGBUILD
deleted file mode 100644
index 263c8725b..000000000
--- a/staging/unixodbc/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 145094 2011-12-16 20:06:58Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=unixodbc
-pkgver=2.3.1
-pkgrel=1
-pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources"
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://www.unixodbc.org/"
-backup=('etc/odbc.ini' 'etc/odbcinst.ini')
-depends=('readline' 'libltdl')
-options=('!libtool')
-source=("http://www.unixodbc.org/unixODBC-$pkgver.tar.gz")
-md5sums=('86788d4006620fa1f171c13d07fdcaab')
-
-build() {
- cd ${srcdir}/unixODBC-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-
-package() {
- cd ${srcdir}/unixODBC-${pkgver}
- make DESTDIR=${pkgdir} install
-}
diff --git a/staging/xine-lib/PKGBUILD b/staging/xine-lib/PKGBUILD
deleted file mode 100644
index 6b5a80f19..000000000
--- a/staging/xine-lib/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 145907 2012-01-04 00:21:36Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-lib
-pkgver=1.2.0
-pkgrel=1
-pkgdesc="A multimedia playback engine"
-arch=('i686' 'x86_64')
-url="http://www.xine-project.org"
-license=('LGPL' 'GPL')
-depends=('libxvmc' 'ffmpeg' 'libxinerama')
-makedepends=('wavpack' 'faad2' 'libmng' 'imagemagick' 'mesa' 'libmodplug'
- 'vcdimager' 'jack' 'aalib' 'libdca' 'a52dec' 'libmad'
- 'libmpcdec' 'libcaca' 'libbluray' 'gnome-vfs')
-optdepends=('imagemagick: for using the imagemagick plugin' \
- 'jack: for using the jack plugin' \
- 'vcdimager: for using the vcd plugin' \
- 'mesa: for using the opengl plugin' \
- 'wavpack: for using the wavpack plugin' \
- 'faad2: for using the faad plugin' \
- 'libmng: for using the mng plugin' \
- 'aalib: for using the aalib plugin' \
- 'libmodplug: for using the modplug plugin' \
- 'libdca: for using the dca plugin' \
- 'a52dec: for using the a52 plugin' \
- 'libmad: for using the mp3 plugin' \
- 'libmpcdec: for using the musepack plugin' \
- 'libcaca: for using the caca plugin' \
- 'libbluray: for using the bluray plugin' \
- 'gnome-vfs: for using the gnome-vfs plugin')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('5d5385f2a0c3bb7beaba1079cd9b62c4c92a301d')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --with-wavpack --enable-vdpau --disable-optimizations
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/xine-ui/PKGBUILD b/staging/xine-ui/PKGBUILD
deleted file mode 100644
index 0a5bfc1f5..000000000
--- a/staging/xine-ui/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 145909 2012-01-04 01:24:34Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=xine-ui
-pkgver=0.99.6
-pkgrel=4
-pkgdesc="A free video player for Unix"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.xine-project.org"
-depends=('xine-lib' 'curl' 'libpng' 'libxft' 'libxxf86vm'
- 'xdg-utils' 'shared-mime-info' 'hicolor-icon-theme'
- 'desktop-file-utils' 'lirc-utils')
-makedepends=('libxt')
-options=('!strip')
-install=xine-ui.install
-source=(http://downloads.sourceforge.net/xine/${pkgname}-${pkgver}.tar.xz
- lirc-check-a89347673097.patch lirc-makefile-a68dd15ff7ae.patch
- fix_lirc.diff xine-ui-xdg.diff)
-sha1sums=('abbdb331898c14025ee6b132f63ab7d3c1b5b31e'
- 'b2df43ede3a9d1a34b80139704a4cbbc7295c584'
- '8bbd39f61de7b6991385457a4944b8ea104da88b'
- '2361df9ddad59c426b0f863414c6d527b463a38a'
- '9c70c6543dae6815710b239b4638ffe3843bac86')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- patch -p1 < "${srcdir}/lirc-check-a89347673097.patch"
- patch -p1 < "${srcdir}/lirc-makefile-a68dd15ff7ae.patch"
- patch -p1 < "${srcdir}/fix_lirc.diff"
- patch -p1 < "${srcdir}/xine-ui-xdg.diff"
- sed -i '/\#include <curl\/types.h>/d' src/xitk/download.c
- autoconf
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --with-x --enable-lirc --without-aalib --enable-debug
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" desktopdir=/usr/share/applications install
-}
diff --git a/staging/xine-ui/fix_lirc.diff b/staging/xine-ui/fix_lirc.diff
deleted file mode 100644
index 93890cb5c..000000000
--- a/staging/xine-ui/fix_lirc.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/m4/_xine.m4 b/m4/_xine.m4
---- a/m4/_xine.m4
-+++ b/m4/_xine.m4
-@@ -46,7 +46,8 @@ AC_DEFUN([AC_CHECK_LIRC],
- fi
- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
- AC_CHECK_FILE(["$llirc/liblirc_client.so"],
-- [LIRC_LIBS="$llirc/liblirc_client.so"]
-+ [LIRC_LIBS="$llirc/liblirc_client.so"
-+ found_lirc=yes]
- AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
- AC_CHECK_FILE(["$llirc/liblirc_client.a"],
- [LIRC_LIBS="$llirc/liblirc_client.a"
diff --git a/staging/xine-ui/lirc-check-a89347673097.patch b/staging/xine-ui/lirc-check-a89347673097.patch
deleted file mode 100644
index c1c8d2614..000000000
--- a/staging/xine-ui/lirc-check-a89347673097.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1268754560 0
-# Node ID a89347673097053d89675e991ab403cda04d94cd
-# Parent ed3079d668ed5291d1daf7096d6b42c90ee06e11
-Resync LIRC check with gxine; no longer fails if liblircclient0.pc is missing.
-
---- a/m4/_xine.m4 Sun Mar 14 18:04:46 2010 +0000
-+++ b/m4/_xine.m4 Tue Mar 16 15:49:20 2010 +0000
-@@ -25,14 +25,14 @@
- dnl
- AC_DEFUN([AC_CHECK_LIRC],
- [AC_ARG_ENABLE(lirc,
-- [ --disable-lirc Turn off LIRC support.],
-- [], enable_lirc=yes)
-+ [AS_HELP_STRING([--disable-lirc], [turn off LIRC support])],
-+ [given=Y], [given=N; enable_lirc=yes])
-
- found_lirc=no
- if test x"$enable_lirc" = xyes; then
- have_lirc=yes
-- PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [])
-- if test "$LIRC_CFLAGS" != ''; then
-+ PKG_CHECK_MODULES(LIRC, liblircclient0, [found_lirc=yes], [:])
-+ if test "$found_lirc" = yes; then
- LIRC_INCLUDE="$LIRC_CFLAGS"
- else
- AC_REQUIRE_CPP
-@@ -42,15 +42,20 @@
-
- if test x"$LIRC_PREFIX" != "x"; then
- lirc_libprefix="$LIRC_PREFIX/lib"
-- LIRC_INCLUDE="-I$LIRC_PREFIX/include"
-+ LIRC_INCLUDE="-I$LIRC_PREFIX/include"
- fi
- for llirc in $lirc_libprefix /lib /usr/lib /usr/local/lib; do
-- AC_CHECK_FILE(["$llirc/liblirc_client.a"],
-- [LIRC_LIBS="$llirc/liblirc_client.a"
-- found_lirc=yes],,)
-+ AC_CHECK_FILE(["$llirc/liblirc_client.so"],
-+ [LIRC_LIBS="$llirc/liblirc_client.so"]
-+ AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed]),
-+ AC_CHECK_FILE(["$llirc/liblirc_client.a"],
-+ [LIRC_LIBS="$llirc/liblirc_client.a"
-+ found_lirc=yes],,)
-+ )
- done
- else
-- AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***]);
-+ test $given = Y && AC_MSG_ERROR([LIRC client support requested but not available])
-+ AC_MSG_RESULT([*** LIRC client support not available, LIRC support will be disabled ***])
- fi
- fi
- fi
-@@ -59,7 +64,6 @@
- fi
- AC_SUBST(LIRC_LIBS)
- AC_SUBST(LIRC_INCLUDE)
-- AM_CONDITIONAL([HAVE_LIRC], [test "x$have_lirc" = "xyes"])
- ])
-
- dnl AC_C_ATTRIBUTE_ALIGNED
-
diff --git a/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch b/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch
deleted file mode 100644
index daad4f03a..000000000
--- a/staging/xine-ui/lirc-makefile-a68dd15ff7ae.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-
-# HG changeset patch
-# User Darren Salt <linux@youmustbejoking.demon.co.uk>
-# Date 1268758696 0
-# Node ID a68dd15ff7ae4be65c2ace25ef66966d7c272514
-# Parent 882c464d4a650d09da37ade366face74452c1897
-Restore definition of HAVE_LIRC for use in makefiles.
-
---- a/m4/_xine.m4 Mon Mar 15 12:03:01 2010 -0700
-+++ b/m4/_xine.m4 Tue Mar 16 16:58:16 2010 +0000
-@@ -62,6 +62,7 @@
- if test "$found_lirc" = yes; then
- AC_DEFINE([HAVE_LIRC],,[Define this if you have LIRC (liblirc_client) installed])
- fi
-+ AM_CONDITIONAL([HAVE_LIRC], [test "$found_lirc" = yes])
- AC_SUBST(LIRC_LIBS)
- AC_SUBST(LIRC_INCLUDE)
- ])
-
diff --git a/staging/xine-ui/xine-ui-xdg.diff b/staging/xine-ui/xine-ui-xdg.diff
deleted file mode 100644
index 959d674b2..000000000
--- a/staging/xine-ui/xine-ui-xdg.diff
+++ /dev/null
@@ -1,206 +0,0 @@
---- xine-ui-0.99.6.orig/src/xitk/common.h
-+++ xine-ui-0.99.6/src/xitk/common.h
-@@ -331,6 +331,5 @@ typedef struct {
- int use_root_window;
-
- int ssaver_enabled;
-- int ssaver_timeout;
-
- int skip_by_chapter;
---- xine-ui-0.99.6.orig/src/xitk/main.c
-+++ xine-ui-0.99.6/src/xitk/main.c
-@@ -1383,6 +1383,8 @@ int main(int argc, char *argv[]) {
- if (sigprocmask (SIG_BLOCK, &vo_mask, NULL))
- fprintf (stderr, "sigprocmask() failed.\n");
-
-+ signal(SIGCHLD, SIG_IGN);
-+
- gGui = (gGui_t *) calloc(1, sizeof(gGui_t));
-
- gGui->stream = NULL;
---- xine-ui-0.99.6.orig/src/xitk/panel.c
-+++ xine-ui-0.99.6/src/xitk/panel.c
-@@ -356,7 +356,6 @@ void panel_update_runtime_display(void)
- * Update slider thread.
- */
- static void *slider_loop(void *dummy) {
-- int screensaver_timer = 0;
- int status, speed;
- int pos, secs;
- int i = 0;
-@@ -441,20 +440,7 @@ static void *slider_loop(void *dummy) {
- else
- video_window_set_mrl((char *)gGui->mmk.mrl);
-
-- if(!xitk_is_window_iconified(gGui->video_display, gGui->video_window)) {
--
-- if(gGui->ssaver_timeout) {
--
-- if(!(i % 2))
-- screensaver_timer++;
--
-- if(screensaver_timer >= gGui->ssaver_timeout) {
-- screensaver_timer = 0;
-- video_window_reset_ssaver();
--
-- }
-- }
-- }
-+ video_window_suspend_ssaver(!xitk_is_window_iconified(gGui->video_display, gGui->video_window));
-
- if(gGui->logo_mode == 0) {
-
-@@ -494,6 +480,8 @@ static void *slider_loop(void *dummy) {
- stream_infos_update_infos();
-
- }
-+ } else {
-+ video_window_suspend_ssaver(0);
- }
- }
-
---- xine-ui-0.99.6.orig/src/xitk/videowin.c
-+++ xine-ui-0.99.6/src/xitk/videowin.c
-@@ -1087,6 +1087,9 @@ static void video_window_adapt_size (voi
-
- /* The old window should be destroyed now */
- if(old_video_window != None) {
-+ /* Screensaver control is tied to our window id */
-+ video_window_suspend_ssaver(0);
-+
- XDestroyWindow(gGui->video_display, old_video_window);
-
- if(gGui->cursor_grabbed)
-@@ -2261,69 +2264,34 @@ static void video_window_handle_event (X
-
- }
-
--void video_window_reset_ssaver(void) {
-+void video_window_suspend_ssaver(int do_suspend) {
-+ static int was_suspended;
-
-- if(gGui->ssaver_enabled && (xitk_get_last_keypressed_time() >= (long int) gGui->ssaver_timeout)) {
-+ do_suspend = do_suspend && gGui->ssaver_enabled;
-
--#ifdef HAVE_XTESTEXTENSION
-- if(gVw.have_xtest == True) {
--
-- gVw.fake_key_cur++;
--
-- if(gVw.fake_key_cur >= 2)
-- gVw.fake_key_cur = 0;
--
-- XLockDisplay(gGui->video_display);
-- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], True, CurrentTime);
-- XTestFakeKeyEvent(gGui->video_display, gVw.fake_keys[gVw.fake_key_cur], False, CurrentTime);
-- XSync(gGui->video_display, False);
-- XUnlockDisplay(gGui->video_display);
-+ if(was_suspended != do_suspend) {
-+ if(fork() == 0) {
-+ char window_id[30];
-+ char *args[] = { "xdg-screensaver", NULL, window_id, NULL };
-+ int fd;
-+
-+ for(fd = 3; fd < 256; fd++)
-+ close(fd);
-+
-+ args[1] = do_suspend ? "suspend" : "resume";
-+ sprintf(window_id, "%lu", (unsigned long)gGui->video_window);
-+ execvp(args[0], args);
-+ _exit(0);
- }
-- else
--#endif
-- {
-- /* Reset the gnome screensaver. Look up the command in PATH only once to save time, */
-- /* assuming its location and permission will not change during run time of xine-ui. */
-- {
-- static char *const gssaver_args[] = { "gnome-screensaver-command", "--poke", NULL };
-- static char *gssaver_path = NULL;
--
-- if(!gssaver_path) {
-- char *path = getenv("PATH");
--
-- if(!path)
-- path = "/usr/local/bin:/usr/bin";
-- do {
-- char *p, *pbuf;
-- int plen;
--
-- for(p = path; *path && *path != ':'; path++)
-- ;
-- if(p == path)
-- plen = 1, p = ".";
-- else
-- plen = path - p;
-- asprintf(&pbuf, "%.*s/%s", plen, p, gssaver_args[0]);
-- if ( access(pbuf, X_OK) ) {
-- free(pbuf);
-- gssaver_path = "";
-- } else
-- gssaver_path = pbuf;
-- } while(!gssaver_path[0] && *path++);
-- }
-- if(gssaver_path[0] && (fork() == 0)) {
-- execv(gssaver_path, gssaver_args);
-- exit(0);
-- }
-- }
-
-- XLockDisplay(gGui->video_display);
-- XResetScreenSaver(gGui->video_display);
-- XUnlockDisplay(gGui->video_display);
-- }
-+ was_suspended = do_suspend;
- }
- }
-
-+void video_window_reset_ssaver(void) {
-+ video_window_suspend_ssaver(1);
-+}
-+
- void video_window_get_frame_size(int *w, int *h) {
- if(w)
- *w = gVw.frame_width;
---- xine-ui-0.99.6.orig/src/xitk/videowin.h
-+++ xine-ui-0.99.6/src/xitk/videowin.h
-@@ -81,6 +81,7 @@ void video_window_get_mag (float *xmag,
- void video_window_update_logo(void);
- void video_window_change_skins(int);
-
-+void video_window_suspend_ssaver(int do_suspend);
- void video_window_reset_ssaver(void);
-
- void video_window_get_frame_size(int *w, int *h);
---- xine-ui-0.99.6.orig/src/xitk/event.c
-+++ xine-ui-0.99.6/src/xitk/event.c
-@@ -135,9 +135,6 @@ static void skip_by_chapter_cb(void *dat
- gGui->skip_by_chapter = cfg->num_value;
- panel_update_nextprev_tips();
- }
--static void ssaver_timeout_cb(void *data, xine_cfg_entry_t *cfg) {
-- gGui->ssaver_timeout = cfg->num_value;
--}
-
- static void visual_anim_cb(void *data, xine_cfg_entry_t *cfg) {
-
-@@ -1614,14 +1611,6 @@ void gui_init (int nfiles, char *filenam
- snapshot_loc_cb,
- CONFIG_NO_DATA);
-
-- gGui->ssaver_timeout =
-- xine_config_register_num (__xineui_global_xine_instance, "gui.screensaver_timeout", 10,
-- _("Screensaver reset interval (s)"),
-- _("Time, in seconds, between two faked events to keep a screensaver quiet, 0 to disable."),
-- CONFIG_LEVEL_ADV,
-- ssaver_timeout_cb,
-- CONFIG_NO_DATA);
--
- gGui->skip_by_chapter =
- xine_config_register_bool (__xineui_global_xine_instance, "gui.skip_by_chapter", 1,
- _("Chapter hopping"),
-
-
-
-
-
diff --git a/staging/xine-ui/xine-ui.install b/staging/xine-ui/xine-ui.install
deleted file mode 100644
index 3b3aff7d9..000000000
--- a/staging/xine-ui/xine-ui.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-mime-database usr/share/mime &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/apr-util/PKGBUILD b/testing/apr-util/PKGBUILD
deleted file mode 100644
index 987581358..000000000
--- a/testing/apr-util/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 145219 2011-12-19 18:04:03Z andrea $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=apr-util
-pkgver=1.3.12
-pkgrel=4
-pkgdesc="The Apache Portable Runtime"
-arch=('i686' 'x86_64')
-url="http://apr.apache.org/"
-depends=('apr' 'gdbm' 'expat' 'db' 'libldap' 'unixodbc')
-options=('!libtool')
-license=('APACHE')
-source=("http://www.apache.org/dist/apr/apr-util-${pkgver}.tar.bz2")
-md5sums=('0f671b037ca62751a8a7005578085560')
-
-build() {
- cd "${srcdir}/apr-util-${pkgver}"
- ./configure --prefix=/usr --with-apr=/usr \
- --without-pgsql --without-mysql --without-sqlite2 --without-sqlite3 \
- --with-berkeley-db=/usr --with-gdbm=/usr --with-ldap
- make
-}
-
-package() {
- cd "${srcdir}/apr-util-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/arora/PKGBUILD b/testing/arora/PKGBUILD
deleted file mode 100644
index cfe65b628..000000000
--- a/testing/arora/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 145213 2011-12-19 18:03:53Z andrea $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-
-pkgname=arora
-pkgver=0.11.0
-pkgrel=3
-pkgdesc='Lightweight cross-platform Web browser'
-url='http://www.arora-browser.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qtwebkit' 'desktop-file-utils')
-source=("http://${pkgname}.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-sha1sums=('480cfd7482cccbb7ece866fa10afe9acace29b31')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- qmake PREFIX='/usr' 'CONFIG-=debug' -r
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make INSTALL_ROOT="${pkgdir}" install
-}
diff --git a/testing/arora/install b/testing/arora/install
deleted file mode 100644
index 6c87527e2..000000000
--- a/testing/arora/install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/binutils/PKGBUILD b/testing/binutils/PKGBUILD
deleted file mode 100644
index 1e1c947a6..000000000
--- a/testing/binutils/PKGBUILD
+++ /dev/null
@@ -1,87 +0,0 @@
-# $Id: PKGBUILD 145694 2011-12-27 21:27:15Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils
-pkgver=2.22
-pkgrel=4
-_date=20111227
-pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('base-devel')
-depends=('glibc>=2.14' 'zlib')
-checkdepends=('dejagnu')
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-md5sums=('c2377089c15bb1a1bfaeca8d0e59dd4d')
-
-mksource() {
- mkdir ${pkgname}-${_date}
- cd ${pkgname}-${_date}
- export _TAG=binutils-2_22-branch
- export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src'
- cvs -z9 co -r $_TAG binutils || return 1
- mv src binutils
- tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/*
-}
-
-build() {
- cd ${srcdir}
- mkdir binutils-build && cd binutils-build
-
- [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
-
- ${srcdir}/binutils/configure --prefix=/usr \
- --enable-ld=default --enable-gold \
- --enable-plugins --enable-threads \
- --enable-shared $CONFIGFLAG
-
- # check the host environment and makes sure all the necessary tools are available
- make configure-host
-
- make tooldir=${pkgdir}/usr
-
- # Rebuild libiberty.a with -fPIC
- cp -a libiberty libiberty-pic
- make -C libiberty-pic clean
- make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
-
- # Rebuild libbfd.a with -fPIC
- # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
- cp -a bfd bfd-pic
- make -C bfd-pic clean
- make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
-}
-
-check() {
- cd ${srcdir}/binutils-build
-
- # do not abort on errors - manually check log files
- make -k -j1 check || true
-}
-
-package() {
- cd ${srcdir}/binutils-build
- make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-
- # Add some useful headers
- install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
- install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
-
- # install libraries rebuilt with -fPIC
- install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
- install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
-
- # Remove Windows/Novell specific man pages
- rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
-
- # Remove these symlinks, they are not ABI stable.
- # Programs should compile static to the .a file.
- rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
- echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
- echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
-}
diff --git a/testing/binutils/binutils.install b/testing/binutils/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/testing/binutils/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
-
-post_upgrade() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
diff --git a/testing/cryptsetup/PKGBUILD b/testing/cryptsetup/PKGBUILD
deleted file mode 100644
index a577c5805..000000000
--- a/testing/cryptsetup/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 145897 2012-01-03 21:19:51Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-pkgname=cryptsetup
-pkgver=1.4.1
-pkgrel=1
-pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
-arch=(i686 x86_64)
-license=('GPL')
-url="http://code.google.com/p/cryptsetup/"
-groups=('base')
-depends=('device-mapper>=2.02.85-2' 'libgcrypt' 'popt')
-conflicts=('mkinitcpio<0.7')
-options=('!libtool' '!emptydirs')
-source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
- http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
- encrypt_hook
- encrypt_install)
-sha256sums=('82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb'
- '71c6506d4b6d0b22b9b6c2a68e604959e4c072af04680ed6acc0126c97bdbc88'
- '811bbea1337106ad811731c746d73ee81039bad00aef52398e3a377ad0766757'
- 'd4380195351b70abf8fcb3cd19461879c55a7a07e4915d1f0365b295b112a573')
-build() {
- cd "${srcdir}"/$pkgname-${pkgver}
- ./configure --prefix=/usr --disable-static --sbindir=/sbin --libdir=/lib
- make
-}
-
-package() {
- cd "${srcdir}"/$pkgname-${pkgver}
- make DESTDIR="${pkgdir}" install
- # install hook
- install -D -m644 "${srcdir}"/encrypt_hook "${pkgdir}"/lib/initcpio/hooks/encrypt
- install -D -m644 "${srcdir}"/encrypt_install "${pkgdir}"/lib/initcpio/install/encrypt
- # Fix pkgconfig location
- install -d -m755 "${pkgdir}"/usr/lib
- mv "${pkgdir}"/lib/pkgconfig "${pkgdir}"/usr/lib/
-}
diff --git a/testing/cryptsetup/encrypt_hook b/testing/cryptsetup/encrypt_hook
deleted file mode 100644
index 956b18023..000000000
--- a/testing/cryptsetup/encrypt_hook
+++ /dev/null
@@ -1,148 +0,0 @@
-# vim: set ft=sh:
-# TODO this one needs some work to work with lots of different
-# encryption schemes
-run_hook ()
-{
- /sbin/modprobe -a -q dm-crypt >/dev/null 2>&1
- if [ -e "/sys/class/misc/device-mapper" ]; then
- if [ ! -e "/dev/mapper/control" ]; then
- mkdir /dev/mapper
- mknod "/dev/mapper/control" c $(cat /sys/class/misc/device-mapper/dev | sed 's|:| |')
- fi
- [ "${quiet}" = "y" ] && CSQUIET=">/dev/null"
-
- # Get keyfile if specified
- ckeyfile="/crypto_keyfile.bin"
- if [ "x${cryptkey}" != "x" ]; then
- ckdev="$(echo "${cryptkey}" | cut -d: -f1)"
- ckarg1="$(echo "${cryptkey}" | cut -d: -f2)"
- ckarg2="$(echo "${cryptkey}" | cut -d: -f3)"
- if poll_device "${ckdev}" ${rootdelay}; then
- case ${ckarg1} in
- *[!0-9]*)
- # Use a file on the device
- # ckarg1 is not numeric: ckarg1=filesystem, ckarg2=path
- mkdir /ckey
- mount -r -t ${ckarg1} ${ckdev} /ckey
- dd if=/ckey/${ckarg2} of=${ckeyfile} >/dev/null 2>&1
- umount /ckey
- ;;
- *)
- # Read raw data from the block device
- # ckarg1 is numeric: ckarg1=offset, ckarg2=length
- dd if=${ckdev} of=${ckeyfile} bs=1 skip=${ckarg1} count=${ckarg2} >/dev/null 2>&1
- ;;
- esac
- fi
- [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase."
- fi
-
- if [ -n "${cryptdevice}" ]; then
- DEPRECATED_CRYPT=0
- cryptdev="$(echo "${cryptdevice}" | cut -d: -f1)"
- cryptname="$(echo "${cryptdevice}" | cut -d: -f2)"
- cryptoptions="$(echo "${cryptdevice}" | cut -d: -f3)"
- else
- DEPRECATED_CRYPT=1
- cryptdev="${root}"
- cryptname="root"
- fi
-
- warn_deprecated() {
- echo "The syntax 'root=${root}' where '${root}' is an encrypted volume is deprecated"
- echo "Use 'cryptdevice=${root}:root root=/dev/mapper/root' instead."
- }
-
- OLDIFS="${IFS}"
- IFS=","
- for cryptopt in ${cryptoptions}; do
- case ${cryptopt} in
- allow-discards)
- echo "Enabling TRIM/discard support."
- cryptargs="${cryptargs} --allow-discards"
- ;;
- *)
- echo "Encryption option '${cryptopt}' not known, ignoring." >&2
- ;;
- esac
- done
- IFS="${OLDIFS}"
-
- if poll_device "${cryptdev}" ${rootdelay}; then
- if /sbin/cryptsetup isLuks ${cryptdev} >/dev/null 2>&1; then
- [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
- dopassphrase=1
- # If keyfile exists, try to use that
- if [ -f ${ckeyfile} ]; then
- if eval /sbin/cryptsetup --key-file ${ckeyfile} luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; then
- dopassphrase=0
- else
- echo "Invalid keyfile. Reverting to passphrase."
- fi
- fi
- # Ask for a passphrase
- if [ ${dopassphrase} -gt 0 ]; then
- echo ""
- echo "A password is required to access the ${cryptname} volume:"
-
- #loop until we get a real password
- while ! eval /sbin/cryptsetup luksOpen ${cryptdev} ${cryptname} ${cryptargs} ${CSQUIET}; do
- sleep 2;
- done
- fi
- if [ -e "/dev/mapper/${cryptname}" ]; then
- if [ ${DEPRECATED_CRYPT} -eq 1 ]; then
- export root="/dev/mapper/root"
- fi
- else
- err "Password succeeded, but ${cryptname} creation failed, aborting..."
- exit 1
- fi
- elif [ -n "${crypto}" ]; then
- [ ${DEPRECATED_CRYPT} -eq 1 ] && warn_deprecated
- msg "Non-LUKS encrypted device found..."
- if [ $# -ne 5 ]; then
- err "Verify parameter format: crypto=hash:cipher:keysize:offset:skip"
- err "Non-LUKS decryption not attempted..."
- return 1
- fi
- exe="/sbin/cryptsetup create ${cryptname} ${cryptdev} ${cryptargs}"
- tmp=$(echo "${crypto}" | cut -d: -f1)
- [ -n "${tmp}" ] && exe="${exe} --hash \"${tmp}\""
- tmp=$(echo "${crypto}" | cut -d: -f2)
- [ -n "${tmp}" ] && exe="${exe} --cipher \"${tmp}\""
- tmp=$(echo "${crypto}" | cut -d: -f3)
- [ -n "${tmp}" ] && exe="${exe} --key-size \"${tmp}\""
- tmp=$(echo "${crypto}" | cut -d: -f4)
- [ -n "${tmp}" ] && exe="${exe} --offset \"${tmp}\""
- tmp=$(echo "${crypto}" | cut -d: -f5)
- [ -n "${tmp}" ] && exe="${exe} --skip \"${tmp}\""
- if [ -f ${ckeyfile} ]; then
- exe="${exe} --key-file ${ckeyfile}"
- else
- exe="${exe} --verify-passphrase"
- echo ""
- echo "A password is required to access the ${cryptname} volume:"
- fi
- eval "${exe} ${CSQUIET}"
-
- if [ $? -ne 0 ]; then
- err "Non-LUKS device decryption failed. verify format: "
- err " crypto=hash:cipher:keysize:offset:skip"
- exit 1
- fi
- if [ -e "/dev/mapper/${cryptname}" ]; then
- if [ ${DEPRECATED_CRYPT} -eq 1 ]; then
- export root="/dev/mapper/root"
- fi
- else
- err "Password succeeded, but ${cryptname} creation failed, aborting..."
- exit 1
- fi
- else
- err "Failed to open encryption mapping: The device ${cryptdev} is not a LUKS volume and the crypto= paramater was not specified."
- fi
- fi
- rm -f ${ckeyfile}
- fi
-}
diff --git a/testing/cryptsetup/encrypt_install b/testing/cryptsetup/encrypt_install
deleted file mode 100644
index 13174ec06..000000000
--- a/testing/cryptsetup/encrypt_install
+++ /dev/null
@@ -1,26 +0,0 @@
-# vim: set ft=sh:
-
-build()
-{
- if [ -z "${CRYPTO_MODULES}" ]; then
- MODULES=" dm-crypt $(all_modules "/crypto/") "
- else
- MODULES=" dm-crypt ${CRYPTO_MODULES} "
- fi
- FILES=""
- SCRIPT="encrypt"
- [ -f "/sbin/cryptsetup" ] && add_binary "/sbin/cryptsetup" "/sbin/cryptsetup"
- [ -f "/usr/sbin/cryptsetup" ] && add_binary "/usr/sbin/cryptsetup" "/sbin/cryptsetup"
- add_binary "/sbin/dmsetup"
- add_file "/lib/udev/rules.d/10-dm.rules"
- add_file "/lib/udev/rules.d/13-dm-disk.rules"
- add_file "/lib/udev/rules.d/95-dm-notify.rules"
- add_file "/lib/initcpio/udev/11-dm-initramfs.rules" "/lib/udev/rules.d/11-dm-initramfs.rules"
-}
-
-help ()
-{
-cat<<HELPEOF
- This hook allows for an encrypted root device.
-HELPEOF
-}
diff --git a/testing/erlang/PKGBUILD b/testing/erlang/PKGBUILD
deleted file mode 100644
index b2b701fb8..000000000
--- a/testing/erlang/PKGBUILD
+++ /dev/null
@@ -1,71 +0,0 @@
-# $Id: PKGBUILD 145221 2011-12-19 18:04:05Z andrea $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
-# Contributor: Tom Burdick <thomas.burdick@wrightwoodtech.com>
-
-pkgname=erlang
-pkgver=R14B04
-pkgrel=2
-pkgdesc="A small concurrent functional programming language developed by Ericsson."
-arch=(i686 x86_64)
-url="http://www.erlang.org/index.html"
-license=('custom')
-depends=('ncurses' 'glibc')
-makedepends=('java-environment' 'perl' 'openssl' 'wxgtk' 'unixodbc>=2.3.1' 'mesa')
-optdepends=('wxgtk: for wx support' 'unixodbc: database')
-
-options=('!makeflags')
-source=(http://www.erlang.org/download/otp_src_${pkgver/./-}.tar.gz
- http://www.erlang.org/download/otp_doc_man_${pkgver/./-}.tar.gz)
-md5sums=('4b469729f103f52702bfb1fb24529dc0'
- 'f31e72518daae4007f595c0b224dd59f')
-
-# please check these deps reported by namcap when you do the next build:
-#erlang E: Dependency java-environment detected and not included (found class files usr/lib/erlang/lib/jinterface-1.5.4/priv/OtpErlang.jar, usr/lib/erlang/lib/ic-4.2.27/priv/ic.jar)
-#erlang E: Dependency mesa detected and not included (libraries ['usr/lib/libGLU.so.1'] needed in files ['usr/lib/erlang/lib/wx-0.99/priv/erl_gl.so'])
-
-
-build() {
- cd "$srcdir/otp_src_${pkgver/./-}"
- export ERTSVERSION=$(sed -n 's/^VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < erts/vsn.mk)
- export ERLINTERFACEVERSION=$(sed -n 's/^EI_VSN[ ]*=[ ]*\([0-9.]\)/\1/p' < lib/erl_interface/vsn.mk)
-
- sed -i '/SSL_DYNAMIC_ONLY=/s:no:yes:' erts/configure
-
- CFLAGS="${CFLAGS} -fno-strict-aliasing" ./configure --prefix=/usr --enable-smp-support --enable-threads -enable-native-libs
- make
-}
-
-package() {
- cd "$srcdir/otp_src_${pkgver/./-}"
- make INSTALL_PREFIX="$pkgdir" install
-
-# fix prefix
- cd "$pkgdir"
- for i in usr/lib/erlang/bin/erl \
- usr/lib/erlang/bin/start \
- usr/lib/erlang/erts-${ERTSVERSION}/bin/erl \
- usr/lib/erlang/erts-${ERTSVERSION}/bin/start \
- usr/lib/erlang/releases/RELEASES ;do
- sed -i "s#$pkgdir##" $i
- done
-
-# fix symlinks
- cd "$pkgdir/usr/lib/erlang/bin"
- ln -sf ../erts-${ERTSVERSION}/bin/epmd
-
- cd "$pkgdir/usr/bin"
- for file in *; do
- ln -sfv ../lib/erlang/bin/$file
- done
-
- ln -s ../lib/erlang/lib/erl_interface-${ERLINTERFACEVERSION}/bin/erl_call "$pkgdir/usr/bin/erl_call"
-
-# install documentation
- install -d "$pkgdir/usr/share/doc/erlang"
- install -D -m644 "$srcdir"/{COPYRIGHT,PR.template,README} "$pkgdir/usr/share/doc/erlang"
- cp -r "$srcdir/man" "$pkgdir/usr/lib/erlang"
-
- install -Dm644 "$srcdir/otp_src_${pkgver/./-}/EPLICENCE" "$pkgdir/usr/share/licenses/$pkgname/EPLICENCE"
-
-}
diff --git a/testing/fakeroot/PKGBUILD b/testing/fakeroot/PKGBUILD
deleted file mode 100644
index 966f32b38..000000000
--- a/testing/fakeroot/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 144101 2011-12-03 22:12:51Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Jochem Kossen <j.kossen@home.nl>
-
-pkgname=fakeroot
-pkgver=1.18.2
-pkgrel=1
-pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://packages.debian.org/fakeroot"
-groups=('base-devel')
-install=fakeroot.install
-depends=('glibc' 'filesystem' 'sed' 'util-linux' 'sh')
-options=('!libtool')
-source=(http://ftp.debian.org/debian/pool/main/f/${pkgname}/${pkgname}_${pkgver}.orig.tar.bz2)
-md5sums=('79f32331358ad58499704ea5e19fd0ae')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --libdir=/usr/lib/libfakeroot \
- --disable-static --with-ipc=sysv
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR=${pkgdir} install
-
- install -dm755 ${pkgdir}/etc/ld.so.conf.d/
- echo '/usr/lib/libfakeroot' > ${pkgdir}/etc/ld.so.conf.d/fakeroot.conf
-
- # install README for sysv/tcp usage
- install -Dm644 $srcdir/$pkgname-$pkgver/README $pkgdir/usr/share/doc/$pkgname/README
-}
diff --git a/testing/fakeroot/fakeroot.install b/testing/fakeroot/fakeroot.install
deleted file mode 100644
index 986c91b06..000000000
--- a/testing/fakeroot/fakeroot.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- sbin/ldconfig -r .
-}
-
-post_upgrade() {
- if [ "$(vercmp $2 1.14.4-2)" -lt 0 ]; then
- sed -i -e '/\/usr\/lib\/libfakeroot/d' etc/ld.so.conf
- fi
- sbin/ldconfig -r .
-}
-
-pre_remove() {
- sbin/ldconfig -r .
-}
diff --git a/testing/file/PKGBUILD b/testing/file/PKGBUILD
deleted file mode 100644
index ee50d610f..000000000
--- a/testing/file/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 145811 2012-01-02 01:45:52Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=file
-pkgver=5.10
-pkgrel=1
-pkgdesc="File type identification utility"
-arch=('i686' 'x86_64')
-license=('custom')
-groups=('base')
-url="http://www.darwinsys.com/file/"
-depends=('glibc' 'zlib')
-options=('!libtool')
-source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('4cea34b087b060772511e066e2038196')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's#\$(datadir)/misc#\$(datadir)#' configure
-
- ./configure --prefix=/usr --datadir=/usr/share/file
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR=${pkgdir} install
- install -dm755 ${pkgdir}/usr/share/misc
- ln -s ../file/magic.mgc ${pkgdir}/usr/share/misc
-
- install -D -m644 COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
-}
diff --git a/testing/fontforge/PKGBUILD b/testing/fontforge/PKGBUILD
deleted file mode 100644
index c5326fdd6..000000000
--- a/testing/fontforge/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 145120 2011-12-17 08:00:55Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=fontforge
-pkgver=20111214
-pkgrel=2
-pkgdesc='Outline and bitmap font editor'
-arch=('i686' 'x86_64')
-url='http://fontforge.sourceforge.net/'
-license=('BSD')
-depends=('libxkbui' 'libxi' 'libxml2' 'pango' 'giflib' 'libtiff' 'python2' 'libspiro')
-options=('!libtool' '!makeflags')
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('55c3f00c0b486492ba071fc479e1feb426562e2b')
-
-# git clone git://fontforge.git.sourceforge.net/gitroot/fontforge/fontforge; cd fontforge; git archive --prefix=${pkgname}-${pkgver}/ master | xz > ../${pkgname}-${pkgver}.tar.xz
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i 's/python /python2 /g' Makefile.dynamic.in
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --enable-type3 \
- --enable-devicetables \
- --with-regular-link \
- --with-python=python2 \
- --enable-pyextension \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/freetds/PKGBUILD b/testing/freetds/PKGBUILD
deleted file mode 100644
index c91427f2c..000000000
--- a/testing/freetds/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 11362 2010-02-09 23:57:26Z dgriffiths $
-# Contributor: Aaron Malone <aaron@munge.net>
-
-pkgname=freetds
-pkgver=0.91
-pkgrel=2
-pkgdesc='Library for accessing Sybase and MS SQL Server databases'
-url='http://www.freetds.org'
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('unixodbc')
-options=('!libtool')
-backup=('etc/freetds/freetds.conf'
- 'etc/freetds/locales.conf'
- 'etc/freetds/pool.conf')
-source=("ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b14db5823980a32f0643d1a84d3ec3ad')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --sysconfdir=/etc/freetds --mandir=/usr/share/man --enable-msdblib --with-tdsver=7.0
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/gcc/PKGBUILD b/testing/gcc/PKGBUILD
deleted file mode 100644
index f6565fe7a..000000000
--- a/testing/gcc/PKGBUILD
+++ /dev/null
@@ -1,254 +0,0 @@
-# $Id: PKGBUILD 145688 2011-12-27 10:32:51Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.6.2
-pkgrel=5
-_snapshot=4.6-20111223
-_libstdcppmanver=20111215 # Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(#ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-man.${_libstdcppmanver}.tar.bz2
- gcc_pure64.patch
- gcc-hash-style-both.patch)
-md5sums=('4755b9f6ac0abecbaa2097ed9738406a'
- '450772ce32daed97d7383199f8797f33'
- '4030ee1c08dd1e843c0225b772360e76'
- '4df25b623799b148a0703eaeec8fdf3f')
-
-if [ -n "${_snapshot}" ]; then
- _basedir="${srcdir}/gcc-${_snapshot}"
-else
- _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
- cd ${_basedir}
-
- # Do not install libiberty
- sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
- # Do not run fixincludes
- sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
- if [ "${CARCH}" = "x86_64" ]; then
- patch -Np1 -i ${srcdir}/gcc_pure64.patch
- fi
- patch -Np0 -i ${srcdir}/gcc-hash-style-both.patch
-
- echo ${pkgver} > gcc/BASE-VER
-
- cd ${srcdir}
- mkdir gcc-build && cd gcc-build
-
- ${_basedir}/configure --prefix=/usr \
- --libdir=/usr/lib --libexecdir=/usr/lib \
- --mandir=/usr/share/man --infodir=/usr/share/info \
- --with-bugurl=https://bugs.archlinux.org/ \
- --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
- --enable-shared --enable-threads=posix \
- --with-system-zlib --enable-__cxa_atexit \
- --disable-libunwind-exceptions --enable-clocale=gnu \
- --enable-gnu-unique-object --enable-linker-build-id \
- --with-ppl --enable-cloog-backend=isl \
- --enable-lto --enable-gold --enable-ld=default \
- --enable-plugin --with-plugin-ld=ld.gold \
- --disable-multilib --disable-libssp --disable-libstdcxx-pch \
- --enable-checking=release
- make
-}
-
-check() {
- cd gcc-build
-
- # increase stack size to prevent test failures
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
- ulimit -s 32768
-
- # do not abort on error as some are "expected"
- make -k check || true
- ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs()
-{
- pkgdesc="Runtime libraries shipped by GCC"
- groups=('base')
- depends=('glibc>=2.14')
- install=gcc-libs.install
-
- cd gcc-build
- make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
- for lib in libmudflap libgomp libstdc++-v3/src; do
- make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
- done
- make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
- make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
-
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=${pkgdir} install-target-libgfortran
- make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
- # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
- rm -rf ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
- # remove static libraries
- find ${pkgdir} -name *.a -delete
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc()
-{
- pkgdesc="The GNU Compiler Collection - C and C++ frontends"
- depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl')
- groups=('base-devel')
- install=gcc.install
-
- cd gcc-build
-
- # unfortunately it is much, much easier to install the lot and clean-up the mess...
- make -j1 DESTDIR=${pkgdir} install
- rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
- rm $pkgdir/usr/lib/*.so*
- rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
- rm $pkgdir/usr/lib/libgfortran.spec
- rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1,libgfortranbegin.a}
- rm -r $pkgdir/usr/lib/go
- rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath}.info
- rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
- rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
- rm $pkgdir/usr/share/man/man3/ffi*
-
- # many packages require these symlinks
- install -dm755 ${pkgdir}/lib
- ln -sf /usr/bin/cpp ${pkgdir}/lib/cpp
- ln -sf gcc ${pkgdir}/usr/bin/cc
- ln -sf g++ ${pkgdir}/usr/bin/c++
-
- # install gengtype for plugin support
- install -m755 gcc/build/gengtype $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
- install -m644 gcc/gtype.state $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/
-
- # POSIX conformance launcher scripts for c89 and c99
- cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
- case "$opt" in
- -ansi|-std=c89|-std=iso9899:1990) fl="";;
- -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
- case "$opt" in
- -std=c99|-std=iso9899:1999) fl="";;
- -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- chmod 755 $pkgdir/usr/bin/c{8,9}9
-
- # install the libstdc++ man pages
- install -dm755 ${pkgdir}/usr/share/man/man3
- install -m644 ${srcdir}/man3/* ${pkgdir}/usr/share/man/man3/
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran()
-{
- pkgdesc="Fortran front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-fortran.install
-
- cd gcc-build
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=$pkgdir install-target-libgfortran
- make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
- make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
- install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
- rm ${pkgdir}/usr/share/info/libquadmath.info
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc()
-{
- pkgdesc="Objective-C front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libobjc
- install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
- install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib/libobjc.so*
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada()
-{
- pkgdesc="Ada front-end for GCC (GNAT)"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-ada.install
-
- cd gcc-build/gcc
- make -j1 DESTDIR=$pkgdir ada.install-{common,info}
- install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go()
-{
- pkgdesc="Go front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-go.install
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libgo
- make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
- install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/testing/gcc/gcc-ada.install b/testing/gcc/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/testing/gcc/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/gcc/gcc-fortran.install b/testing/gcc/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/testing/gcc/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/testing/gcc/gcc-go.install b/testing/gcc/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/testing/gcc/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/gcc/gcc-hash-style-both.patch b/testing/gcc/gcc-hash-style-both.patch
deleted file mode 100644
index 8b59f4535..000000000
--- a/testing/gcc/gcc-hash-style-both.patch
+++ /dev/null
@@ -1,122 +0,0 @@
---- gcc/config/alpha/linux-elf.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/alpha/linux-elf.h 2011-03-11 10:01:47.770000457 +1000
-@@ -41,7 +41,7 @@
-
- #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER
-
--#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \
-+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \
- %{O*:-O3} %{!O*:-O1} \
- %{shared:-shared} \
- %{!shared: \
---- gcc/config/i386/linux64.h.orig 2011-03-03 08:35:36.000000000 +1000
-+++ gcc/config/i386/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -78,7 +78,7 @@
- %{!mno-sse2avx:%{mavx:-msse2avx}} %{msse2avx:%{!mavx:-msse2avx}}"
-
- #undef LINK_SPEC
--#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \
-+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/i386/linux.h.orig 2011-01-15 04:45:06.000000000 +1000
-+++ gcc/config/i386/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -104,7 +104,7 @@
- { "dynamic_linker", LINUX_DYNAMIC_LINKER }
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \
-+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/ia64/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/ia64/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -64,7 +64,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "\
-+#define LINK_SPEC "--hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{!static: \
---- gcc/config/rs6000/linux64.h.orig 2011-02-11 03:30:10.000000000 +1000
-+++ gcc/config/rs6000/linux64.h 2011-03-11 10:03:34.280000457 +1000
-@@ -389,11 +389,11 @@
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64)
-
-
--#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}"
-
--#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}"
-
---- gcc/config/rs6000/sysv4.h.orig 2011-01-28 04:36:03.000000000 +1000
-+++ gcc/config/rs6000/sysv4.h 2011-03-11 10:01:47.773333792 +1000
-@@ -830,7 +830,7 @@
- #define LINUX_DYNAMIC_LINKER \
- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
-
--#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \
-+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \
- %{rdynamic:-export-dynamic} \
- -dynamic-linker " LINUX_DYNAMIC_LINKER "}}"
-
---- gcc/config/s390/linux.h.orig 2010-12-09 23:27:07.000000000 +1000
-+++ gcc/config/s390/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -77,7 +77,7 @@
-
- #undef LINK_SPEC
- #define LINK_SPEC \
-- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \
-+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \
- %{shared:-shared} \
- %{!shared: \
- %{static:-static} \
---- gcc/config/sparc/linux64.h.orig 2011-02-17 23:57:21.000000000 +1000
-+++ gcc/config/sparc/linux64.h 2011-03-11 10:01:47.770000457 +1000
-@@ -113,7 +113,7 @@
- { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
- { "link_arch", LINK_ARCH_SPEC },
-
--#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
-+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,%R/usr/lib %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -121,7 +121,7 @@
- %{static:-static}} \
- "
-
--#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
-@@ -193,7 +193,7 @@
- #else /* !SPARC_BI_ARCH */
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
-+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,%R/usr/lib64 %{shared:-shared} \
- %{!shared: \
- %{!static: \
- %{rdynamic:-export-dynamic} \
---- gcc/config/sparc/linux.h.orig 2011-01-27 06:30:12.000000000 +1000
-+++ gcc/config/sparc/linux.h 2011-03-11 10:01:47.770000457 +1000
-@@ -74,7 +74,7 @@
- #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
-
- #undef LINK_SPEC
--#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
-+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \
- %{!mno-relax:%{!r:-relax}} \
- %{!shared: \
- %{!static: \
diff --git a/testing/gcc/gcc-libs.install b/testing/gcc/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/testing/gcc/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/gcc/gcc-pr49720.patch b/testing/gcc/gcc-pr49720.patch
deleted file mode 100644
index 8f50c4120..000000000
--- a/testing/gcc/gcc-pr49720.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- trunk/gcc/simplify-rtx.c 2011/10/28 05:55:10 180603
-+++ trunk/gcc/simplify-rtx.c 2011/10/28 06:35:31 180604
-@@ -4352,10 +4352,20 @@
- {
- rtx x = XEXP (op0, 0);
- rtx c = XEXP (op0, 1);
-+ enum rtx_code invcode = op0code == PLUS ? MINUS : PLUS;
-+ rtx tem = simplify_gen_binary (invcode, cmp_mode, op1, c);
-
-- c = simplify_gen_binary (op0code == PLUS ? MINUS : PLUS,
-- cmp_mode, op1, c);
-- return simplify_gen_relational (code, mode, cmp_mode, x, c);
-+ /* Detect an infinite recursive condition, where we oscillate at this
-+ simplification case between:
-+ A + B == C <---> C - B == A,
-+ where A, B, and C are all constants with non-simplifiable expressions,
-+ usually SYMBOL_REFs. */
-+ if (GET_CODE (tem) == invcode
-+ && CONSTANT_P (x)
-+ && rtx_equal_p (c, XEXP (tem, 1)))
-+ return NULL_RTX;
-+
-+ return simplify_gen_relational (code, mode, cmp_mode, x, tem);
- }
-
- /* (ne:SI (zero_extract:SI FOO (const_int 1) BAR) (const_int 0))) is
diff --git a/testing/gcc/gcc.install b/testing/gcc/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/testing/gcc/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/gcc/gcc_pure64.patch b/testing/gcc/gcc_pure64.patch
deleted file mode 100644
index 8c0baf8e2..000000000
--- a/testing/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
---- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400
-@@ -49,8 +49,8 @@
- When the -shared link option is used a final link is not being
- done. */
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
-
- #undef LINK_SPEC
- #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
-diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
---- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400
-+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400
-@@ -6,7 +6,7 @@
-
- MULTILIB_OPTIONS = m64/m32
- MULTILIB_DIRNAMES = 64 32
--MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = ../lib ../lib32
-
- LIBGCC = stmp-multilib
- INSTALL_LIBGCC = install-multilib
diff --git a/testing/ghc/PKGBUILD b/testing/ghc/PKGBUILD
deleted file mode 100644
index aef26d06e..000000000
--- a/testing/ghc/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 142984 2011-11-19 18:41:40Z vesa $
-# Maintainer: Vesa Kaihlavirta <vesa@archlinux.org>
-# Special note for devs looking to upgrade this package:
-# ghc places a unique hash for each library when it is built.
-# Libraries depend on versions specified by those hashes.
-# This implies that all libraries need to be rebuilt when ghc is rebuilt.
-# Also, due to dependency loop problems, haskell-ghc-paths and haddock
-# do not carry version dependencies. You will have to remember to build them too.
-pkgname=ghc
-pkgver=7.2.2
-pkgrel=1
-pkgdesc="The Glasgow Haskell Compiler"
-arch=(i686 x86_64)
-url="http://www.haskell.org/ghc/"
-license=("custom")
-depends=('perl' 'gmp>=5.0' gcc)
-makedepends=(ghc happy perl libxslt docbook-xsl)
-install=ghc.install
-options=(!strip)
-groups=(haskell)
-source=("http://www.haskell.org/ghc/dist/$pkgver/ghc-$pkgver-src.tar.bz2"
- build.mk)
-
-build() {
- cd $srcdir/$pkgname-$pkgver
-
- cp $srcdir/build.mk mk/build.mk
-
- ./configure --prefix=/usr
- make -j1 || return 1
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
-
- make DESTDIR=$pkgdir install
-
- install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/ghc/license
- install -d $pkgdir/usr/share/haskell
-}
-
-md5sums=('fa19d9fe5049b7a1352b0b7c9880c141'
- '5a3e0880c80b1dcecf779ff2e63a9c0d')
diff --git a/testing/ghc/build.mk b/testing/ghc/build.mk
deleted file mode 100644
index f918a0f16..000000000
--- a/testing/ghc/build.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-# -----------------------------------------------------------------------------
-# A Sample build.mk
-#
-# Uncomment one of the following BuildFlavour settings to get the desired
-# overall build type, and then tweak the options in the relevant section
-# below.
-
-# Uncomment one of these to select a build profile below:
-
-# Full build with max optimisation (slow build)
-BuildFlavour = perf
-
-# Fastest build (libs unoptimised):
-#BuildFlavour = quickest
-
-# Fast build with optimised libraries:
-#BuildFlavour = quick
-
-# Profile the stage2 compiler:
-#BuildFlavour = prof
-
-# A development build, working on the stage 1 compiler:
-#BuildFlavour = devel1
-
-# A development build, working on the stage 2 compiler:
-#BuildFlavour = devel2
-
-GhcLibWays = v
-
-# -------- 1. A Performance/Distribution build--------------------------------
-
-ifeq "$(BuildFlavour)" "perf"
-
-# perf matches the default settings, repeated here for comparison:
-
-SRC_HC_OPTS = -O -H64m
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O2 -fasm
-GhcHcOpts = -Rghc-timing
-GhcLibHcOpts = -O2 -XGenerics
-GhcLibWays += p
-
-ifeq "$(PlatformSupportsSharedLibs)" "YES"
-GhcLibWays += dyn
-endif
-
-endif
-
-# -------- A Fast build ------------------------------------------------------
-
-ifeq "$(BuildFlavour)" "quickest"
-
-SRC_HC_OPTS = -H64m -O0 -fasm
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O0 -fasm
-GhcLibHcOpts = -O0 -fasm
-SplitObjs = NO
-HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
-
-endif
-
-# -------- A Fast build with optimised libs ----------------------------------
-
-ifeq "$(BuildFlavour)" "quick"
-
-SRC_HC_OPTS = -H64m -O0 -fasm
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O0 -fasm
-GhcLibHcOpts = -O -fasm
-SplitObjs = NO
-HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
-
-endif
-
-# -------- Profile the stage2 compiler ---------------------------------------
-
-ifeq "$(BuildFlavour)" "prof"
-
-SRC_HC_OPTS = -H64m -O0 -fasm
-GhcStage1HcOpts = -O -fasm
-GhcStage2HcOpts = -O -fasm
-GhcLibHcOpts = -O -fasm
-
-GhcLibWays += p
-GhcProfiled = YES
-
-SplitObjs = NO
-HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
-
-endif
-
-
-# -------- A Development build (stage 1) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel1"
-
-SRC_HC_OPTS = -H64m -O -fasm
-GhcLibHcOpts = -O -dcore-lint
-GhcStage1HcOpts = -Rghc-timing -O0 -DDEBUG
-GhcStage2HcOpts = -Rghc-timing -O -fasm
-SplitObjs = NO
-HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
-
-endif
-
-# -------- A Development build (stage 2) -------------------------------------
-
-ifeq "$(BuildFlavour)" "devel2"
-
-SRC_HC_OPTS = -H64m -O -fasm
-GhcLibHcOpts = -O -dcore-lint
-GhcStage1HcOpts = -Rghc-timing -O -fasm
-GhcStage2HcOpts = -Rghc-timing -O0 -DDEBUG
-SplitObjs = NO
-HADDOCK_DOCS = NO
-BUILD_DOCBOOK_HTML = NO
-BUILD_DOCBOOK_PS = NO
-BUILD_DOCBOOK_PDF = NO
-
-endif
-
-# -----------------------------------------------------------------------------
-# Other settings that might be useful
-
-# profiled RTS
-#GhcRtsCcOpts = -pg -g
-
-# Optimised/profiled RTS
-#GhcRtsCcOpts = -O2 -pg
-
-#GhcRtsWithFrontPanel = YES
-#SRC_HC_OPTS += `gtk-config --libs`
-
-# NoFib settings
-NoFibWays =
-STRIP=:
-
-
diff --git a/testing/ghc/ghc.install b/testing/ghc/ghc.install
deleted file mode 100644
index 7d56083bc..000000000
--- a/testing/ghc/ghc.install
+++ /dev/null
@@ -1,19 +0,0 @@
-pkgname=ghc
-
-pre_upgrade() {
- cat << EOF
- ==> Unregistering cabalized packages...
-EOF
- cd /usr/share/haskell/ && (for a in *; do ghc-pkg unregister --force $a &> /dev/null; done; cd - > /dev/null )
- cat << EOF
- ==> Done.
-EOF
-
-}
-
-post_upgrade() {
- cat << EOF
- ==> All cabalized and yaourt-installed packages need to be reinstalled now.
- ==> See /usr/share/haskell/ and ghc-pkg list --user for a tentative list of affected packages.
-EOF
-}
diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD
deleted file mode 100644
index 58ba21ef3..000000000
--- a/testing/glibc/PKGBUILD
+++ /dev/null
@@ -1,213 +0,0 @@
-# $Id: PKGBUILD 145765 2011-12-30 08:17:48Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: valgrind requires rebuilt with each major glibc version
-
-pkgname=glibc
-pkgver=2.15
-pkgrel=3
-_glibcdate=20111227
-pkgdesc="GNU C Library"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL' 'LGPL')
-groups=('base')
-depends=('linux-api-headers>=3.1.6' 'tzdata')
-makedepends=('gcc>=4.6')
-backup=(etc/gai.conf
- etc/locale.gen
- etc/nscd.conf)
-options=('!strip')
-install=glibc.install
-source=(ftp://ftp.archlinux.org/other/glibc/${pkgname}-${pkgver}_${_glibcdate}.tar.xz
- glibc-2.10-dont-build-timezone.patch
- glibc-2.10-bz4781.patch
- glibc-__i686.patch
- glibc-2.12.2-ignore-origin-of-privileged-program.patch
- glibc-2.14-libdl-crash.patch
- glibc-2.14-revert-4768ae77.patch
- glibc-2.14-reexport-rpc-interface.patch
- glibc-2.14-reinstall-nis-rpc-headers.patch
- glibc-2.15-lddebug-scopes.patch
- glibc-2.15-revert-c5a0802a.patch
- glibc-2.15-math64crash.patch
- nscd
- locale.gen.txt
- locale-gen)
-md5sums=('6ffdf5832192b92f98bdd125317c0dfc'
- '4dadb9203b69a3210d53514bb46f41c3'
- '0c5540efc51c0b93996c51b57a8540ae'
- '40cd342e21f71f5e49e32622b25acc52'
- 'b042647ea7d6f22ad319e12e796bd13e'
- '6970bcfeb3bf88913436d5112d16f588'
- '7da8c554a3b591c7401d7023b1928afc'
- 'c5de2a946215d647c8af5432ec4b0da0'
- '55febbb72139ac7b65757df085024b83'
- '3c219ddfb619b6df903cac4cc42c611d'
- '7ae3e426251ae33e73dbad71f9c91378'
- 'dc7550e659ddd685bd78a930d15a01f2'
- 'b587ee3a70c9b3713099295609afde49'
- '07ac979b6ab5eeb778d55f041529d623'
- '476e9113489f93b348b21e144b6a8fcf')
-
-mksource() {
- git clone git://sourceware.org/git/glibc.git
- pushd glibc
- #git checkout -b glibc-2.15-arch origin/release/2.15/master
- git checkout -b glibc-2.15-arch origin/master
- popd
- tar -cvJf glibc-${pkgver}_${_glibcdate}.tar.xz glibc/*
-}
-
-build() {
- cd ${srcdir}/glibc
-
- # timezone data is in separate package (tzdata)
- patch -Np1 -i ${srcdir}/glibc-2.10-dont-build-timezone.patch
-
- # http://sources.redhat.com/bugzilla/show_bug.cgi?id=4781
- patch -Np1 -i ${srcdir}/glibc-2.10-bz4781.patch
-
- # http://sources.redhat.com/bugzilla/show_bug.cgi?id=411
- # http://sourceware.org/ml/libc-alpha/2009-07/msg00072.html
- patch -Np1 -i ${srcdir}/glibc-__i686.patch
-
- # http://www.exploit-db.com/exploits/15274/
- # http://sourceware.org/git/?p=glibc.git;a=patch;h=d14e6b09 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.12.2-ignore-origin-of-privileged-program.patch
-
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=675155e9 (only fedora branch...)
- # http://sourceware.org/ml/libc-alpha/2011-06/msg00006.html
- patch -Np1 -i ${srcdir}/glibc-2.14-libdl-crash.patch
-
- # Revert commit causing issues with crappy DNS servers...
- # Will be removed when workaround becomes annoying to maintain - USE A BETTER DNS SERVER!
- # Note that both these patches appear not to fix the issue completely:
- # http://sourceware.org/bugzilla/show_bug.cgi?id=13013
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=032c0ee3 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-revert-4768ae77.patch
-
- # re-export RPC interface until libtirpc is ready as a replacement
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=acee4873 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-reexport-rpc-interface.patch
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=bdd816a3 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.14-reinstall-nis-rpc-headers.patch
-
- # propriety nvidia crash - https://bugzilla.redhat.com/show_bug.cgi?id=737223
- # http://sourceware.org/git/?p=glibc.git;a=commitdiff;h=0c95ab64 (only fedora branch...)
- patch -Np1 -i ${srcdir}/glibc-2.15-lddebug-scopes.patch
-
- # revert commit c5a0802a - causes various hangs
- # https://bugzilla.redhat.com/show_bug.cgi?id=769421
- patch -Np1 -i ${srcdir}/glibc-2.15-revert-c5a0802a.patch
-
- # revert optimized math routines that can cause crashes (FS#27736, FS#27743)
- # obviously not a real fix...
- patch -Np1 -i ${srcdir}/glibc-2.15-math64crash.patch
-
- install -dm755 ${pkgdir}/etc
- touch ${pkgdir}/etc/ld.so.conf
-
- cd ${srcdir}
- mkdir glibc-build
- cd glibc-build
-
- if [[ ${CARCH} = "i686" ]]; then
- # Hack to fix NPTL issues with Xen, only required on 32bit platforms
- export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs"
- fi
-
- echo "slibdir=/lib" >> configparms
-
- # remove hardening options from CFLAGS for building libraries
- CFLAGS=${CFLAGS/-fstack-protector/}
- CFLAGS=${CFLAGS/-D_FORTIFY_SOURCE=2/}
-
- ${srcdir}/glibc/configure --prefix=/usr \
- --libdir=/usr/lib --libexecdir=/usr/lib \
- --with-headers=/usr/include \
- --enable-add-ons=nptl,libidn \
- --enable-kernel=2.6.27 \
- --with-tls --with-__thread \
- --enable-bind-now --without-gd \
- --without-cvs --disable-profile \
- --enable-multi-arch
-
- # build libraries with hardening disabled
- echo "build-programs=no" >> configparms
- make
-
- # re-enable hardening for programs
- sed -i "s#=no#=yes#" configparms
- echo "CC += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
- echo "CXX += -fstack-protector -D_FORTIFY_SOURCE=2" >> configparms
- make
-
- # remove harding in preparation to run test-suite
- sed -i '2,4d' configparms
-}
-
-check() {
- cd ${srcdir}/glibc-build
-
- # some errors are expected - manually check log files
- make -k check || true
-}
-
-package() {
- cd ${srcdir}/glibc-build
- make install_root=${pkgdir} install
-
- rm -f ${pkgdir}/etc/ld.so.{cache,conf}
-
- install -dm755 ${pkgdir}/etc/rc.d
- install -dm755 ${pkgdir}/usr/sbin
- install -dm755 ${pkgdir}/usr/lib/locale
- install -m644 ${srcdir}/glibc/nscd/nscd.conf ${pkgdir}/etc/nscd.conf
- install -m755 ${srcdir}/nscd ${pkgdir}/etc/rc.d/nscd
- install -m755 ${srcdir}/locale-gen ${pkgdir}/usr/sbin
- install -m644 ${srcdir}/glibc/posix/gai.conf ${pkgdir}/etc/gai.conf
-
- sed -i -e 's/^\tserver-user/#\tserver-user/' ${pkgdir}/etc/nscd.conf
-
- # create /etc/locale.gen
- install -m644 ${srcdir}/locale.gen.txt ${pkgdir}/etc/locale.gen
- sed -i "s|/| |g" ${srcdir}/glibc/localedata/SUPPORTED
- sed -i 's|\\| |g' ${srcdir}/glibc/localedata/SUPPORTED
- sed -i "s|SUPPORTED-LOCALES=||" ${srcdir}/glibc/localedata/SUPPORTED
- cat ${srcdir}/glibc/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
- sed -i "s|^|#|g" ${pkgdir}/etc/locale.gen
-
- if [[ ${CARCH} = "x86_64" ]]; then
- # fix for the linker
- sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd
- # Comply with multilib binaries, they look for the linker in /lib64
- mkdir ${pkgdir}/lib64
- cd ${pkgdir}/lib64
- ln -v -s ../lib/ld* .
- fi
-
- # Do not strip the following files for improved debugging support
- # ("improved" as in not breaking gdb and valgrind...):
- # ld-${pkgver}.so
- # libc-${pkgver}.so
- # libpthread-${pkgver}.so
- # libthread_db-1.0.so
-
- cd $pkgdir
- strip $STRIP_BINARIES sbin/{ldconfig,sln} \
- usr/bin/{gencat,getconf,getent,iconv,locale,localedef} \
- usr/bin/{makedb,pcprofiledump,pldd,rpcgen,sprof} \
- usr/lib/getconf/* \
- usr/sbin/{iconvconfig,nscd}
- [[ $CARCH = "i686" ]] && strip $STRIP_BINARIES usr/bin/lddlibc4
-
- strip $STRIP_STATIC usr/lib/*.a
-
- strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-${pkgver}.so \
- lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-${pkgver}.so \
- lib/{libdl,libm,libnsl,libresolv,librt,libutil}-${pkgver}.so \
- lib/{libmemusage,libpcprofile,libSegFault}.so \
- usr/lib/{pt_chown,{audit,gconv}/*.so}
-}
diff --git a/testing/glibc/glibc-2.10-bz4781.patch b/testing/glibc/glibc-2.10-bz4781.patch
deleted file mode 100644
index cf1a97a18..000000000
--- a/testing/glibc/glibc-2.10-bz4781.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/i386/clone.S glibc/sysdeps/unix/sysv/linux/i386/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/i386/clone.S 2009-05-23 13:27:46.000000000 +1000
-@@ -120,9 +120,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (eip);
- /* Note: %esi is zero. */
- movl %esi,%ebp /* terminate the stack frame */
- #ifdef RESET_PID
-@@ -155,7 +152,6 @@
- jmp L(haspid)
- .previous
- #endif
-- cfi_endproc;
-
- cfi_startproc
- PSEUDO_END (BP_SYM (__clone))
-diff -Naur glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S glibc/sysdeps/unix/sysv/linux/x86_64/clone.S
---- glibc-old/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-09 13:35:30.000000000 +1000
-+++ glibc/sysdeps/unix/sysv/linux/x86_64/clone.S 2009-05-23 13:27:46.000000000 +1000
-@@ -89,9 +89,6 @@
- ret
-
- L(thread_start):
-- cfi_startproc;
-- /* Clearing frame pointer is insufficient, use CFI. */
-- cfi_undefined (rip);
- /* Clear the frame pointer. The ABI suggests this be done, to mark
- the outermost frame obviously. */
- xorl %ebp, %ebp
-@@ -116,7 +113,6 @@
- /* Call exit with return value from function call. */
- movq %rax, %rdi
- call HIDDEN_JUMPTARGET (_exit)
-- cfi_endproc;
-
- cfi_startproc;
- PSEUDO_END (BP_SYM (__clone))
diff --git a/testing/glibc/glibc-2.10-dont-build-timezone.patch b/testing/glibc/glibc-2.10-dont-build-timezone.patch
deleted file mode 100644
index d3abeff17..000000000
--- a/testing/glibc/glibc-2.10-dont-build-timezone.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-timezone data has been split into the package sys-libs/timezone-data
-
---- glibc-2.4/Makeconfig
-+++ glibc-2.4/Makeconfig
-@@ -931,7 +931,7 @@
- stdlib stdio-common libio malloc string wcsmbs time dirent \
- grp pwd posix io termios resource misc socket sysvipc gmon \
- gnulib iconv iconvdata wctype manual shadow gshadow po argp \
-- crypt nss localedata timezone rt conform debug \
-+ crypt nss localedata rt conform debug \
- $(add-on-subdirs) $(dlfcn) $(binfmt-subdir)
-
- ifndef avoid-generated
diff --git a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch b/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch
deleted file mode 100644
index e84754279..000000000
--- a/testing/glibc/glibc-2.12.1-static-shared-getpagesize.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glibc-2.12-192-g7c08a05/sysdeps/unix/sysv/linux/getpagesize.c
-+++ glibc-2.12.90-17/sysdeps/unix/sysv/linux/getpagesize.c
-@@ -28,7 +28,7 @@
- int
- __getpagesize ()
- {
--#ifdef __ASSUME_AT_PAGESIZE
-+#if 0 && defined __ASSUME_AT_PAGESIZE
- assert (GLRO(dl_pagesize) != 0);
- return GLRO(dl_pagesize);
- #else
diff --git a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch b/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
deleted file mode 100644
index ce089b49c..000000000
--- a/testing/glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From d14e6b09d60d52cc12f0396c3106b14e1bd0fe8f Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Thu, 9 Dec 2010 15:00:59 +0100
-Subject: [PATCH 1/1] Ignore origin of privileged program
-
----
- ChangeLog | 5 +++++
- elf/dl-object.c | 3 +++
- 2 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/elf/dl-object.c b/elf/dl-object.c
-index 22a1635..7674d49 100644
---- a/elf/dl-object.c
-+++ b/elf/dl-object.c
-@@ -214,6 +214,9 @@ _dl_new_object (char *realname, const char *libname, int type,
- out:
- new->l_origin = origin;
- }
-+ else if (INTUSE(__libc_enable_secure) && type == lt_executable)
-+ /* The origin of a privileged program cannot be trusted. */
-+ new->l_origin = (char *) -1;
-
- return new;
- }
---
-1.7.2
diff --git a/testing/glibc/glibc-2.13-futex.patch b/testing/glibc/glibc-2.13-futex.patch
deleted file mode 100644
index 9b9c3ac45..000000000
--- a/testing/glibc/glibc-2.13-futex.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedrdlock.S
-@@ -210,7 +210,7 @@ pthread_rwlock_timedrdlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-+++ a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_rwlock_timedwrlock.S
-@@ -192,7 +192,7 @@ pthread_rwlock_timedwrlock:
-
- 7: movq %rdx, %rax
-
--#ifndef __ASSUME_PRIVATE_FUTEX
-+#ifndef __ASSUME_FUTEX_CLOCK_REALTIME
- addq $16, %rsp
- cfi_adjust_cfa_offset(-16)
- popq %r14
-@@ -207,7 +207,7 @@ pthread_rwlock_timedwrlock:
- cfi_restore(%r12)
- retq
-
--#ifdef __ASSUME_PRIVATE_FUTEX
-+#ifdef __ASSUME_FUTEX_CLOCK_REALTIME
- cfi_adjust_cfa_offset(16)
- cfi_rel_offset(%r12, 8)
- cfi_rel_offset(%r13, 0)
diff --git a/testing/glibc/glibc-2.14-libdl-crash.patch b/testing/glibc/glibc-2.14-libdl-crash.patch
deleted file mode 100644
index 6c9d2718e..000000000
--- a/testing/glibc/glibc-2.14-libdl-crash.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-diff --git a/elf/dl-close.c b/elf/dl-close.c
-index 73b2a2f..9bd91e3 100644
---- a/elf/dl-close.c
-+++ b/elf/dl-close.c
-@@ -1,5 +1,5 @@
- /* Close a shared object opened by `_dl_open'.
-- Copyright (C) 1996-2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+ Copyright (C) 1996-2007, 2009, 2010 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -119,17 +119,8 @@ _dl_close_worker (struct link_map *map)
- if (map->l_direct_opencount > 0 || map->l_type != lt_loaded
- || dl_close_state != not_pending)
- {
-- if (map->l_direct_opencount == 0)
-- {
-- if (map->l_type == lt_loaded)
-- dl_close_state = rerun;
-- else if (map->l_type == lt_library)
-- {
-- struct link_map **oldp = map->l_initfini;
-- map->l_initfini = map->l_orig_initfini;
-- _dl_scope_free (oldp);
-- }
-- }
-+ if (map->l_direct_opencount == 0 && map->l_type == lt_loaded)
-+ dl_close_state = rerun;
-
- /* There are still references to this object. Do nothing more. */
- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
-diff --git a/elf/dl-deps.c b/elf/dl-deps.c
-index 9e30594..3890d00 100644
---- a/elf/dl-deps.c
-+++ b/elf/dl-deps.c
-@@ -478,6 +478,7 @@ _dl_map_object_deps (struct link_map *map,
- nneeded * sizeof needed[0]);
- atomic_write_barrier ();
- l->l_initfini = l_initfini;
-+ l->l_free_initfini = 1;
- }
-
- /* If we have no auxiliary objects just go on to the next map. */
-@@ -681,6 +682,7 @@ Filters not supported with LD_TRACE_PRELINKING"));
- l_initfini[nlist] = NULL;
- atomic_write_barrier ();
- map->l_initfini = l_initfini;
-+ map->l_free_initfini = 1;
- if (l_reldeps != NULL)
- {
- atomic_write_barrier ();
-@@ -689,5 +691,5 @@ Filters not supported with LD_TRACE_PRELINKING"));
- _dl_scope_free (old_l_reldeps);
- }
- if (old_l_initfini != NULL)
-- map->l_orig_initfini = old_l_initfini;
-+ _dl_scope_free (old_l_initfini);
-
-diff --git a/elf/dl-libc.c b/elf/dl-libc.c
-index 7be9483..a13fce3 100644
---- a/elf/dl-libc.c
-+++ b/elf/dl-libc.c
-@@ -265,13 +265,13 @@ libc_freeres_fn (free_mem)
-
- for (Lmid_t ns = 0; ns < GL(dl_nns); ++ns)
- {
-- /* Remove all additional names added to the objects. */
- for (l = GL(dl_ns)[ns]._ns_loaded; l != NULL; l = l->l_next)
- {
- struct libname_list *lnp = l->l_libname->next;
-
- l->l_libname->next = NULL;
-
-+ /* Remove all additional names added to the objects. */
- while (lnp != NULL)
- {
- struct libname_list *old = lnp;
-@@ -279,6 +279,10 @@ libc_freeres_fn (free_mem)
- if (! old->dont_free)
- free (old);
- }
-+
-+ /* Free the initfini dependency list. */
-+ if (l->l_free_initfini)
-+ free (l->l_initfini);
- }
-
- if (__builtin_expect (GL(dl_ns)[ns]._ns_global_scope_alloc, 0) != 0
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 4a9109e..617e30e 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -2251,6 +2251,7 @@ ERROR: ld.so: object '%s' cannot be loaded as audit interface: %s; ignored.\n",
- lnp->dont_free = 1;
- lnp = lnp->next;
- }
-+ l->l_free_initfini = 0;
-
- if (l != &GL(dl_rtld_map))
- _dl_relocate_object (l, l->l_scope, GLRO(dl_lazy) ? RTLD_LAZY : 0,
-diff --git a/include/link.h b/include/link.h
-index e877104..051b99a 100644
---- a/include/link.h
-+++ b/include/link.h
-@@ -1,6 +1,6 @@
- /* Data structure for communication from the run-time dynamic linker for
- loaded ELF shared objects.
-- Copyright (C) 1995-2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc.
-+ Copyright (C) 1995-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
-@@ -192,6 +192,9 @@ struct link_map
- during LD_TRACE_PRELINKING=1
- contains any DT_SYMBOLIC
- libraries. */
-+ unsigned int l_free_initfini:1; /* Nonzero if l_initfini can be
-+ freed, ie. not allocated with
-+ the dummy malloc in ld.so. */
-
- /* Collected information about own RPATH directories. */
- struct r_search_path_struct l_rpath_dirs;
-@@ -240,9 +243,6 @@ struct link_map
-
- /* List of object in order of the init and fini calls. */
- struct link_map **l_initfini;
-- /* The init and fini list generated at startup, saved when the
-- object is also loaded dynamically. */
-- struct link_map **l_orig_initfini;
-
- /* List of the dependencies introduced through symbol binding. */
- struct link_map_reldeps
diff --git a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch b/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
deleted file mode 100644
index e2beea881..000000000
--- a/testing/glibc/glibc-2.14-reexport-rpc-interface.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/include/libc-symbols.h b/include/libc-symbols.h
-index 67e1ca2..5e7cca5 100644
---- a/include/libc-symbols.h
-+++ b/include/libc-symbols.h
-@@ -635,7 +635,7 @@ for linking")
- # define libc_hidden_proto(name, attrs...) hidden_proto (name, ##attrs)
- # define libc_hidden_def(name) hidden_def (name)
- # define libc_hidden_weak(name) hidden_weak (name)
--# define libc_hidden_nolink(name, version) hidden_nolink (name, libc, version)
-+# define libc_hidden_nolink(name, version) hidden_def (name)
- # define libc_hidden_ver(local, name) hidden_ver (local, name)
- # define libc_hidden_data_def(name) hidden_data_def (name)
- # define libc_hidden_data_weak(name) hidden_data_weak (name)
-diff --git a/sunrpc/Makefile b/sunrpc/Makefile
-index 5134ce9..40c73d1 100644
---- a/sunrpc/Makefile
-+++ b/sunrpc/Makefile
-@@ -53,7 +53,7 @@ headers-in-tirpc = $(addprefix rpc/,auth.h auth_unix.h clnt.h pmap_clnt.h \
- des_crypt.h)
- headers-not-in-tirpc = $(addprefix rpc/,key_prot.h rpc_des.h) \
- $(rpcsvc:%=rpcsvc/%) rpcsvc/bootparam.h
--headers = rpc/netdb.h
-+headers = rpc/netdb.h $(headers-in-tirpc) $(headers-not-in-tirpc)
- install-others = $(inst_sysconfdir)/rpc
- generated = $(rpcsvc:%.x=rpcsvc/%.h) $(rpcsvc:%.x=x%.c) $(rpcsvc:%.x=x%.stmp) \
- $(rpcsvc:%.x=rpcsvc/%.stmp) rpcgen
diff --git a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch b/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
deleted file mode 100644
index eb0fd822d..000000000
--- a/testing/glibc/glibc-2.14-reinstall-nis-rpc-headers.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From bdd816a366c4e5bba5de7157d948e0c0737fb4fb Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Tue, 17 May 2011 17:42:30 +0200
-Subject: [PATCH] Reinstall NIS RPC headers
-
----
- nis/Makefile | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/nis/Makefile b/nis/Makefile
-index b5c9609..d2934d9 100644
---- a/nis/Makefile
-+++ b/nis/Makefile
-@@ -23,9 +23,9 @@ subdir := nis
-
- aux := nis_hash
-
-+headers := $(wildcard rpcsvc/*.[hx])
- distribute := nss-nis.h nss-nisplus.h nis_intern.h Banner \
-- nisplus-parser.h nis_xdr.h nss \
-- $(wildcard rpcsvc/*.[hx])
-+ nisplus-parser.h nis_xdr.h nss
-
- # These are the databases available for the nis (and perhaps later nisplus)
- # service. This must be a superset of the services in nss.
---
-1.7.5.4
-
diff --git a/testing/glibc/glibc-2.14-revert-4768ae77.patch b/testing/glibc/glibc-2.14-revert-4768ae77.patch
deleted file mode 100644
index 11f087cb7..000000000
--- a/testing/glibc/glibc-2.14-revert-4768ae77.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c
---- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000
-+++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000
-@@ -549,7 +549,7 @@
- ns, ansp, ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+ if (n == 0)
- goto next_ns;
- } else {
- /* Use datagrams. */
-@@ -559,7 +559,7 @@
- ansp2, nansp2, resplen2);
- if (n < 0)
- return (-1);
-- if (n == 0 && (buf2 == NULL || *resplen2 == 0))
-+ if (n == 0)
- goto next_ns;
- if (v_circuit)
- // XXX Check whether both requests failed or
-@@ -1275,14 +1275,10 @@
- (*thisresplenp > *thisanssizp)
- ? *thisanssizp : *thisresplenp);
-
-- if (recvresp1 || (buf2 != NULL && recvresp2)) {
-- *resplen2 = 0;
-+ if (recvresp1 || (buf2 != NULL && recvresp2))
- return resplen;
-- }
- if (buf2 != NULL)
- {
-- /* No data from the first reply. */
-- resplen = 0;
- /* We are waiting for a possible second reply. */
- if (hp->id == anhp->id)
- recvresp1 = 1;
diff --git a/testing/glibc/glibc-2.14.1-tzfile-overflow.patch b/testing/glibc/glibc-2.14.1-tzfile-overflow.patch
deleted file mode 100644
index 9e21cbfd3..000000000
--- a/testing/glibc/glibc-2.14.1-tzfile-overflow.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff --git a/time/tzfile.c b/time/tzfile.c
-index 144e20b..402389c 100644
---- a/time/tzfile.c
-+++ b/time/tzfile.c
-@@ -234,23 +234,58 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
- goto read_again;
- }
-
-+ if (__builtin_expect (num_transitions
-+ > ((SIZE_MAX - (__alignof__ (struct ttinfo) - 1))
-+ / (sizeof (time_t) + 1)), 0))
-+ goto lose;
- total_size = num_transitions * (sizeof (time_t) + 1);
- total_size = ((total_size + __alignof__ (struct ttinfo) - 1)
- & ~(__alignof__ (struct ttinfo) - 1));
- types_idx = total_size;
-- total_size += num_types * sizeof (struct ttinfo) + chars;
-+ if (__builtin_expect (num_types
-+ > (SIZE_MAX - total_size) / sizeof (struct ttinfo), 0))
-+ goto lose;
-+ total_size += num_types * sizeof (struct ttinfo);
-+ if (__builtin_expect (chars > SIZE_MAX - total_size, 0))
-+ goto lose;
-+ total_size += chars;
-+ if (__builtin_expect (__alignof__ (struct leap) - 1
-+ > SIZE_MAX - total_size, 0))
-+ goto lose;
- total_size = ((total_size + __alignof__ (struct leap) - 1)
- & ~(__alignof__ (struct leap) - 1));
- leaps_idx = total_size;
-+ if (__builtin_expect (num_leaps
-+ > (SIZE_MAX - total_size) / sizeof (struct leap), 0))
-+ goto lose;
- total_size += num_leaps * sizeof (struct leap);
-- tzspec_len = (sizeof (time_t) == 8 && trans_width == 8
-- ? st.st_size - (ftello (f)
-- + num_transitions * (8 + 1)
-- + num_types * 6
-- + chars
-- + num_leaps * 12
-- + num_isstd
-- + num_isgmt) - 1 : 0);
-+ tzspec_len = 0;
-+ if (sizeof (time_t) == 8 && trans_width == 8)
-+ {
-+ off_t rem = st.st_size - ftello (f);
-+ if (__builtin_expect (rem < 0
-+ || (size_t) rem < (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars), 0))
-+ goto lose;
-+ tzspec_len = (size_t) rem - (num_transitions * (8 + 1)
-+ + num_types * 6
-+ + chars);
-+ if (__builtin_expect (num_leaps > SIZE_MAX / 12
-+ || tzspec_len < num_leaps * 12, 0))
-+ goto lose;
-+ tzspec_len -= num_leaps * 12;
-+ if (__builtin_expect (tzspec_len < num_isstd, 0))
-+ goto lose;
-+ tzspec_len -= num_isstd;
-+ if (__builtin_expect (tzspec_len == 0 || tzspec_len - 1 < num_isgmt, 0))
-+ goto lose;
-+ tzspec_len -= num_isgmt + 1;
-+ if (__builtin_expect (SIZE_MAX - total_size < tzspec_len, 0))
-+ goto lose;
-+ }
-+ if (__builtin_expect (SIZE_MAX - total_size - tzspec_len < extra, 0))
-+ goto lose;
-
- /* Allocate enough memory including the extra block requested by the
- caller. */
diff --git a/testing/glibc/glibc-2.15-lddebug-scopes.patch b/testing/glibc/glibc-2.15-lddebug-scopes.patch
deleted file mode 100644
index 808cf8d7c..000000000
--- a/testing/glibc/glibc-2.15-lddebug-scopes.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0c95ab64cb4ec0d22bb222647d9d20c7b4903e38 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@redhat.com>
-Date: Fri, 7 Oct 2011 09:31:27 +0200
-Subject: [PATCH] Horrible workaround for horribly broken software
-
----
- elf/rtld.c | 4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/elf/rtld.c b/elf/rtld.c
-index 978c609..8422b9f 100644
---- a/elf/rtld.c
-+++ b/elf/rtld.c
-@@ -1393,7 +1393,9 @@ of this helper program; chances are you did not intend to run this program.\n\
- char *copy = malloc (len);
- if (copy == NULL)
- _dl_fatal_printf ("out of memory\n");
-- l->l_libname->name = l->l_name = memcpy (copy, dsoname, len);
-+ l->l_libname->name = memcpy (copy, dsoname, len);
-+ if (GLRO(dl_debug_mask))
-+ l->l_name = copy;
- }
-
- /* Add the vDSO to the object list. */
---
-1.7.3.4
-
diff --git a/testing/glibc/glibc-2.15-math64crash.patch b/testing/glibc/glibc-2.15-math64crash.patch
deleted file mode 100644
index d315bf266..000000000
--- a/testing/glibc/glibc-2.15-math64crash.patch
+++ /dev/null
@@ -1,184 +0,0 @@
-diff --git a/sysdeps/x86_64/fpu/multiarch/Makefile b/sysdeps/x86_64/fpu/multiarch/Makefile
-index be68903..a032da8 100644
---- a/sysdeps/x86_64/fpu/multiarch/Makefile
-+++ b/sysdeps/x86_64/fpu/multiarch/Makefile
-@@ -1,5 +1,5 @@
- ifeq ($(subdir),math)
--libm-sysdep_routines += s_floor-c s_ceil-c s_floorf-c s_ceilf-c \
-+libm-sysdep_routines += s_floorf-c s_ceilf-c \
- s_rint-c s_rintf-c s_nearbyint-c s_nearbyintf-c
-
- ifeq ($(have-mfma4),yes)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-deleted file mode 100644
-index 6a5ea3f..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
-+++ /dev/null
-@@ -1,2 +0,0 @@
--#define __ceil __ceil_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil.S b/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-deleted file mode 100644
-index d0f8da3..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_ceil.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
-- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-- 02111-1307 USA. */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__ceil)
-- .type __ceil, @gnu_indirect_function
-- call __get_cpu_features@plt
-- movq %rax, %rdx
-- leaq __ceil_sse41(%rip), %rax
-- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
-- jnz 2f
-- leaq __ceil_c(%rip), %rax
--2: ret
--END(__ceil)
--weak_alias (__ceil, ceil)
--
--
--ENTRY(__ceil_sse41)
-- roundsd $2, %xmm0, %xmm0
-- ret
--END(__ceil_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-deleted file mode 100644
-index 68733b6..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c
-+++ /dev/null
-@@ -1,3 +0,0 @@
--#undef __floor
--#define __floor __floor_c
--#include <sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor.S b/sysdeps/x86_64/fpu/multiarch/s_floor.S
-deleted file mode 100644
-index 514ea95..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_floor.S
-+++ /dev/null
-@@ -1,40 +0,0 @@
--/* Copyright (C) 2011 Free Software Foundation, Inc.
-- This file is part of the GNU C Library.
-- Contributed by Ulrich Drepper <drepper@gmail.come>, 2011.
--
-- The GNU C Library is free software; you can redistribute it and/or
-- modify it under the terms of the GNU Lesser General Public
-- License as published by the Free Software Foundation; either
-- version 2.1 of the License, or (at your option) any later version.
--
-- The GNU C Library is distributed in the hope that it will be useful,
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-- Lesser General Public License for more details.
--
-- You should have received a copy of the GNU Lesser General Public
-- License along with the GNU C Library; if not, write to the Free
-- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-- 02111-1307 USA. */
--
--#include <machine/asm.h>
--#include <init-arch.h>
--
--
--ENTRY(__floor)
-- .type __floor, @gnu_indirect_function
-- call __get_cpu_features@plt
-- movq %rax, %rdx
-- leaq __floor_sse41(%rip), %rax
-- testl $bit_SSE4_1, CPUID_OFFSET+index_SSE4_1(%rdx)
-- jnz 2f
-- leaq __floor_c(%rip), %rax
--2: ret
--END(__floor)
--weak_alias (__floor, floor)
--
--
--ENTRY(__floor_sse41)
-- roundsd $1, %xmm0, %xmm0
-- ret
--END(__floor_sse41)
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_sin.c b/sysdeps/x86_64/fpu/multiarch/s_sin.c
-deleted file mode 100644
-index 1ba9dbc..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_sin.c
-+++ /dev/null
-@@ -1,31 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--# undef NAN
--
--extern double __cos_sse2 (double);
--extern double __sin_sse2 (double);
--extern double __cos_avx (double);
--extern double __sin_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __cos_fma4 (double);
--extern double __sin_fma4 (double);
--# else
--# undef HAS_FMA4
--# define HAS_FMA4 0
--# define __cos_fma4 ((void *) 0)
--# define __sin_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
--weak_alias (__cos, cos)
--
--libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
--weak_alias (__sin, sin)
--
--# define __cos __cos_sse2
--# define __sin __sin_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_sin.c>
-diff --git a/sysdeps/x86_64/fpu/multiarch/s_tan.c b/sysdeps/x86_64/fpu/multiarch/s_tan.c
-deleted file mode 100644
-index 8f6601e..0000000
---- a/sysdeps/x86_64/fpu/multiarch/s_tan.c
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#if defined HAVE_FMA4_SUPPORT || defined HAVE_AVX_SUPPORT
--# include <init-arch.h>
--# include <math.h>
--
--extern double __tan_sse2 (double);
--extern double __tan_avx (double);
--# ifdef HAVE_FMA4_SUPPORT
--extern double __tan_fma4 (double);
--# else
--# undef HAS_FMA4
--# define HAS_FMA4 0
--# define __tan_fma4 ((void *) 0)
--# endif
--
--libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
--
--# define tan __tan_sse2
--#endif
--
--
--#include <sysdeps/ieee754/dbl-64/s_tan.c>
diff --git a/testing/glibc/glibc-2.15-revert-c5a0802a.patch b/testing/glibc/glibc-2.15-revert-c5a0802a.patch
deleted file mode 100644
index f532b95e8..000000000
--- a/testing/glibc/glibc-2.15-revert-c5a0802a.patch
+++ /dev/null
@@ -1,229 +0,0 @@
-diff -rup a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:12.937212834 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S 2011-12-22 18:04:42.104222278 +0000
-@@ -137,7 +137,6 @@ __pthread_cond_wait:
- cmpl $PI_BIT, %eax
- jne 18f
-
--90:
- movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %ecx
- movl %ebp, %edx
- xorl %esi, %esi
-@@ -151,9 +150,6 @@ __pthread_cond_wait:
- sete 16(%esp)
- je 19f
-
-- cmpl $-EAGAIN, %eax
-- je 91f
--
- /* Normal and PI futexes dont mix. Use normal futex functions only
- if the kernel does not support the PI futex functions. */
- cmpl $-ENOSYS, %eax
-@@ -398,78 +394,6 @@ __pthread_cond_wait:
- #endif
- call __lll_unlock_wake
- jmp 11b
--
--91:
--.LcleanupSTART2:
-- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
-- call it again. */
--
-- /* Get internal lock. */
-- movl $1, %edx
-- xorl %eax, %eax
-- LOCK
--#if cond_lock == 0
-- cmpxchgl %edx, (%ebx)
--#else
-- cmpxchgl %edx, cond_lock(%ebx)
--#endif
-- jz 92f
--
--#if cond_lock == 0
-- movl %ebx, %edx
--#else
-- leal cond_lock(%ebx), %edx
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
-- xorl %ecx, %ecx
--#endif
-- cmpl $-1, dep_mutex(%ebx)
-- setne %cl
-- subl $1, %ecx
-- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
-- addl $LLL_PRIVATE, %ecx
--#endif
-- call __lll_lock_wait
--
--92:
-- /* Increment the cond_futex value again, so it can be used as a new
-- expected value. */
-- addl $1, cond_futex(%ebx)
-- movl cond_futex(%ebx), %ebp
--
-- /* Unlock. */
-- LOCK
--#if cond_lock == 0
-- subl $1, (%ebx)
--#else
-- subl $1, cond_lock(%ebx)
--#endif
-- je 93f
--#if cond_lock == 0
-- movl %ebx, %eax
--#else
-- leal cond_lock(%ebx), %eax
--#endif
--#if (LLL_SHARED-LLL_PRIVATE) > 255
-- xorl %ecx, %ecx
--#endif
-- cmpl $-1, dep_mutex(%ebx)
-- setne %cl
-- subl $1, %ecx
-- andl $(LLL_SHARED-LLL_PRIVATE), %ecx
--#if LLL_PRIVATE != 0
-- addl $LLL_PRIVATE, %ecx
--#endif
-- call __lll_unlock_wake
--
--93:
-- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
-- xorl %ecx, %ecx
-- movl dep_mutex(%ebx), %edi
-- jmp 90b
--.LcleanupEND2:
--
- .size __pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- GLIBC_2_3_2)
-@@ -642,10 +566,6 @@ __condvar_w_cleanup:
- .long .LcleanupEND-.Lsub_cond_futex
- .long __condvar_w_cleanup-.LSTARTCODE
- .uleb128 0
-- .long .LcleanupSTART2-.LSTARTCODE
-- .long .LcleanupEND2-.LcleanupSTART2
-- .long __condvar_w_cleanup-.LSTARTCODE
-- .uleb128 0
- .long .LcallUR-.LSTARTCODE
- .long .LENDCODE-.LcallUR
- .long 0
-Only in b/nptl/sysdeps/unix/sysv/linux/i386/i486: pthread_cond_wait.S.orig
-diff -rup a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S
---- a/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:04:12.941212837 +0000
-+++ b/nptl/sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S 2011-12-22 18:05:05.155229737 +0000
-@@ -23,7 +23,6 @@
- #include <lowlevelcond.h>
- #include <tcb-offsets.h>
- #include <pthread-pi-defines.h>
--#include <pthread-errnos.h>
-
- #include <kernel-features.h>
-
-@@ -137,14 +136,11 @@ __pthread_cond_wait:
- cmpl $PI_BIT, %eax
- jne 61f
-
--90:
- movl $(FUTEX_WAIT_REQUEUE_PI|FUTEX_PRIVATE_FLAG), %esi
- movl $SYS_futex, %eax
- syscall
-
- movl $1, %r8d
-- cmpq $-EAGAIN, %rax
-- je 91f
- #ifdef __ASSUME_REQUEUE_PI
- jmp 62f
- #else
-@@ -331,70 +327,6 @@ __pthread_cond_wait:
-
- 13: movq %r10, %rax
- jmp 14b
--
--91:
--.LcleanupSTART2:
-- /* FUTEX_WAIT_REQUEUE_PI returned EAGAIN. We need to
-- call it again. */
-- movq 8(%rsp), %rdi
--
-- /* Get internal lock. */
-- movl $1, %esi
-- xorl %eax, %eax
-- LOCK
--#if cond_lock == 0
-- cmpxchgl %esi, (%rdi)
--#else
-- cmpxchgl %esi, cond_lock(%rdi)
--#endif
-- jz 92f
--
--#if cond_lock != 0
-- addq $cond_lock, %rdi
--#endif
-- cmpq $-1, dep_mutex-cond_lock(%rdi)
-- movl $LLL_PRIVATE, %eax
-- movl $LLL_SHARED, %esi
-- cmovne %eax, %esi
-- callq __lll_lock_wait
--#if cond_lock != 0
-- subq $cond_lock, %rdi
--#endif
--92:
-- /* Increment the cond_futex value again, so it can be used as a new
-- expected value. */
-- incl cond_futex(%rdi)
-- movl cond_futex(%rdi), %edx
--
-- /* Release internal lock. */
-- LOCK
--#if cond_lock == 0
-- decl (%rdi)
--#else
-- decl cond_lock(%rdi)
--#endif
-- jz 93f
--
--#if cond_lock != 0
-- addq $cond_lock, %rdi
--#endif
-- cmpq $-1, dep_mutex-cond_lock(%rdi)
-- movl $LLL_PRIVATE, %eax
-- movl $LLL_SHARED, %esi
-- cmovne %eax, %esi
-- /* The call preserves %rdx. */
-- callq __lll_unlock_wake
--#if cond_lock != 0
-- subq $cond_lock, %rdi
--#endif
--93:
-- /* Set the rest of SYS_futex args for FUTEX_WAIT_REQUEUE_PI. */
-- xorq %r10, %r10
-- movq dep_mutex(%rdi), %r8
-- leaq cond_futex(%rdi), %rdi
-- jmp 90b
--.LcleanupEND2:
--
- .size __pthread_cond_wait, .-__pthread_cond_wait
- versioned_symbol (libpthread, __pthread_cond_wait, pthread_cond_wait,
- GLIBC_2_3_2)
-@@ -547,15 +479,11 @@ __condvar_cleanup1:
- .uleb128 .LcleanupSTART-.LSTARTCODE
- .uleb128 .LcleanupEND-.LcleanupSTART
- .uleb128 __condvar_cleanup1-.LSTARTCODE
-- .uleb128 0
-- .uleb128 .LcleanupSTART2-.LSTARTCODE
-- .uleb128 .LcleanupEND2-.LcleanupSTART2
-- .uleb128 __condvar_cleanup1-.LSTARTCODE
-- .uleb128 0
-+ .uleb128 0
- .uleb128 .LcallUR-.LSTARTCODE
- .uleb128 .LENDCODE-.LcallUR
- .uleb128 0
-- .uleb128 0
-+ .uleb128 0
- .Lcstend:
-
-
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.orig
-Only in b/nptl/sysdeps/unix/sysv/linux/x86_64: pthread_cond_wait.S.rej
diff --git a/testing/glibc/glibc-__i686.patch b/testing/glibc/glibc-__i686.patch
deleted file mode 100644
index 28d5dd424..000000000
--- a/testing/glibc/glibc-__i686.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur glibc-old//sysdeps/i386/Makefile glibc//sysdeps/i386/Makefile
---- glibc-old//sysdeps/i386/Makefile 2010-03-18 11:52:30.000000000 +1000
-+++ glibc//sysdeps/i386/Makefile 2010-04-16 15:05:50.000000000 +1000
-@@ -1,6 +1,7 @@
- # The mpn functions need a #define for asm syntax flavor.
--# Every i386 port in use uses gas syntax (I think).
--asm-CPPFLAGS += -DGAS_SYNTAX
-+# Every i386 port in use uses gas syntax (I think). Don't replace
-+# __i686 in __i686.get_pc_thunk.bx.
-+asm-CPPFLAGS += -DGAS_SYNTAX -U __i686
-
- # The i386 `long double' is a distinct type we support.
- long-double-fcts = yes
diff --git a/testing/glibc/glibc.install b/testing/glibc/glibc.install
deleted file mode 100644
index 7f85ade96..000000000
--- a/testing/glibc/glibc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(libc.info{,-1,-2,-3,-4,-5,-6,-7,-8,-9,-10,-11})
-
-post_upgrade() {
- sbin/ldconfig -r .
- [ -x sbin/init ] && sbin/init u
- usr/sbin/locale-gen
-
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- usr/bin/install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- usr/bin/install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/glibc/locale-gen b/testing/glibc/locale-gen
deleted file mode 100755
index 5aff344c4..000000000
--- a/testing/glibc/locale-gen
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-
-set -e
-
-LOCALEGEN=/etc/locale.gen
-LOCALES=/usr/share/i18n/locales
-if [ -n "$POSIXLY_CORRECT" ]; then
- unset POSIXLY_CORRECT
-fi
-
-
-[ -f $LOCALEGEN -a -s $LOCALEGEN ] || exit 0;
-
-# Remove all old locale dir and locale-archive before generating new
-# locale data.
-rm -rf /usr/lib/locale/* || true
-
-umask 022
-
-is_entry_ok() {
- if [ -n "$locale" -a -n "$charset" ] ; then
- true
- else
- echo "error: Bad entry '$locale $charset'"
- false
- fi
-}
-
-echo "Generating locales..."
-while read locale charset; do \
- case $locale in \#*) continue;; "") continue;; esac; \
- is_entry_ok || continue
- echo -n " `echo $locale | sed 's/\([^.\@]*\).*/\1/'`"; \
- echo -n ".$charset"; \
- echo -n `echo $locale | sed 's/\([^\@]*\)\(\@.*\)*/\2/'`; \
- echo -n '...'; \
- if [ -f $LOCALES/$locale ]; then input=$locale; else \
- input=`echo $locale | sed 's/\([^.]*\)[^@]*\(.*\)/\1\2/'`; fi; \
- localedef -i $input -c -f $charset -A /usr/share/locale/locale.alias $locale; \
- echo ' done'; \
-done < $LOCALEGEN
-echo "Generation complete."
diff --git a/testing/glibc/locale.gen.txt b/testing/glibc/locale.gen.txt
deleted file mode 100644
index ccdd81734..000000000
--- a/testing/glibc/locale.gen.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-# Configuration file for locale-gen
-#
-# lists of locales that are to be generated by the locale-gen command.
-#
-# Each line is of the form:
-#
-# <locale> <charset>
-#
-# where <locale> is one of the locales given in /usr/share/i18n/locales
-# and <charset> is one of the character sets listed in /usr/share/i18n/charmaps
-#
-# Examples:
-# en_US ISO-8859-1
-# en_US.UTF-8 UTF-8
-# de_DE ISO-8859-1
-# de_DE@euro ISO-8859-15
-#
-# The locale-gen command will generate all the locales,
-# placing them in /usr/lib/locale.
-#
-# A list of supported locales is included in this file.
-# Uncomment the ones you need.
-#
diff --git a/testing/glibc/nscd b/testing/glibc/nscd
deleted file mode 100755
index 8b14f2a3f..000000000
--- a/testing/glibc/nscd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/nscd`
-case "$1" in
- start)
- stat_busy "Starting nscd"
- # create necessary directories if they don't already exist
- mkdir -p /var/run/nscd /var/db/nscd 2>/dev/null
- # remove stale files
- rm -f /var/db/nscd/* /var/run/nscd/* 2>/dev/null
- [ -z "$PID" ] && /usr/sbin/nscd
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon nscd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping nscd"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon nscd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/graphicsmagick/PKGBUILD b/testing/graphicsmagick/PKGBUILD
deleted file mode 100644
index 962bd3cc6..000000000
--- a/testing/graphicsmagick/PKGBUILD
+++ /dev/null
@@ -1,55 +0,0 @@
-# $Id: PKGBUILD 145647 2011-12-26 08:27:47Z bisson $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Anton Leontiev <bunder@t-25.ru>
-
-pkgname=graphicsmagick
-pkgver=1.3.13
-pkgrel=1
-pkgdesc='Image processing system'
-url='http://www.graphicsmagick.org/'
-arch=('i686' 'x86_64')
-license=('MIT')
-makedepends=('perl')
-depends=('bzip2' 'freetype2' 'ghostscript' 'jasper' 'lcms2' 'xz'
- 'libtiff' 'libwmf' 'libsm' 'libxml2' 'libltdl')
-options=('!libtool')
-source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/GraphicsMagick-${pkgver}.tar.xz")
-sha1sums=('b85b21785bb072fd795f7fc6ac902cffae4e96e6')
-
-build() {
- cd "${srcdir}/GraphicsMagick-$pkgver"
-
- ./configure \
- --prefix=/usr \
- --with-perl \
- --enable-shared \
- --disable-static \
- --with-gs-font-dir=/usr/share/fonts/Type1 \
-
- make
-}
-
-package() {
- cd "${srcdir}/GraphicsMagick-$pkgver"
-
- make DESTDIR="${pkgdir}" install
-
- # Install MIT license
- install -Dm644 "Copyright.txt" "${pkgdir}/usr/share/licenses/$pkgname/Copyright.txt"
-
- # Install perl bindings
- # The patching was introduced in order to build perl module without installing package itself and
- # not to introduce unnecessary path into LD_RUN_PATH
- cd PerlMagick
- sed -i -e "s:'LDDLFLAGS' => \"\(.*\)\":'LDDLFLAGS' => \"-L${pkgdir}/usr/lib \1\":" Makefile.PL
- perl Makefile.PL INSTALLDIRS=vendor PREFIX=/usr DESTDIR="${pkgdir}"
- sed -i -e "s/LDLOADLIBS =/LDLOADLIBS = -lGraphicsMagick/" Makefile
- make
- make install
-
- # Remove perllocal.pod and .packlist
- rm -rf "${pkgdir}/usr/lib/perl5/core_perl"
- rm "${pkgdir}/usr/lib/perl5/vendor_perl/auto/Graphics/Magick/.packlist"
-}
diff --git a/testing/gtk3/PKGBUILD b/testing/gtk3/PKGBUILD
deleted file mode 100644
index 2f2c35127..000000000
--- a/testing/gtk3/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 145199 2011-12-19 16:29:29Z ibiru $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-pkgname=gtk3
-pkgver=3.2.3
-pkgrel=1
-pkgdesc="GTK+ is a multi-platform toolkit (v3)"
-arch=('i686' 'x86_64')
-url="http://www.gtk.org/"
-install=gtk3.install
-depends=('atk' 'cairo' 'gtk-update-icon-cache' 'libcups' 'libxcursor' 'libxinerama' 'libxrandr' 'libxi' 'libxcomposite' 'libxdamage' 'pango' 'shared-mime-info' 'colord')
-makedepends=('gobject-introspection')
-options=('!libtool' '!docs')
-backup=(etc/gtk-3.0/settings.ini)
-license=('LGPL')
-source=(http://ftp.gnome.org/pub/gnome/sources/gtk+/3.2/gtk+-$pkgver.tar.xz
- settings.ini)
-sha256sums=('e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d'
- 'c214d3dcdcadda3d642112287524ab3e526ad592b70895c9f3e3733c23701621')
-
-build() {
- cd "$srcdir/gtk+-$pkgver"
- CXX=/bin/false ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --localstatedir=/var \
- --enable-gtk2-dependency \
- --disable-schemas-compile
- #https://bugzilla.gnome.org/show_bug.cgi?id=655517
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
- make
-}
-
-package() {
- cd "$srcdir/gtk+-$pkgver"
- make DESTDIR="$pkgdir" install
-
- install -Dm644 "$srcdir/settings.ini" "$pkgdir/etc/gtk-3.0/settings.ini"
-}
diff --git a/testing/gtk3/gtk3.install b/testing/gtk3/gtk3.install
deleted file mode 100644
index cd8965d1f..000000000
--- a/testing/gtk3/gtk3.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- usr/bin/gtk-query-immodules-3.0 --update-cache
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- rm -f usr/lib/gtk-3.0/3.0.0/immodules.cache
-}
-post_remove() {
- usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas
-}
diff --git a/testing/gtk3/settings.ini b/testing/gtk3/settings.ini
deleted file mode 100644
index 039000d38..000000000
--- a/testing/gtk3/settings.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Settings]
-gtk-fallback-icon-theme = gnome
diff --git a/testing/inetutils/PKGBUILD b/testing/inetutils/PKGBUILD
deleted file mode 100644
index cc382cd47..000000000
--- a/testing/inetutils/PKGBUILD
+++ /dev/null
@@ -1,78 +0,0 @@
-# $Id: PKGBUILD 145853 2012-01-03 07:18:10Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=inetutils
-pkgver=1.9
-pkgrel=1
-pkgdesc="A collection of common network programs"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/inetutils/"
-license=('GPL3')
-groups=('base')
-depends=('readline' 'ncurses' 'pam')
-provides=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-conflicts=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-replaces=('netkit-ftp' 'netkit-rsh' 'netkit-telnet' 'netkit-ntalk')
-backup=('etc/conf.d/ftpd' 'etc/xinetd.d/telnet' 'etc/xinetd.d/talk' \
- 'etc/xinetd.d/rexec' 'etc/xinetd.d/rlogin' 'etc/xinetd.d/rsh')
-options=('!emptydirs')
-install=inetutils.install
-source=(http://ftp.gnu.org/gnu/inetutils/${pkgname}-${pkgver}.tar.gz{,.sig} \
- ftpd.rc ftpd.conf telnet.xinetd talk.xinetd rexec.xinetd rlogin.xinetd rsh.xinetd \
- dnsdomainname domainname)
-sha1sums=('c0466718360459622172bf80674005e20fefeb38'
- '1bd1555c8e1db5a7a6d1b96a7647a6a9db1abc68'
- '84dc802b5e57b5e04c847572225a3b9612017155'
- '68a590083b45997dfdb80e666b2de762f494ba74'
- 'bfad98a4a62f1fff8779f076c6019ed07f9111af'
- '27d99b910eec0fc26bd79ccc2c1de26608330298'
- '87aa4f38ebee9dac5dcaa04cbc3f2f0906bec605'
- '81f10b3b688e3952f793b35bcef63b5bf257a92b'
- '81f4a8da823cf0bb14284fc71ee6108849691eda'
- 'ac69756d6cc50157d430d863db04a5aac4688380'
- 'eb952b0b9c3e3d429d8e21b110249e495f0e0e63')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr --libexec=/usr/sbin --localstatedir=/var \
- --sysconfdir=/etc --mandir=/usr/share/man --infodir=/usr/share/info \
- --without-wrap --with-pam \
- --enable-ftp --enable-ftpd \
- --enable-telnet --enable-telnetd \
- --enable-talk --enable-talkd \
- --enable-rlogin --enable-rlogind \
- --enable-rsh --enable-rshd \
- --enable-rexec --enable-rexecd \
- --enable-rcp --enable-hostname \
- --disable-tftp --disable-tftpd \
- --disable-ping --disable-ping6 \
- --disable-logger --disable-syslogd \
- --disable-inetd --disable-whois \
- --disable-uucpd --disable-ifconfig --disable-traceroute
- make
-}
-
-check() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make check
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- rm "${pkgdir}/usr/bin/git-merge-changelog"
-
- install -d "${pkgdir}/bin"
- ln -s /usr/bin/hostname "${pkgdir}/bin/hostname"
- install -D -m755 "${srcdir}/domainname" "${pkgdir}/bin/domainname"
- install -D -m755 "${srcdir}/dnsdomainname" "${pkgdir}/bin/dnsdomainname"
- echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/domainname.1"
- echo ".so man1/hostname.1" > "${pkgdir}/usr/share/man/man1/dnsdomainname.1"
- install -D -m755 "${srcdir}/ftpd.rc" "${pkgdir}/etc/rc.d/ftpd"
- install -D -m644 "${srcdir}/ftpd.conf" "${pkgdir}/etc/conf.d/ftpd"
- install -D -m644 "${srcdir}/telnet.xinetd" "${pkgdir}/etc/xinetd.d/telnet"
- install -D -m644 "${srcdir}/talk.xinetd" "${pkgdir}/etc/xinetd.d/talk"
- install -D -m644 "${srcdir}/rexec.xinetd" "${pkgdir}/etc/xinetd.d/rexec"
- install -D -m644 "${srcdir}/rlogin.xinetd" "${pkgdir}/etc/xinetd.d/rlogin"
- install -D -m644 "${srcdir}/rsh.xinetd" "${pkgdir}/etc/xinetd.d/rsh"
-}
diff --git a/testing/inetutils/dnsdomainname b/testing/inetutils/dnsdomainname
deleted file mode 100644
index 4bba209fe..000000000
--- a/testing/inetutils/dnsdomainname
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/hostname -y "$@"
diff --git a/testing/inetutils/domainname b/testing/inetutils/domainname
deleted file mode 100644
index a1b8a8c31..000000000
--- a/testing/inetutils/domainname
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-exec /usr/bin/hostname -d "$@"
diff --git a/testing/inetutils/ftpd.conf b/testing/inetutils/ftpd.conf
deleted file mode 100644
index f660f0035..000000000
--- a/testing/inetutils/ftpd.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ftpd
-#
-FTPD_ARGS=""
diff --git a/testing/inetutils/ftpd.rc b/testing/inetutils/ftpd.rc
deleted file mode 100644
index 3d0d34421..000000000
--- a/testing/inetutils/ftpd.rc
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ftpd
-
-PID=$(pidof -o %PPID /usr/sbin/ftpd)
-case "$1" in
- start)
- stat_busy "Starting ftpd"
- [ -z "$PID" ] && /usr/sbin/ftpd -D $FTPD_ARGS
- if [ $? -gt 0 ]; then
- stat_fail
- else
- add_daemon ftpd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping ftpd"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon ftpd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/inetutils/inetutils.install b/testing/inetutils/inetutils.install
deleted file mode 100644
index b338fa498..000000000
--- a/testing/inetutils/inetutils.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=/usr/share/info
-filelist=(inetutils.info.gz)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/inetutils/rexec.xinetd b/testing/inetutils/rexec.xinetd
deleted file mode 100644
index 4659e4745..000000000
--- a/testing/inetutils/rexec.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service exec
-{
- flags = REUSE
- socket_type = stream
- wait = no
- user = root
- server = /usr/sbin/rexecd
- log_on_failure += USERID
- disable = yes
-}
diff --git a/testing/inetutils/rlogin.xinetd b/testing/inetutils/rlogin.xinetd
deleted file mode 100644
index 5c72f86df..000000000
--- a/testing/inetutils/rlogin.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service login
-{
- flags = REUSE
- socket_type = stream
- wait = no
- user = root
- server = /usr/sbin/rlogind
- log_on_failure += USERID
- disable = yes
-}
diff --git a/testing/inetutils/rsh.xinetd b/testing/inetutils/rsh.xinetd
deleted file mode 100644
index a13738c31..000000000
--- a/testing/inetutils/rsh.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service shell
-{
- flags = REUSE
- socket_type = stream
- wait = no
- user = root
- server = /usr/sbin/rshd
- log_on_failure += USERID
- disable = yes
-}
diff --git a/testing/inetutils/talk.xinetd b/testing/inetutils/talk.xinetd
deleted file mode 100644
index 6abef359c..000000000
--- a/testing/inetutils/talk.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service ntalk
-{
- flags = REUSE
- socket_type = dgram
- wait = yes
- user = root
- server = /usr/sbin/talkd
- log_on_failure += USERID
- disable = yes
-}
diff --git a/testing/inetutils/telnet.xinetd b/testing/inetutils/telnet.xinetd
deleted file mode 100644
index bd3a5e4b1..000000000
--- a/testing/inetutils/telnet.xinetd
+++ /dev/null
@@ -1,10 +0,0 @@
-service telnet
-{
- flags = REUSE
- socket_type = stream
- wait = no
- user = root
- server = /usr/sbin/telnetd
- log_on_failure += USERID
- disable = yes
-}
diff --git a/testing/kdevplatform/PKGBUILD b/testing/kdevplatform/PKGBUILD
deleted file mode 100644
index 75e543a98..000000000
--- a/testing/kdevplatform/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 144746 2011-12-08 09:39:48Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-pkgname=kdevplatform
-pkgver=1.2.3
-_pkgver=4.2.3
-pkgrel=2
-pkgdesc="A C/C++ development platform for KDE"
-arch=('i686' 'x86_64')
-url="http://www.kdevelop.org/"
-license=('GPL')
-depends=('kdelibs''subversion' 'qjson')
-optdepends=("kdesdk-kompare: difference checking")
-makedepends=('cmake' 'automoc4' 'boost')
-install=${pkgname}.install
-source=("http://download.kde.org/stable/kdevelop/${_pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
- 'subversion17.patch')
-sha1sums=('c8badd157c2477b1b299403d01d40f68a1ba14cd'
- '08e2ab2005a7a447f1733e8449a9bc926035fb9e')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- patch -p1 -i "${srcdir}"/subversion17.patch
-
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kdevplatform/kdevplatform.install b/testing/kdevplatform/kdevplatform.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kdevplatform/kdevplatform.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/kdevplatform/subversion17.patch b/testing/kdevplatform/subversion17.patch
deleted file mode 100644
index 782ac38ea..000000000
--- a/testing/kdevplatform/subversion17.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-commit 74dec52749e3c3af2ac6492f50e2676128f35b27
-Author: Milian Wolff <mail@milianw.de>
-Date: Fri Nov 18 16:26:06 2011 +0100
-
- fix svn api usage: use svn_dirent_canonicalize instead of svn_path_internal_style
-
- this was suggested by Stephan Sperling
-
- CCBUG: 284061
-
-diff --git a/plugins/subversion/kdevsvncpp/path.cpp b/plugins/subversion/kdevsvncpp/path.cpp
-index eaa84c1..4dced08 100644
---- a/plugins/subversion/kdevsvncpp/path.cpp
-+++ b/plugins/subversion/kdevsvncpp/path.cpp
-@@ -24,6 +24,7 @@
-
- // subversion api
- #include "svn_path.h"
-+#include "svn_dirent_uri.h"
-
- // apr api
- #include "apr_file_io.h"
-@@ -63,8 +64,7 @@ namespace svn
- m_path = "";
- else
- {
-- const char * int_path =
-- svn_path_internal_style(path, pool.pool());
-+ const char * int_path = svn_dirent_canonicalize(path, pool);
-
- m_path = int_path;
-
-commit cc7f0798d314cdac14b90e427abe22e99c6bd591
-Author: Milian Wolff <mail@milianw.de>
-Date: Fri Nov 18 16:23:36 2011 +0100
-
- properly initialize client context for compatibility with subversion API
-
- this should hopefully fix the crash with svn 1.7 in kdevelop, please test
-
- BUG: 284061
-
-diff --git a/plugins/subversion/kdevsvncpp/context.cpp b/plugins/subversion/kdevsvncpp/context.cpp
-index d277591..ddbb657 100644
---- a/plugins/subversion/kdevsvncpp/context.cpp
-+++ b/plugins/subversion/kdevsvncpp/context.cpp
-@@ -65,7 +65,7 @@ public:
- bool logIsSet;
- int promptCounter;
- Pool pool;
-- svn_client_ctx_t ctx;
-+ svn_client_ctx_t * ctx;
- std::string username;
- std::string password;
- std::string logMessage;
-@@ -205,26 +205,26 @@ public:
- svn_auth_open(&ab, providers, pool);
-
- // initialize ctx structure
-- memset(&ctx, 0, sizeof(ctx));
-+ svn_client_create_context(&ctx, pool);
-
- // get the config based on the configDir passed in
-- svn_config_get_config(&ctx.config, c_configDir, pool);
-+ svn_config_get_config(&ctx->config, c_configDir, pool);
-
- // tell the auth functions where the config is
- svn_auth_set_parameter(ab, SVN_AUTH_PARAM_CONFIG_DIR,
- c_configDir);
-
-- ctx.auth_baton = ab;
-- ctx.log_msg_func = onLogMsg;
-- ctx.log_msg_baton = this;
-- ctx.notify_func = onNotify;
-- ctx.notify_baton = this;
-- ctx.cancel_func = onCancel;
-- ctx.cancel_baton = this;
-+ ctx->auth_baton = ab;
-+ ctx->log_msg_func = onLogMsg;
-+ ctx->log_msg_baton = this;
-+ ctx->notify_func = onNotify;
-+ ctx->notify_baton = this;
-+ ctx->cancel_func = onCancel;
-+ ctx->cancel_baton = this;
-
- #if (SVN_VER_MAJOR >= 1) && (SVN_VER_MINOR >= 2)
-- ctx.notify_func2 = onNotify2;
-- ctx.notify_baton2 = this;
-+ ctx->notify_func2 = onNotify2;
-+ ctx->notify_baton2 = this;
- #endif
- }
-
-@@ -234,7 +234,7 @@ public:
- if (!value)
- param = (void *)"1";
-
-- svn_auth_set_parameter(ctx.auth_baton,
-+ svn_auth_set_parameter(ctx->auth_baton,
- SVN_AUTH_PARAM_NO_AUTH_CACHE,
- param);
- }
-@@ -245,7 +245,7 @@ public:
- username = usr;
- password = pwd;
-
-- svn_auth_baton_t * ab = ctx.auth_baton;
-+ svn_auth_baton_t * ab = ctx->auth_baton;
- svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_USERNAME,
- username.c_str());
- svn_auth_set_parameter(ab, SVN_AUTH_PARAM_DEFAULT_PASSWORD,
-@@ -654,13 +654,13 @@ public:
-
- Context::operator svn_client_ctx_t * ()
- {
-- return &(m->ctx);
-+ return m->ctx;
- }
-
- svn_client_ctx_t *
- Context::ctx()
- {
-- return &(m->ctx);
-+ return m->ctx;
- }
-
- void
diff --git a/testing/keyutils/PKGBUILD b/testing/keyutils/PKGBUILD
deleted file mode 100644
index 79bde8741..000000000
--- a/testing/keyutils/PKGBUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-# $Id: PKGBUILD 143944 2011-11-30 21:52:16Z stephane $
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=keyutils
-pkgver=1.5.5
-pkgrel=1
-pkgdesc="Linux Key Management Utilities"
-arch=(i686 x86_64)
-url="http://www.kernel.org"
-license=('GPL2' 'LGPL2.1')
-depends=('glibc' 'sh')
-backup=(etc/request-key.conf)
-source=(http://people.redhat.com/~dhowells/${pkgname}/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('9e8ab5164bc8f84be148761cc89e9d6f')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- sed -i "s|/lib64|/lib|g" Makefile
- make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD
deleted file mode 100644
index 9cbe8c3d7..000000000
--- a/testing/krb5/PKGBUILD
+++ /dev/null
@@ -1,90 +0,0 @@
-# $Id: PKGBUILD 144605 2011-12-07 21:28:52Z stephane $
-# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
-
-pkgname=krb5
-pkgver=1.9.2
-pkgrel=2
-pkgdesc="The Kerberos network authentication system"
-arch=('i686' 'x86_64')
-url="http://web.mit.edu/kerberos/"
-license=('custom')
-depends=('e2fsprogs' 'libldap' 'keyutils')
-makedepends=('perl')
-provides=('heimdal')
-replaces=('heimdal')
-conflicts=('heimdal')
-backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
-source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
- krb5-kadmind
- krb5-kdc
- krb5-kpropd
- krb5-1.9.1-config-script.patch
- krb5-1.9.1-2011-007.patch)
-sha1sums=('aa06f778ee1f9791cd4c5cf4c9e9465769ffec92'
- '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
- '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
- '7f402078fa65bb9ff1beb6cbbbb017450df78560'
- '7342410760cf44bfa01bb99bb4c49e12496cb46f'
- 'ec917dd1d1c96fa331f512331d5aa37c2e9b9df7')
-options=('!emptydirs')
-
-build() {
- tar zxvf ${pkgname}-${pkgver}.tar.gz
- cd "${srcdir}/${pkgname}-${pkgver}/src"
-
- # - Make krb5-config suppress CFLAGS output when called with --libs
- # cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
- #
- # - Omit extra libraries because their interfaces are not exposed to applications
- # by libkrb5, unless do_deps is set to 1, which indicates that the caller
- # wants the whole list.
- #
- # Patch from upstream :
- # http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236
- patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
-
- # Apply upstream patch to fix a null pointer dereference when processing TGS requests
- # CVE-2011-1530
- # see http://web.mit.edu/kerberos/advisories/MITKRB5-SA-2011-007.txt
- patch -Np2 -i ${srcdir}/krb5-1.9.1-2011-007.patch
-
- # FS#25384
- sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
-
- export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
- export CPPFLAGS+=" -I/usr/include/et"
- ./configure --prefix=/usr \
- --mandir=/usr/share/man \
- --localstatedir=/var/lib \
- --enable-shared \
- --with-system-et \
- --with-system-ss \
- --disable-rpath \
- --without-tcl \
- --enable-dns-for-realm \
- --with-ldap
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}/src"
- make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
-
- # Sample KDC config file
- install -dm 755 "${pkgdir}"/var/lib/krb5kdc
- install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
-
- # Default configuration file
- install -dm 755 "${pkgdir}"/etc
- install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
-
- install -dm 755 "${pkgdir}"/etc/rc.d
- install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d
- install -m 755 ../../krb5-kadmind "${pkgdir}"/etc/rc.d
- install -m 755 ../../krb5-kpropd "${pkgdir}"/etc/rc.d
-
- install -dm 755 "${pkgdir}"/usr/share/aclocal
- install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
-
- install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/krb5/krb5-1.9.1-2011-007.patch b/testing/krb5/krb5-1.9.1-2011-007.patch
deleted file mode 100644
index 336a4ad31..000000000
--- a/testing/krb5/krb5-1.9.1-2011-007.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/kdc/Makefile.in b/src/kdc/Makefile.in
-index f46cad3..102fbaa 100644
---- a/src/kdc/Makefile.in
-+++ b/src/kdc/Makefile.in
-@@ -67,6 +67,7 @@ check-unix:: rtest
-
- check-pytests::
- $(RUNPYTEST) $(srcdir)/t_workers.py $(PYTESTFLAGS)
-+ $(RUNPYTEST) $(srcdir)/t_emptytgt.py $(PYTESTFLAGS)
-
- install::
- $(INSTALL_PROGRAM) krb5kdc ${DESTDIR}$(SERVER_BINDIR)/krb5kdc
-diff --git a/src/kdc/do_tgs_req.c b/src/kdc/do_tgs_req.c
-index c169c54..840a2ef 100644
---- a/src/kdc/do_tgs_req.c
-+++ b/src/kdc/do_tgs_req.c
-@@ -243,7 +243,8 @@ tgt_again:
- if (!tgs_1 || !data_eq(*server_1, *tgs_1)) {
- errcode = find_alternate_tgs(request, &server);
- firstpass = 0;
-- goto tgt_again;
-+ if (errcode == 0)
-+ goto tgt_again;
- }
- }
- status = "UNKNOWN_SERVER";
-diff --git a/src/kdc/t_emptytgt.py b/src/kdc/t_emptytgt.py
-new file mode 100644
-index 0000000..1760bcd
---- /dev/null
-+++ b/src/kdc/t_emptytgt.py
-@@ -0,0 +1,8 @@
-+#!/usr/bin/python
-+from k5test import *
-+
-+realm = K5Realm(start_kadmind=False, create_host=False)
-+output = realm.run_as_client([kvno, 'krbtgt/'], expected_code=1)
-+if 'not found in Kerberos database' not in output:
-+ fail('TGT lookup for empty realm failed in unexpected way')
-+success('Empty tgt lookup.')
diff --git a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch
deleted file mode 100644
index e5a38498f..000000000
--- a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c
---- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c 2011-02-09 16:55:36.000000000 -0500
-+++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c 2011-09-26 18:42:01.465190278 -0400
-@@ -470,13 +470,10 @@
-
- /***** STATE_REFERRALS *****/
-
--/*
-- * Possibly retry a request in the fallback realm after a referral request
-- * failure in the local realm. Expects ctx->reply_code to be set to the error
-- * from a referral request.
-- */
-+/* Possibly try a non-referral request after a referral request failure.
-+ * Expects ctx->reply_code to be set to the error from a referral request. */
- static krb5_error_code
--try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx)
-+try_fallback(krb5_context context, krb5_tkt_creds_context ctx)
- {
- krb5_error_code code;
- char **hrealms;
-@@ -485,9 +482,10 @@
- if (ctx->referral_count > 1)
- return ctx->reply_code;
-
-- /* Only fall back if the original request used the referral realm. */
-+ /* If the request used a specified realm, make a non-referral request to
-+ * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */
- if (!krb5_is_referral_realm(&ctx->req_server->realm))
-- return ctx->reply_code;
-+ return begin_non_referral(context, ctx);
-
- if (ctx->server->length < 2) {
- /* We need a type/host format principal to find a fallback realm. */
-@@ -500,10 +498,10 @@
- if (code != 0)
- return code;
-
-- /* Give up if the fallback realm isn't any different. */
-+ /* If the fallback realm isn't any different, use the existing TGT. */
- if (data_eq_string(ctx->server->realm, hrealms[0])) {
- krb5_free_host_realm(context, hrealms);
-- return ctx->reply_code;
-+ return begin_non_referral(context, ctx);
- }
-
- /* Rewrite server->realm to be the fallback realm. */
-@@ -540,9 +538,9 @@
- krb5_error_code code;
- const krb5_data *referral_realm;
-
-- /* Possibly retry with the fallback realm on error. */
-+ /* Possibly try a non-referral fallback request on error. */
- if (ctx->reply_code != 0)
-- return try_fallback_realm(context, ctx);
-+ return try_fallback(context, ctx);
-
- if (krb5_principal_compare(context, ctx->reply_creds->server,
- ctx->server)) {
diff --git a/testing/krb5/krb5-1.9.1-config-script.patch b/testing/krb5/krb5-1.9.1-config-script.patch
deleted file mode 100644
index a72a75edf..000000000
--- a/testing/krb5/krb5-1.9.1-config-script.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
---- krb5-1.9.1.ori/src/krb5-config.in 2010-01-19 13:44:57.000000000 -0500
-+++ krb5-1.9.1/src/krb5-config.in 2011-09-26 18:27:09.018487087 -0400
-@@ -186,7 +186,7 @@
- -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
- -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
- -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
-- -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
-+ -e 's#\$(CFLAGS)##'`
-
- if test $library = 'kdb'; then
- lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
-@@ -214,9 +214,13 @@
- fi
-
- if test $library = 'krb5'; then
-- lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
-+ lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
- fi
-
-+ # If we ever support a flag to generate output suitable for static
-+ # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB"
-+ # here.
-+
- echo $lib_flags
- fi
-
diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind
deleted file mode 100644
index 04df0dcff..000000000
--- a/testing/krb5/krb5-kadmind
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kadmind`
-case "$1" in
- start)
- stat_busy "Starting Kerberos Admin Daemon"
- if [ -z "$PID" ]; then
- /usr/sbin/kadmind
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon krb5-kadmind
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Kerberos Admin Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon krb5-kadmind
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc
deleted file mode 100644
index 05a03411e..000000000
--- a/testing/krb5/krb5-kdc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/krb5kdc`
-case "$1" in
- start)
- stat_busy "Starting Kerberos Authentication"
- if [ -z "$PID" ]; then
- /usr/sbin/krb5kdc
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon krb5-kdc
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Kerberos Authentication"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon krb5-kdc
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
diff --git a/testing/krb5/krb5-kpropd b/testing/krb5/krb5-kpropd
deleted file mode 100644
index a0077d68e..000000000
--- a/testing/krb5/krb5-kpropd
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/kpropd`
-case "$1" in
- start)
- stat_busy "Starting Kerberos Database Propagation Daemon"
- if [ -z "$PID" ]; then
- /usr/sbin/kpropd -S
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon kpropd
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping Kerberos Database Propagation Daemon"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon kpropd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
- ;;
-esac
-exit 0
diff --git a/testing/kwebkitpart/PKGBUILD b/testing/kwebkitpart/PKGBUILD
deleted file mode 100644
index 79cc0759e..000000000
--- a/testing/kwebkitpart/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 145211 2011-12-19 18:03:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=kwebkitpart
-pkgver=1.2.0
-pkgrel=2
-pkgdesc="A WebKit browser component for KDE"
-url="http://opendesktop.org/content/show.php?content=127960"
-arch=('i686' 'x86_64')
-license=('LGPL')
-depends=('kdebase-runtime')
-makedepends=('cmake' 'automoc4')
-install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('e736d7b26cf6e3c0eed837837b3f032b')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release
- make
-}
-
-package() {
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/kwebkitpart/kwebkitpart.install b/testing/kwebkitpart/kwebkitpart.install
deleted file mode 100644
index e70c054ec..000000000
--- a/testing/kwebkitpart/kwebkitpart.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/libdrm/list.h b/testing/libdrm/list.h
deleted file mode 100644
index 305c903e1..000000000
--- a/testing/libdrm/list.h
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- *
- * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sub license, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
- * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
- * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
- * USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * The above copyright notice and this permission notice (including the
- * next paragraph) shall be included in all copies or substantial portions
- * of the Software.
- *
- */
-
-/**
- * \file
- * List macros heavily inspired by the Linux kernel
- * list handling. No list looping yet.
- *
- * Is not threadsafe, so common operations need to
- * be protected using an external mutex.
- */
-#ifndef _U_DOUBLE_LIST_H_
-#define _U_DOUBLE_LIST_H_
-
-#include <stddef.h>
-
-struct list_head
-{
- struct list_head *prev;
- struct list_head *next;
-};
-
-static void list_inithead(struct list_head *item)
-{
- item->prev = item;
- item->next = item;
-}
-
-static void list_add(struct list_head *item, struct list_head *list)
-{
- item->prev = list;
- item->next = list->next;
- list->next->prev = item;
- list->next = item;
-}
-
-static void list_addtail(struct list_head *item, struct list_head *list)
-{
- item->next = list;
- item->prev = list->prev;
- list->prev->next = item;
- list->prev = item;
-}
-
-static void list_replace(struct list_head *from, struct list_head *to)
-{
- to->prev = from->prev;
- to->next = from->next;
- from->next->prev = to;
- from->prev->next = to;
-}
-
-static void list_del(struct list_head *item)
-{
- item->prev->next = item->next;
- item->next->prev = item->prev;
-}
-
-static void list_delinit(struct list_head *item)
-{
- item->prev->next = item->next;
- item->next->prev = item->prev;
- item->next = item;
- item->prev = item;
-}
-
-#define LIST_INITHEAD(__item) list_inithead(__item)
-#define LIST_ADD(__item, __list) list_add(__item, __list)
-#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list)
-#define LIST_REPLACE(__from, __to) list_replace(__from, __to)
-#define LIST_DEL(__item) list_del(__item)
-#define LIST_DELINIT(__item) list_delinit(__item)
-
-#define LIST_ENTRY(__type, __item, __field) \
- ((__type *)(((char *)(__item)) - offsetof(__type, __field)))
-
-#define LIST_IS_EMPTY(__list) \
- ((__list)->next == (__list))
-
-#ifndef container_of
-#define container_of(ptr, sample, member) \
- (void *)((char *)(ptr) \
- - ((char *)&(sample)->member - (char *)(sample)))
-#endif
-
-#define LIST_FOR_EACH_ENTRY(pos, head, member) \
- for (pos = container_of((head)->next, pos, member); \
- &pos->member != (head); \
- pos = container_of(pos->member.next, pos, member))
-
-#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member) \
- for (pos = container_of((head)->next, pos, member), \
- storage = container_of(pos->member.next, pos, member); \
- &pos->member != (head); \
- pos = storage, storage = container_of(storage->member.next, storage, member))
-
-#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member) \
- for (pos = container_of((head)->prev, pos, member), \
- storage = container_of(pos->member.prev, pos, member); \
- &pos->member != (head); \
- pos = storage, storage = container_of(storage->member.prev, storage, member))
-
-#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member) \
- for (pos = container_of((start), pos, member); \
- &pos->member != (head); \
- pos = container_of(pos->member.next, pos, member))
-
-#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member) \
- for (pos = container_of((start), pos, member); \
- &pos->member != (head); \
- pos = container_of(pos->member.prev, pos, member))
-
-#endif /*_U_DOUBLE_LIST_H_*/
diff --git a/testing/libdrm/rbo.h b/testing/libdrm/rbo.h
deleted file mode 100644
index c25c73a4c..000000000
--- a/testing/libdrm/rbo.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright © 2011 Red Hat
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- * Authors:
- * Jerome Glisse <j.glisse@gmail.com>
- */
-#ifndef RBO_H
-#define RBO_H
-
-#include "list.h"
-
-struct rbo {
- struct list_head list;
- int fd;
- unsigned refcount;
- unsigned mapcount;
- unsigned handle;
- unsigned size;
- unsigned alignment;
- void *data;
-};
-
-struct rbo *rbo(int fd, unsigned handle, unsigned size,
- unsigned alignment, void *ptr);
-int rbo_map(struct rbo *bo);
-void rbo_unmap(struct rbo *bo);
-struct rbo *rbo_incref(struct rbo *bo);
-struct rbo *rbo_decref(struct rbo *bo);
-int rbo_wait(struct rbo *bo);
-
-#endif
diff --git a/testing/libpcap/PKGBUILD b/testing/libpcap/PKGBUILD
deleted file mode 100644
index 047a69a87..000000000
--- a/testing/libpcap/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 145895 2012-01-03 21:16:20Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=libpcap
-pkgver=1.2.1
-pkgrel=1
-pkgdesc="A system-independent interface for user-level packet capture"
-arch=('i686' 'x86_64')
-url="http://www.tcpdump.org/"
-license=('BSD')
-depends=('glibc' 'libnl' 'sh')
-makedepends=('flex')
-source=(http://www.tcpdump.org/release/libpcap-${pkgver}.tar.gz
- http://www.tcpdump.org/release/libpcap-1.2.1.tar.gz.sig)
-sha256sums=('a135a6ef7e539729a57c7ed345bdb9b64159e13404174006a7972eb33f00debd'
- 'dc82ca7e7f737885969af0f78ad0f0eef8206062087e0261ca2799ef26d569b4')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
- ./configure --prefix=/usr --enable-ipv6
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- install -d -m755 ${pkgdir}/usr/bin
- make DESTDIR=${pkgdir} install
- # remove static library
- rm -rf ${pkgdir}/usr/lib/libpcap.a
-
- # backwards compatibility, programs often look for net/bpf.h
- mkdir -p ${pkgdir}/usr/include/net
- cd ${pkgdir}/usr/include/net
- ln -s ../pcap-bpf.h bpf.h
-
- #install the license
- install -D -m644 ${srcdir}/$pkgname-$pkgver/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
-}
diff --git a/testing/libreoffice/PKGBUILD b/testing/libreoffice/PKGBUILD
deleted file mode 100644
index 9edbc55e5..000000000
--- a/testing/libreoffice/PKGBUILD
+++ /dev/null
@@ -1,923 +0,0 @@
-# $Id: PKGBUILD 145225 2011-12-19 18:04:12Z andrea $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
- 'libreoffice-base'
- 'libreoffice-calc'
- 'libreoffice-draw'
- 'libreoffice-gnome'
- 'libreoffice-impress'
- 'libreoffice-kde4'
- 'libreoffice-math'
- 'libreoffice-sdk'
- 'libreoffice-sdk-doc'
- 'libreoffice-writer'
- 'libreoffice-en-US'
- #'libreoffice-extension-barcode' #
- 'libreoffice-extension-diagram'
- 'libreoffice-extension-google-docs'
- 'libreoffice-extension-hunart'
- #'libreoffice-extension-lightproof' # no source integration
- #'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
- 'libreoffice-extension-nlpsolver'
- 'libreoffice-extension-ct2n'
- 'libreoffice-extension-numbertext'
- 'libreoffice-extension-oooblogger'
- 'libreoffice-extension-pdfimport'
- 'libreoffice-extension-presenter-screen'
- 'libreoffice-extension-presentation-minimizer'
- 'libreoffice-extension-report-builder'
- 'libreoffice-extension-scripting-beanshell'
- 'libreoffice-extension-scripting-javascript'
- 'libreoffice-extension-scripting-python'
- 'libreoffice-extension-typo'
- 'libreoffice-extension-validator'
- 'libreoffice-extension-watch-window'
- 'libreoffice-extension-wiki-publisher')
-_LOver=3.4.4.2
-pkgver=3.4.4
-pkgrel=4
-arch=('i686' 'x86_64')
-#_LO_tree="3.4"
-_OFFICEUPD="340"
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
- 'sane' 'perl-archive-zip' 'zip' 'unzip' 'xulrunner' 'unixodbc>=2.3.1' 'hsqldb-java' 'boost'
- 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
- 'beanshell' 'vigra' 'libldap' 'lucene' 'libmythes' 'junit' 'libwpg' 'imagemagick'
- 'mesa' 'gstreamer0.10-base' 'java-environment'
- #'saxon' - currently broken
- # the depends from libreoffice main pkg
- "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
- 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt'
- 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
- 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
- 'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-#_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://hg.services.openoffice.org/binaries"
-source=(${_mirror}/${pkgbase}-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}.tar.bz2 #,translations
- ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
- ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
- ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
- ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
- ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
- ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
- ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
- ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
- ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
- ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
- http://download.go-oo.org/src/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
- http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
- http://download.go-oo.org/src/90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2
- http://download.go-oo.org/src/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
- http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
- http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
- http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
- http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
- http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
- http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
- http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
- http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
- http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
- buildfix_boost.diff
- buildfix_ct2n.diff
- vbahelper.visibility.patch
- scp2-more-reasonable-file-access-rights.diff
- oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
- RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
- gcc462_buildfix.diff)
-noextract=(185d60944ea767075d27247c3162b3bc-unowinreg.dll
- 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
- ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
- 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
- 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
- fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
- 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
- a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
- 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
- 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
- af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
- eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
- 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
- 7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
- 41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
- 451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
- bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
- 23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
- b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
- b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
- 9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
- dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
- b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
- 90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2)
-md5sums=('be8b13f83045f0a53b69fe76d6d72e9c'
- 'db423cbb1cee416b718138044a5de930'
- '31944d2139d6d81ef1131bd513530621'
- 'f447fd4ffe54aab9561c6caa262754b3'
- '97fe698737a35c8803712d4e08007620'
- 'acff44d97a5106d9b53c747dabeb0800'
- '620d43a0b9f36388f423e030513864ef'
- '4c5b1ed870363eca2602f0cb42a8415a'
- '702c6ca31525d7d2c2ded86c77b0bd2e'
- 'ac9b3acf78f43c1395d0e2dedc860f30'
- 'd8d2c41cb86bc8ba2a07e001a5317abb'
- '4d4af2fc06dbe33ec2307df812f7abe1'
- '1398a566eb76598bf3005e187fc2386c'
- 'dd962d2d57f88b9e07e665adad3cabbc'
- 'fff0fc9cd16ef1eb2b2ed5d0a6e77f95'
- 'e54d41d39e63d04ac4a88ce79e37af98'
- 'dbc71403040f447683bf55d1f0be3cad'
- '69ce5b72f44b008d0e78767c5b1dbf39'
- '34a2e8ae6b81a042966740263c53e135'
- '1f24ab1d39f4a51faf22244c94a6203f'
- '35c94d2df8893241173de1d16b6034c0'
- '798b2ffdc8bcfe7bca2cf92b62caf685'
- 'fdb27bfe2dbe2e7b57ae194d9bf36bab'
- 'ada24d37d8d638b3d8a9985e80bc2978'
- '2a177023f9ea8ec8bd00837605c5df1b'
- 'a7983f859eafb2677d7ff386a023bc40'
- '3c219630e4302863a9a83d0efde889db'
- '2ae988b339daec234019a7066f96733e'
- '2c9b0f83ed5890af02c0df1c1776f39b'
- 'af3c3acf618de6108d65fcdc92b492e1'
- 'eeb2c7ddf0d302fba4bfc6e97eac9624'
- '39bb3fcea1514f1369fcfc87542390fd'
- '3404ab6b1792ae5f16bbd603bd1e1d03'
- '97b2d4dba862397f446b217e2b623e71'
- 'f94d9870737518e3b597f9265f4e9803'
- '8ce2fcd72becf06c41f7201d15373ed9'
- 'd8bd5eed178db6e2b18eeed243f85aa8'
- '3bdf40c0d199af31923e900d082ca2dd'
- 'ace6ab49184e329db254e454a010f56d'
- 'db60e4fde8dd6d6807523deb71ee34dc'
- 'ba2930200c9f019c2d93a8c88c651a0f'
- '18f577b374d60b3c760a3a3350407632'
- '0ff7d225d087793c8c2c680d77aac3e7'
- '185d60944ea767075d27247c3162b3bc'
- '90401bca927835b6fbae4a707ed187c8'
- '451ccf439a36a568653b024534669971'
- '7e7efc5d4a03126bb9ae3ae9aa2c4e87'
- '41c9b65ad60af4b3255bbecdfef11736'
- 'bbdd5639ada63e3130761daaecae1a10'
- '23bd75552206dfcd8fd4e29137dcac84'
- 'b8cbca7b3363e6ca2d02bc0ba2b63904'
- 'b632bdd25649cc4067bcb410bae23d2b'
- '9d60b6cfa3ef1926848710bbcd11115b'
- 'dbaafd21de055e582d92d7d32fe9da13'
- 'b7b2d0e04e142f26dd96119c80757d1f'
- 'bc228237108cab7745897a9f466b6d39'
- 'eee273f501ff45dc5f1365e78c6d57c0'
- '43b145db28e6c0d73578ae6fd35e510d'
- '37638431e7e40baf2e47966ebb9bc0e9'
- '3c6c62e77c30649a3dfe73512947cc9a'
- 'eb35d4c715e0dfc23bbc706996033829'
- '10600d04ee81014bc9b5cc04e615d799')
-
-build() {
-
- unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
- [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
- [ -z "${MOZ_PLUGIN_PATH}" ] && . /etc/profile.d/mozilla-common.sh
- [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
- # move all LibO sources into one build directory
- mkdir ${srcdir}/build && cd ${srcdir}/build
- for i in libreoffice-{artwork,base,bootstrap,calc,components,extensions,extras,filters,help,impress,libs-core,libs-extern,libs-extern-sys,libs-gui,postprocess,sdk,testing,ure,writer}-${_LOver}; do #,translations
- mv ${srcdir}/$i/* .
- done
-# mv ${srcdir}/libreoffice-bootstrap-${_LOver}/* .
-# ./bin/unpack-sources ${srcdir}/build
-
- # move external sources into place
- mkdir ${srcdir}/ext_sources && cd ${srcdir}/ext_sources
- for source in "${noextract[@]}"; do
- ln -s ${srcdir}/$source .
- done
-
- cd ${srcdir}/build
-
- # buildfixes & bugfixes
- #patch -Np1 -i ${srcdir}/buildfix_boost.diff
- patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
- patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
- patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
- patch -Np1 -i ${srcdir}/oracle-recognition.diff
- patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
- # https://www.libreoffice.org/bugzilla/show_bug.cgi?id=43139
- patch -Np1 -i ${srcdir}/gcc462_buildfix.diff
-
- # unset C(XX)FLAGS
- # http://www.openoffice.org/issues/show_bug.cgi?id=103205
-# unset CFLAGS
-# unset CXXFLAGS
-
- #use the CFLAGS but remove the LibO overridden ones
- for i in $CFLAGS; do
- case "$i" in
- -O?|-pipe|-Wall|-g|-fexceptions) continue;;
- esac
- ARCH_FLAGS="$ARCH_FLAGS $i"
- done
-
- # python2 fix
- export PYTHON=python2
-
- # http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
-
-# if [ "$CARCH" = "x86_64" ]; then
-# EXTRAOPTS="--without-stlport"
-# else
-# EXTRAOPTS="--with-stlport" # --without-system-boost"
-# # # avoid problems with ixion for now
-# sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
-# fi
-
- # needed for 0003-distro-install-fix-en-US-only-installation.patch
- autoconf -f
-
- # non-SMP test build
-# export MAKEFLAGS="-j1"
- ./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
- --with-unix-wrapper="libreoffice" \
- --enable-split-app-modules \
- --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
- --with-external-tar="${srcdir}/ext_sources" \
- --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
- --with-install-dirname="${pkgbase}" --libdir=/usr/lib --mandir=/usr/share/man \
- --disable-verbose \
- --with-lang="" \
- --enable-cairo\
- --enable-crashdump \
- --enable-dbus \
- --enable-evolution2\
- --enable-gio\
- --disable-gnome-vfs\
- --disable-kde\
- --enable-kde4\
- --enable-ldap \
- --enable-lockdown\
- --enable-opengl \
- --enable-odk\
- --enable-opengl\
- --enable-ext-barcode \
- --enable-ext-diagram \
- --enable-ext-google-docs \
- --enable-ext-hunart \
- --disable-ext-lightproof \
- --disable-ext-mysql-connector \
- --with-system-mysql \
- --enable-ext-nlpsolver \
- --enable-ext-ct2n \
- --enable-ext-numbertext \
- --enable-ext-oooblogger \
- --enable-ext-pdfimport \
- --enable-ext-presenter-console \
- --enable-ext-presenter-minimizer \
- --enable-ext-report-builder \
- --enable-ext-scripting-beanshell \
- --enable-ext-scripting-javascript \
- --enable-ext-scripting-python \
- --enable-ext-typo \
- --enable-ext-validator \
- --enable-ext-watch-window \
- --enable-ext-wiki-publisher \
- --without-fonts\
- --without-afms\
- --without-ppds\
- --without-system-libwps\
- --without-system-mdds\
- --without-myspell-dicts \
- --with-system-dicts \
- --with-external-dict-dir=/usr/share/hunspell \
- --with-external-hyph-dir=/usr/share/hyphen \
- --with-external-thes-dir=/usr/share/mythes \
- --with-system-cppunit\
- --with-system-graphite\
- --with-system-libwpg \
- --with-system-libwps \
- --with-system-redland\
- --without-system-saxon\
- --with-system-libtextcat \
- --with-external-libtextcat-data \
- --with-openldap\
- --with-ant-home="/usr/share/java/apache-ant"\
- --with-system-boost\
- --with-system-cairo\
- --with-system-libs\
- --with-system-mozilla\
- --with-system-mythes\
- --with-system-xrender-headers\
- --with-system-headers\
- --with-alloc=system\
- --with-system-lucene\
- --with-lucene-core-jar=/usr/share/java/lucene-core.jar\
- --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
- --with-java-target-version=1.5 \
- $EXTRAOPTS || return 1
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-# --with-system-saxon\
-# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
- touch src.downloaded
- #./download
- unset MAKEFLAGS
- ./bootstrap
- make
-
- # fake installation to create split file lists
- mkdir $srcdir/fakeinstall
- make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-# cd ${srcdir}/build
-# make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=${pkgbase}.install
- depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
- 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6"
- 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
- 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script
- #'java-runtime'
- #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
- 'java-runtime: adds java support'
- 'libcups: adds printing support'
- 'gconf: adds additional gnome support'
- 'nss: adds support for signed files/macros'
- 'pstoedit: translates PostScript and PDF graphics into other vector formats'
- 'poppler: for shipped pdfimport extension'
- 'libmythes: for use in thesaurus'
- 'hsqldb-java: default database format for OpenOffice.org'
- 'beanshell: interactive java -- good for prototyping /macros'
- 'vigra: C++ computer vision library, usable in Basebmp'
- 'libmspack: library for Microsoft compression formats for use in FontOOo'
- 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images'
- 'libldap: to get profiles via ldap'
- 'lucene: full-text search engine library for Java needed in the help section'
- 'sane: for scanner access'
- 'unixodbc: adds ODBC database support'
- 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
- etc/libreoffice/bootstraprc
- etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/common_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/common_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # # remove version in menu entry and make it visible
-# sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-# echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/basis3.4/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/base_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/base_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/calc_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/calc_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/draw_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/draw_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'dbus-glib')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/gnome_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/gnome_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=('mesa: for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/impress_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/impress_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/kde4_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/kde4_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/math_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/math_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # fix ArchLinux LibreOffice installation paths
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
- -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/basis3.4/sdk," \
- -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
- -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice/basis3.4," \
- -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
- -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
- -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
- -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
- -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
- -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
- -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
- -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/setsdkenv_unix.{csh,sh}.in
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/sdk_doc_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/sdk_doc_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/basis3.4/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/writer_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/writer_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
- pkgdesc="English (US) language pack for LibreOffice"
- #arch=('any')
- provides=('openoffice-en-US' 'libreoffice-langpack')
- replaces=(openoffice-en-US)
- conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/build/file-lists/lang_en_US_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/build/file-lists/lang_en_US_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-barcode() {
-
- pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
- chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-}
-
-package_libreoffice-extension-diagram() {
-
- pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
-}
-
-package_libreoffice-extension-google-docs() {
-
- pkgdesc="Google Documents extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
-}
-
-package_libreoffice-extension-hunart() {
-
- pkgdesc="Hungarian cross-reference toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
-}
-
-#package_libreoffice-extension-lightproof() {
-
-# pkgdesc="Lightproof extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
-#}
-
-#package_libreoffice-extension-mysql-connector() {
-
-# pkgdesc="MySQL Connector extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/${_OFFICEUPD}/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
-#}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
-
-package_libreoffice-extension-ct2n() {
-
- pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
-}
-
-package_libreoffice-extension-numbertext() {
-
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
-}
-
-package_libreoffice-extension-oooblogger() {
-
- pkgdesc="An extensions for blogging"
- #arch=('any')
- depends=('libreoffice-common' 'coreutils' 'python')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-extension-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
-}
-
-package_libreoffice-extension-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-typo() {
-
- pkgdesc="Typography toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
- find ${pkgdir} -type d -exec chmod 755 {} \;
- #chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-}
-
-package_libreoffice-extension-validator() {
-
- pkgdesc="Validator extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/build/solver/${_OFFICEUPD}/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-watch-window() {
-
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
-}
diff --git a/testing/libreoffice/PKGBUILD.next_stable b/testing/libreoffice/PKGBUILD.next_stable
deleted file mode 100644
index 1005760ac..000000000
--- a/testing/libreoffice/PKGBUILD.next_stable
+++ /dev/null
@@ -1,924 +0,0 @@
-# $Id: PKGBUILD 142692 2011-11-12 20:22:14Z ibiru $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
- 'libreoffice-base'
- 'libreoffice-calc'
- 'libreoffice-draw'
- 'libreoffice-gnome'
- 'libreoffice-impress'
- 'libreoffice-kde4'
- 'libreoffice-math'
- 'libreoffice-sdk'
- 'libreoffice-sdk-doc'
- 'libreoffice-writer'
- 'libreoffice-en-US'
- #'libreoffice-extension-barcode' #
-# 'libreoffice-extension-diagram'
-# 'libreoffice-extension-google-docs'
-# 'libreoffice-extension-hunart'
- #'libreoffice-extension-lightproof' # no source integration
- #'libreoffice-extension-mysql-connector' # missing libmysqlcppconn-dev configure: error: mysql_driver.h not found. install MySQL C++ Connectivity
-# 'libreoffice-extension-nlpsolver'
-# 'libreoffice-extension-ct2n'
-# 'libreoffice-extension-numbertext'
-# 'libreoffice-extension-oooblogger'
- 'libreoffice-extension-pdfimport'
- 'libreoffice-extension-presenter-screen'
- 'libreoffice-extension-presentation-minimizer'
- 'libreoffice-extension-report-builder'
-# 'libreoffice-extension-scripting-beanshell'
-# 'libreoffice-extension-scripting-javascript'
-# 'libreoffice-extension-scripting-python'
-# 'libreoffice-extension-typo'
-# 'libreoffice-extension-validator'
-# 'libreoffice-extension-watch-window'
-# 'libreoffice-extension-wiki-publisher'
-)
-_LOver=3.5.0.0
-pkgver=3.5.0beta1
-pkgrel=1
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
- 'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'hsqldb-java' 'boost' #'xulrunner'
- 'apache-ant' 'gperf' 'poppler>=0.18.0' 'kdelibs' 'gconf' 'cppunit' #'libmysqlclient'
- 'beanshell' 'vigra' 'lucene' 'junit' 'libmythes' 'libwpg' 'imagemagick' # 'libldap'
- 'mesa' 'gstreamer0.10-base' 'java-environment' 'zenity' # for build icon :D
- #'saxon' - currently broken
- # the depends from libreoffice main pkg
- "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libwpd>=0.9.2' 'libwps' 'libxaw' "neon>=0.28.6"
- 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'dbus-glib' "icu>=4.6" 'libxslt' 'librsvg'
- 'redland' 'hyphen' 'lpsolve' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
- 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2' 'translate-toolkit' # keep gtk2 for install script
- 'ttf-dejavu') # to satisfy regression tests
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-source=(${_mirror}/${pkgbase}-{core,help,translations}-${_LOver}.tar.bz2
- ${_additional_source_url}/8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
- ${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
- ${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- ${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
- ${_additional_source_url}/fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
- ${_additional_source_url}/ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
- ${_additional_source_url}/2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
- ${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- ${_additional_source_url}/3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
- ${_additional_source_url}/2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
- ${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
- ${_additional_source_url}/af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
- ${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- ${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- ${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- ${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- ${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- ${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- ${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- ${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- ${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-# ${_additional_source_url}/18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
- ${_additional_source_url}/0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
- ${_additional_source_url}/e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
- ${_additional_source_url}/7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
- http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-# ${_additional_source_url}/451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
-# http://ooo.itc.hu/oxygenoffice/download/libreoffice/4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt
-# http://ooo.itc.hu/oxygenoffice/download/libreoffice/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
-# http://ooo.itc.hu/oxygenoffice/download/libreoffice/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
-# http://ooo.itc.hu/oxygenoffice/download/libreoffice/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
-# http://ooo.itc.hu/oxygenoffice/download/libreoffice/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
-# http://ooo.itc.hu/oxygenoffice/download/libreoffice/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
-# http://ooo.itc.hu/oxygenoffice/download/libreoffice/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
-# http://ooo.itc.hu/oxygenoffice/download/libreoffice/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
-# http://ooo.itc.hu/oxygenoffice/download/libreoffice/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
-# http://ooo.itc.hu/oxygenoffice/download/libreoffice/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-# buildfix_boost.diff
-# buildfix_ct2n.diff
-# vbahelper.visibility.patch
-# scp2-more-reasonable-file-access-rights.diff
-# oracle-recognition.diff::http://cgit.freedesktop.org/libreoffice/core/patch/?id=549e54fb2f8113502743c443d6deadfe648dede1
-# RemovetheoslSecuritygetHomeDircheck.diff::http://cgit.freedesktop.org/libreoffice/ure/patch/?id=bc9b86940a707e9e2e1076f2954f38075398b5d7
-)
-
-noextract=(8f107ffb3fc9d9b920b7bbd0bc79c7e8-libvisio-0.0.10.tar.bz2
- 185d60944ea767075d27247c3162b3bc-unowinreg.dll
- 0ff7d225d087793c8c2c680d77aac3e7-mdds_0.5.3.tar.bz2
- ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip
- 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
- 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
- fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz
- e1c178b18f130b40494561f02bc1a948-libexttextcat-3.2.0.tar.bz2
- 7c2549f6b0a8bb604e6c4c729ffdcfe6-libcmis-0.1.0.tar.gz
- 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
- 2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz
- a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
- 3c219630e4302863a9a83d0efde889db-commons-logging-1.1.1-src.tar.gz
- 2ae988b339daec234019a7066f96733e-commons-lang-2.3-src.tar.gz
- 2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
- af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
- eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
- 39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
- 3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
- 97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
- f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
- 8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
- d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
- 3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
- ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
- db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
- ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-# 18f577b374d60b3c760a3a3350407632-STLport-4.5.tar.gz
- #4a433efb6d385264ebc1d5513782d51c-SmART_0.9.4.oxt
- #7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt
- #41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt
- #451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt
- #bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt
- #23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt
- #b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt
- #b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt
- #9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt
- #dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt
- #b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt
-)
-md5sums=('bf6ce92d8d69f1dec4836a7249e10436'
- 'a0b19441245d7627c299d7014d110b32'
- 'b9dee0572120c87906ed6e2fb4696b69'
- '8f107ffb3fc9d9b920b7bbd0bc79c7e8'
- '1f24ab1d39f4a51faf22244c94a6203f'
- '35c94d2df8893241173de1d16b6034c0'
- '798b2ffdc8bcfe7bca2cf92b62caf685'
- 'fdb27bfe2dbe2e7b57ae194d9bf36bab'
- 'ada24d37d8d638b3d8a9985e80bc2978'
- '2a177023f9ea8ec8bd00837605c5df1b'
- 'a7983f859eafb2677d7ff386a023bc40'
- '3c219630e4302863a9a83d0efde889db'
- '2ae988b339daec234019a7066f96733e'
- '2c9b0f83ed5890af02c0df1c1776f39b'
- 'af3c3acf618de6108d65fcdc92b492e1'
- 'eeb2c7ddf0d302fba4bfc6e97eac9624'
- '39bb3fcea1514f1369fcfc87542390fd'
- '3404ab6b1792ae5f16bbd603bd1e1d03'
- '97b2d4dba862397f446b217e2b623e71'
- 'f94d9870737518e3b597f9265f4e9803'
- '8ce2fcd72becf06c41f7201d15373ed9'
- 'd8bd5eed178db6e2b18eeed243f85aa8'
- '3bdf40c0d199af31923e900d082ca2dd'
- 'ace6ab49184e329db254e454a010f56d'
- 'db60e4fde8dd6d6807523deb71ee34dc'
- 'ba2930200c9f019c2d93a8c88c651a0f'
- '0ff7d225d087793c8c2c680d77aac3e7'
- 'e1c178b18f130b40494561f02bc1a948'
- '7c2549f6b0a8bb604e6c4c729ffdcfe6'
- '185d60944ea767075d27247c3162b3bc')
-
-build() {
-
- unset J2REDIR; unset J2SDKDIR; unset JAVA_HOME; unset CLASSPATH; unset EXTRAOPTS
- [ -z "${JAVA_HOME}" ] && . /etc/profile.d/jdk.sh || . /etc/profile.d/openjdk6.sh
- [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
- cd ${srcdir}/libreoffice-core-$_LOver
-
- # move external sources into place
- mkdir ${srcdir}/ext_sources && pushd ${srcdir}/ext_sources
- for source in "${noextract[@]}"; do
- ln -s ${srcdir}/$source .
- done
- popd
-
- ln -s ../libreoffice-help-$_LOver/helpcontent2 .
- ln -s ../libreoffice-translations-$_LOver/translations .
-
-# ln -s ${srcdir}/ext_sources/*Barcode* solver/unxlngx6.pro/bin/Barcode.oxt
-# ln -s ${srcdir}/ext_sources/*SmART* solver/unxlngx6.pro/bin/SmART.oxt
-# ln -s ${srcdir}/ext_sources/*gdocs* solver/unxlngx6.pro/bin/gdocs.oxt
-# ln -s ${srcdir}/ext_sources/*hunart* solver/unxlngx6.pro/bin/hunart.oxt
-# ln -s ${srcdir}/ext_sources/*numbertext* solver/unxlngx6.pro/bin/numbertext.oxt
-# ln -s ${srcdir}/ext_sources/*oooblogger* solver/unxlngx6.pro/bin/oooblogger.oxt
-# ln -s ${srcdir}/ext_sources/*typo* solver/unxlngx6.pro/bin/typo.oxt
-# ln -s ${srcdir}/ext_sources/*Validator* solver/unxlngx6.pro/bin/Validator.oxt
-# ln -s ${srcdir}/ext_sources/*WatchWindow* solver/unxlngx6.pro/bin/WatchWindow.oxt
-
- # buildfixes & bugfixes
- #patch -Np1 -i ${srcdir}/buildfix_boost.diff
-# patch -Np1 -i ${srcdir}/buildfix_ct2n.diff
-# patch -Np0 -i ${srcdir}/vbahelper.visibility.patch
-# patch -Np0 -i ${srcdir}/scp2-more-reasonable-file-access-rights.diff
-# patch -Np1 -i ${srcdir}/oracle-recognition.diff
-# patch -Np1 -i ${srcdir}/RemovetheoslSecuritygetHomeDircheck.diff
-
- # unset C(XX)FLAGS
- # http://www.openoffice.org/issues/show_bug.cgi?id=103205
-# unset CFLAGS
-# unset CXXFLAGS
-
- #use the CFLAGS but remove the LibO overridden ones
- for i in $CFLAGS; do
- case "$i" in
- -O?|-pipe|-Wall|-g|-fexceptions) continue;;
- esac
- ARCH_FLAGS="$ARCH_FLAGS $i"
- done
-
- # python2 fix
- export PYTHON=python2
-
- # http://wiki.documentfoundation.org/Development/How_to_build/Configure_options
-
-# if [ "$CARCH" = "x86_64" ]; then
-# EXTRAOPTS="--without-stlport"
-# else
-# EXTRAOPTS="--with-stlport" # --without-system-boost"
-# # # avoid problems with ixion for now
-# sed -i '/fields-table-formula.diff/d' patches/dev300/apply || return 1
-# fi
-
- # needed for 0003-distro-install-fix-en-US-only-installation.patch
-# autoconf -f
-
- # non-SMP test build
-# export MAKEFLAGS="-j1"
- #./configure --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
- ./autogen.sh --with-build-version="${_LOver} ArchLinux build-${pkgrel}" --with-vendor="ArchLinux" \
- --with-unix-wrapper="libreoffice" \
- --enable-split-app-modules \
- --with-max-jobs=${MAKEFLAGS/-j/} --with-num-cpus=${MAKEFLAGS/-j/} \
- --with-external-tar="${srcdir}/ext_sources" \
- --prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
- --libdir=/usr/lib --mandir=/usr/share/man \
- --disable-verbose \
- --with-lang="" \
- --enable-crashdump \
- --enable-dbus \
- --enable-evolution2\
- --enable-gio\
- --disable-gnome-vfs\
- --disable-kde\
- --enable-kde4\
- --enable-gtk3 \
- --enable-lockdown\
- --enable-mergelibs \
- --enable-opengl \
- --enable-odk\
- --enable-opengl\
- --disable-ext-lightproof \
- --disable-ext-mysql-connector \
- --with-system-mysql \
- --enable-librsvg=system \
- --without-fonts\
- --without-afms\
- --without-ppds\
- --without-system-libwps\
- --without-system-mdds\
- --without-myspell-dicts \
- --without-system-libvisio \
- --without-system-libcmis \
- --without-system-sampleicc \
- --without-system-libexttextcat \
- --with-system-dicts \
- --with-external-dict-dir=/usr/share/hunspell \
- --with-external-hyph-dir=/usr/share/hyphen \
- --with-external-thes-dir=/usr/share/mythes \
- --with-system-beanshell \
- --with-system-cppunit\
- --with-system-graphite\
- --with-system-libwpg \
- --with-system-libwps \
- --with-system-redland\
- --without-system-saxon\
- --disable-mozilla \
- --without-system-mozilla \
- --without-system-mozilla-headers \
- --with-ant-home="/usr/share/java/apache-ant"\
- --with-system-boost\
- --with-system-cairo\
- --with-system-libs\
- --with-system-mythes\
- --with-system-headers\
- --with-system-hsqldb \
- --with-alloc=system\
- --with-system-lucene\
- --with-lucene-core-jar=/usr/share/java/lucene-core.jar\
- --with-lucene-analyzers-jar=/usr/share/java/lucene-analyzers.jar\
- --with-java-target-version=1.5 \
- $EXTRAOPTS|| return 1
-
-# --enable-ext-barcode \
-# --enable-ext-diagram \
-# --enable-ext-google-docs \
-# --enable-ext-hunart \
-# --enable-ext-nlpsolver \
-# --enable-ext-ct2n \
-# --enable-ext-numbertext \
-# --enable-ext-oooblogger \
-# --enable-ext-pdfimport \
-# --enable-ext-presenter-console \
-# --enable-ext-presenter-minimizer \
-# --enable-ext-report-builder \
-# --enable-ext-scripting-beanshell \
-# --enable-ext-scripting-javascript \
-# --enable-ext-typo \
-# --enable-ext-validator \
-# --enable-ext-watch-window \
-# --enable-ext-wiki-publisher \
-
-# --disable-mozilla \
-# --enable-ldap \
-# --with-openldap\
-
-# --with-system-mozilla\
-
-#--with-install-dirname="${pkgbase}"
-# --enable-cairo\
-# --enable-ext-scripting-python \
-# --with-system-libtextcat \
-# --with-external-libtextcat-data \
-# --with-system-xrender-headers\
-
-
-
-
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-#--with-servlet-api-jar=JARFILE
-# see http://qa.openoffice.org/issues/show_bug.cgi?id=110136
-# --with-system-saxon\
-# --with-saxon-jar=/usr/share/java/saxon/saxon9he.jar\
-
- touch src.downloaded
- #./download
- unset MAKEFLAGS
- ./bootstrap
- make
-
- # fake installation to create split file lists
- mkdir $srcdir/fakeinstall
- make DESTDIR=${srcdir}/fakeinstall distro-pack-install
-}
-
-#check() {
-# cd ${srcdir}/build
-# make check
-#}
-
-package_libreoffice-common() {
-
- pkgdesc="common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=${pkgbase}.install
- depends=('libreoffice-langpack' "curl>=7.20.0" "hunspell>=1.2.8" "python2>=2.7" 'libxaw' "neon>=0.28.6"
- 'pango' 'nspr' 'libjpeg' 'libxrandr' 'libgl' 'libxslt' "icu>=4.6" 'librsvg'
- 'redland' 'hyphen' 'gcc-libs' 'sh' 'libtextcat' 'graphite'
- 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info' 'gtk2' 'orbit2') # keep gtk2 for install script
- #'java-runtime'
- #'saxon'
- optdepends=('libreoffice-langpack: additional language support'
- 'java-runtime: adds java support'
- 'libcups: adds printing support'
- 'gconf: adds additional gnome support'
- 'nss: adds support for signed files/macros'
- 'pstoedit: translates PostScript and PDF graphics into other vector formats'
- 'poppler: for shipped pdfimport extension'
- 'libmythes: for use in thesaurus'
- 'hsqldb-java: default database format for OpenOffice.org'
- 'beanshell: interactive java -- good for prototyping /macros'
- 'vigra: C++ computer vision library, usable in Basebmp'
- 'libmspack: library for Microsoft compression formats for use in FontOOo'
- 'libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images'
- #'libldap: to get profiles via ldap'
- 'lucene: full-text search engine library for Java needed in the help section'
- 'sane: for scanner access'
- 'unixodbc: adds ODBC database support'
- 'gstreamer0.10-base: + some gstr-plugins to support multimedia content, e.g. in impress')
- backup=(etc/libreoffice/sofficerc
- etc/libreoffice/bootstraprc
- etc/libreoffice/psprint.conf)
- groups=('libreoffice')
- provides=('go-openoffice')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/common_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # # remove version in menu entry and make it visible
-# sed -i -e "/NoDisplay=true/d" ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-# echo "Icon=startcenter" >> ${pkgdir}/usr/share/applications/libreoffice-qstart.desktop
-
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- #fix http://bugs.archlinux.org/task/17656
- find ${pkgdir} -perm 444 -exec ls -lh {} \;
- find ${pkgdir} -perm 444 -exec chmod 644 {} \;
- find ${pkgdir} -perm 555 -exec ls -lh {} \;
- find ${pkgdir} -perm 555 -exec chmod 755 {} \;
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI Spreadsheet Applicationdatabase front-end for LibreOffice. Allows creation and management of databases through a GUI."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/base_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- depends=('libreoffice-common' 'lpsolve' )
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/calc_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/draw_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'dbus-glib' 'gtk3')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/gnome_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- depends=('libreoffice-common')
- optdepends=('mesa: for the OGLTrans extension')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/impress_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/kde4_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Applicationfor LibreOffice."
- depends=('libreoffice-common')
- optdepends=()
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/math_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # fix ArchLinux LibreOffice installation paths
- sed -i -e "s,@OO_SDK_NAME@,libreoffice-sdk," \
- -e "s,@OO_SDK_HOME@,/usr/lib/libreoffice/sdk," \
- -e "s,@OFFICE_HOME@,/usr/lib/libreoffice," \
- -e "s,@OFFICE_BASE_HOME@,/usr/lib/libreoffice," \
- -e "s,@OO_SDK_URE_HOME@,/usr/lib/libreoffice/ure," \
- -e "s,@OO_SDK_MAKE_HOME@,/usr/bin," \
- -e "s,@OO_SDK_ZIP_HOME@,/usr/bin," \
- -e "s,@OO_SDK_CPP_HOME@,/usr/bin," \
- -e "s,@OO_SDK_CC_55_OR_HIGHER@,," \
- -e "s,@OO_SDK_JAVA_HOME@,\$J2SDKDIR," \
- -e "s,@OO_SDK_OUTPUT_DIR@,\$HOME," \
- -e "s,@SDK_AUTO_DEPLOYMENT@,NO," ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{csh,sh}.in
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/sdk_doc_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Applicationfor LibreOffice."
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg: library for importing and converting Corel WordPerfect(tm) Graphics images')
- backup=()
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/writer_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-en-US() {
- pkgdesc="English (US) language pack for LibreOffice"
- #arch=('any')
- provides=('openoffice-en-US' 'libreoffice-langpack')
- replaces=(openoffice-en-US)
- conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
- install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-core-$_LOver/file-lists/lang_en_US_list.txt`; do
- dirname=`dirname $file`
- # check if directory has been already been created - some are missing like manpages
- [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
- # mv file from fakeinstall to pkgdir
- mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-barcode() {
-
- pkgdesc="This extension generates UPC-A, EAN-13, ISBN and JAN barcodes in Draw "
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/7e7efc5d4a03126bb9ae3ae9aa2c4e87-Barcode_1.3.1.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
- chmod o-w -R ${pkgdir}/usr/lib/libreoffice/share/extensions/Barcode
-}
-
-package_libreoffice-extension-diagram() {
-
- pkgdesc="An OOo Draw and Impress extension that creates your favorite diagrams with a few clicks"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/41c9b65ad60af4b3255bbecdfef11736-Diagram_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/diagram
-}
-
-package_libreoffice-extension-google-docs() {
-
- pkgdesc="Google Documents extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/dbaafd21de055e582d92d7d32fe9da13-gdocs_2.3.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/google-docs
-}
-
-package_libreoffice-extension-hunart() {
-
- pkgdesc="Hungarian cross-reference toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/hunart
-}
-
-#package_libreoffice-extension-lightproof() {
-
-# pkgdesc="Lightproof extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-# unzip -q ${srcdir}/${pkgbase}-libreoffice-core-$_LOver-${_LOver}/libreoffice-core-$_LOver/libreoffice-${_LOver}/solver/unxlng*/bin/Lightproof.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/lightproof
-#}
-
-#package_libreoffice-extension-mysql-connector() {
-
-# pkgdesc="MySQL Connector extension for LibreOffice"
- #arch=('any')
-# depends=('libreoffice-common')
-# groups=('libreoffice-extensions')
-
-# install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-# unzip -q ${srcdir}/${pkgbase}-build-${_LOver}/build/libreoffice-${_LOver}/solver/unxlng*/bin/Mysql-connector.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/mysql-connector
-#}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/NLPSolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
-
-package_libreoffice-extension-ct2n() {
-
- pkgdesc="This extension enables you to convert text-cells in Calc with numbers and dates, to real numbers and dates."
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/ConvertTextToNumber.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/ct2n
-}
-
-package_libreoffice-extension-numbertext() {
-
- pkgdesc="NUMBERTEXT/MONEYTEXT extensions"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/b8cbca7b3363e6ca2d02bc0ba2b63904-numbertext_0.9.4.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/numbertext
-}
-
-package_libreoffice-extension-oooblogger() {
-
- pkgdesc="An extensions for blogging"
- #arch=('any')
- depends=('libreoffice-common' 'coreutils' 'python')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/b7b2d0e04e142f26dd96119c80757d1f-oooblogger_0.1.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/oooblogger
-}
-
-package_libreoffice-extension-pdfimport() {
-
- pkgdesc="This extension allows you to import and modify PDF documents"
- depends=('libreoffice-common' 'poppler')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/pdfimport/pdfimport.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/pdfimport
-}
-
-package_libreoffice-extension-presenter-screen() {
-
- pkgdesc="This extension provides more control over your slide show presentation, such as the ability to see the upcoming slide, the slide notes, and a presentation timer whereas the audience see only the current slide"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presenter-screen.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presenter-screen
-}
-
-package_libreoffice-extension-presentation-minimizer() {
-
- pkgdesc="This extension reduce the file size of the current presentation"
- depends=('libreoffice-common' 'gcc-libs')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/presentation-minimizer.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/presentation-minimizer
-}
-
-package_libreoffice-extension-report-builder() {
-
- pkgdesc="This extension creates smart-looking database reports"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/report-builder.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/report-builder
-}
-
-package_libreoffice-extension-scripting-beanshell() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in BeanShell"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-beanshell.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-beanshell
-}
-
-package_libreoffice-extension-scripting-javascript() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in JavaScript"
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-javascript.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-javascript
-}
-
-package_libreoffice-extension-scripting-python() {
-
- pkgdesc="LibreOffice extension - Enables support for scripts in Python"
- depends=('libreoffice-common' 'python')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/script-provider-for-python.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/script-provider-for-python
-}
-
-package_libreoffice-extension-typo() {
-
- pkgdesc="Typography toolbar extension"
- #arch=('any')
- depends=('libreoffice-common')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
- find ${pkgdir} -type d -exec chmod 755 {} \;
- #chmod o+r -R ${pkgdir}/usr/lib/libreoffice/share/extensions/typo
-}
-
-package_libreoffice-extension-validator() {
-
- pkgdesc="Validator extension for LibreOffice"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/bbdd5639ada63e3130761daaecae1a10-Validator_1.1.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/validator
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/libreoffice-core-$_LOver/solver/unxlng*/bin/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-watch-window() {
-
- pkgdesc="A OOo Calc extension to add a Watch Window, which keeps the value of the monitored cell on the screen."
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
- install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
- unzip -q ${srcdir}/23bd75552206dfcd8fd4e29137dcac84-WatchWindow_1.2.0.0.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/watch-window
-}
diff --git a/testing/libreoffice/buildfix_boost.diff b/testing/libreoffice/buildfix_boost.diff
deleted file mode 100644
index d8608d0d4..000000000
--- a/testing/libreoffice/buildfix_boost.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-From bae4fdbd105142cd3f317445eddc826da529a732 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 05 Apr 2011 14:07:02 +0000
-Subject: silence some more of that annoying gcc#47679
-
----
-diff --git a/boost/boost.gcc47679.patch b/boost/boost.gcc47679.patch
-index 1c804aa..9b33a5f 100644
---- a/boost/boost.gcc47679.patch
-+++ b/boost/boost.gcc47679.patch
-@@ -36,3 +36,26 @@
- template <int MaxDigits>
- inline bool allow_more_digits(std::size_t i)
- {
-+--- misc/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100
-++++ misc/build/boost_1_44_0/boost/optional/optional.hpp 2011-04-05 13:19:01.223587256 +0100
-+@@ -31,6 +31,8 @@
-+
-+ #include "boost/optional/optional_fwd.hpp"
-+
-++#include <string.h>
-++
-+ #if BOOST_WORKAROUND(BOOST_MSVC, == 1200)
-+ // VC6.0 has the following bug:
-+ // When a templated assignment operator exist, an implicit conversion
-+@@ -114,6 +116,11 @@
-+
-+ public:
-+
-++ aligned_storage()
-++ {
-++ memset(&dummy_, 0, sizeof(dummy_));
-++ }
-++
-+ void const* address() const { return &dummy_.data[0]; }
-+ void * address() { return &dummy_.data[0]; }
-+ } ;
---
-cgit v0.8.3-6-g21f6
-
diff --git a/testing/libreoffice/buildfix_ct2n.diff b/testing/libreoffice/buildfix_ct2n.diff
deleted file mode 100644
index 979587f79..000000000
--- a/testing/libreoffice/buildfix_ct2n.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-From 90de903b28cb1884042be0eae3f8a55458c5bc29 Mon Sep 17 00:00:00 2001
-From: Caolán McNamara <caolanm@redhat.com>
-Date: Tue, 12 Apr 2011 19:35:51 +0000
-Subject: duplicate NULLs
-
----
-diff --git a/ct2n/prj/build.lst b/ct2n/prj/build.lst
-index 91f44b7..714d926 100644
---- a/ct2n/prj/build.lst
-+++ b/ct2n/prj/build.lst
-@@ -1,3 +1,3 @@
--ct2n ct2n : solenv NULL NULL
-+ct2n ct2n : solenv NULL
- ct2n ct2n usr1 - all ct2n_mkout NULL
- ct2n ct2n nmake - all ct2n_ct2n NULL
---
-cgit v0.8.3-6-g21f6
diff --git a/testing/libreoffice/gcc462_buildfix.diff b/testing/libreoffice/gcc462_buildfix.diff
deleted file mode 100644
index c19e520dc..000000000
--- a/testing/libreoffice/gcc462_buildfix.diff
+++ /dev/null
@@ -1,138 +0,0 @@
---- ./framework/source/accelerators/acceleratorcache.cxx.orig 2011-12-15 15:08:41.329168423 -0200
-+++ ./framework/source/accelerators/acceleratorcache.cxx 2011-12-15 15:17:59.473190664 -0200
-@@ -61,7 +61,7 @@ AcceleratorCache::AcceleratorCache()
- AcceleratorCache::AcceleratorCache(const AcceleratorCache& rCopy)
- : ThreadHelpBase(&Application::GetSolarMutex())
- {
-- m_lCommand2Keys = rCopy.m_lCommand2Keys;
-+ m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
- m_lKey2Commands = rCopy.m_lKey2Commands;
- }
-
-@@ -78,7 +78,7 @@ void AcceleratorCache::takeOver(const Ac
- // SAFE -> ----------------------------------
- WriteGuard aWriteLock(m_aLock);
-
-- m_lCommand2Keys = rCopy.m_lCommand2Keys;
-+ m_lCommand2Keys = const_cast< framework::BaseHash<comphelper::SequenceAsVector<com::sun::star::awt::KeyEvent> >& > (rCopy.m_lCommand2Keys);
- m_lKey2Commands = rCopy.m_lKey2Commands;
-
- aWriteLock.unlock();
---- ./framework/source/loadenv/loadenv.cxx.orig 2011-12-15 15:08:15.771487938 -0200
-+++ ./framework/source/loadenv/loadenv.cxx 2011-12-15 15:19:06.038358483 -0200
-@@ -255,7 +255,8 @@ void LoadEnv::initializeLoading(const ::
- // take over all new parameters.
- m_xTargetFrame.clear();
- m_xBaseFrame = xBaseFrame ;
-- m_lMediaDescriptor = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-+ ::comphelper::MediaDescriptor tmp = impl_mergeMediaDescriptorWithMightExistingModelArgs(lMediaDescriptor);
-+ m_lMediaDescriptor = tmp;
- m_sTarget = sTarget ;
- m_nSearchFlags = nSearchFlags ;
- m_eFeature = eFeature ;
---- ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx.orig 2011-12-15 15:08:49.033072112 -0200
-+++ ./framework/source/uiconfiguration/uiconfigurationmanagerimpl.hxx 2011-12-15 15:11:07.209344668 -0200
-@@ -175,6 +175,15 @@ namespace framework
- sal_Int16 nElementType;
- UIElementDataHashMap aElementsHashMap;
- com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+ UIElementType& operator=(const UIElementType& rRight) {
-+ bModified = rRight.bModified;
-+ bLoaded = rRight.bLoaded;
-+ bDefaultLayer = rRight.bDefaultLayer;
-+ nElementType = rRight.nElementType;
-+ aElementsHashMap = rRight.aElementsHashMap;
-+ xStorage = rRight.xStorage;
-+ return *this;
-+ };
- };
-
- typedef ::std::vector< UIElementType > UIElementTypesVector;
---- ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx.orig 2011-12-19 11:10:56.000000000 +0000
-+++ ./framework/inc/uiconfiguration/moduleuiconfigurationmanager.hxx 2011-12-19 11:12:06.000000000 +0000
-@@ -185,6 +185,15 @@ namespace framework
- sal_Int16 nElementType;
- UIElementDataHashMap aElementsHashMap;
- com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+ UIElementType& operator=(const UIElementType& rRight) {
-+ bModified = rRight.bModified;
-+ bLoaded = rRight.bLoaded;
-+ bDefaultLayer = rRight.bDefaultLayer;
-+ nElementType = rRight.nElementType;
-+ aElementsHashMap = rRight.aElementsHashMap;
-+ xStorage = rRight.xStorage;
-+ return *this;
-+ };
- };
-
- typedef ::std::vector< UIElementType > UIElementTypesVector;
---- ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx.orig 2011-12-19 11:14:17.000000000 +0000
-+++ ./framework/inc/uiconfiguration/uiconfigurationmanager.hxx 2011-12-19 11:15:16.000000000 +0000
-@@ -171,6 +171,15 @@ namespace framework
- sal_Int16 nElementType;
- UIElementDataHashMap aElementsHashMap;
- com::sun::star::uno::Reference< com::sun::star::embed::XStorage > xStorage;
-+ UIElementType& operator=(const UIElementType& rRight) {
-+ bModified = rRight.bModified;
-+ bLoaded = rRight.bLoaded;
-+ bDefaultLayer = rRight.bDefaultLayer;
-+ nElementType = rRight.nElementType;
-+ aElementsHashMap = rRight.aElementsHashMap;
-+ xStorage = rRight.xStorage;
-+ return *this;
-+ };
- };
-
- typedef ::std::vector< UIElementType > UIElementTypesVector;
-
---- ./padmin/source/prtsetup.cxx.orig 2011-12-15 15:09:05.133870823 -0200
-+++ ./padmin/source/prtsetup.cxx 2011-12-15 15:13:55.626239170 -0200
-@@ -813,7 +813,7 @@ extern "C" {
-
- if( aDialog.Execute() )
- {
-- rJobData = aDialog.getSetup();
-+ rJobData = const_cast< ::psp::PrinterInfo & > ( aDialog.getSetup() );
- nRet = 1;
- }
-
---- ./sfx2/source/doc/guisaveas.cxx.orig 2011-12-15 15:08:58.332955848 -0200
-+++ ./sfx2/source/doc/guisaveas.cxx 2011-12-15 15:12:39.953185212 -0200
-@@ -731,7 +731,7 @@ sal_Int8 ModelData_Impl::CheckFilter( co
- if ( aFilterName.getLength() )
- m_pOwner->GetFilterConfiguration()->getByName( aFilterName ) >>= aFilterProps;
-
-- aFiltPropsHM = ::comphelper::SequenceAsHashMap( aFilterProps );
-+ aFiltPropsHM << aFilterProps;
- nFiltFlags = aFiltPropsHM.getUnpackedValueOrDefault( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Flags")), (sal_Int32)0 );
- }
-
---- ./framework/inc/classes/filtercachedata.hxx.orig 2011-12-17 13:14:22.102898902 +0000
-+++ ./framework/inc/classes/filtercachedata.hxx 2011-12-17 13:17:51.524424012 +0000
-@@ -230,7 +230,7 @@
- {
- bPreferred = rCopy.bPreferred ;
- sName = rCopy.sName ;
-- lUINames = rCopy.lUINames ;
-+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames);
- sMediaType = rCopy.sMediaType ;
- sClipboardFormat = rCopy.sClipboardFormat;
- nDocumentIconID = rCopy.nDocumentIconID ;
-@@ -298,7 +298,7 @@
- nOrder = rCopy.nOrder ;
- sName = rCopy.sName ;
- sType = rCopy.sType ;
-- lUINames = rCopy.lUINames ;
-+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames);
- sDocumentService = rCopy.sDocumentService ;
- sFilterService = rCopy.sFilterService ;
- sUIComponent = rCopy.sUIComponent ;
-@@ -405,7 +405,7 @@
- inline Loader& impl_copy( const Loader& rCopy )
- {
- sName = rCopy.sName ;
-- lUINames = rCopy.lUINames ;
-+ lUINames = const_cast < framework::BaseHash<rtl::OUString>& > (rCopy.lUINames);
- lTypes = rCopy.lTypes ;
- return (*this);
- }
diff --git a/testing/libreoffice/libreoffice.install b/testing/libreoffice/libreoffice.install
deleted file mode 100644
index 809472f89..000000000
--- a/testing/libreoffice/libreoffice.install
+++ /dev/null
@@ -1,47 +0,0 @@
-post_install() {
-
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
-
-echo " * see https://wiki.archlinux.org/index.php/LibreOffice"
-echo "-------------------------------------------------------------------"
-echo "LibreOffice has been split into several packages:"
-echo "- libreoffice-common"
-echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
-echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
-echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
-echo " the LibreOffice APIs and for creating"
-echo " extensions (UNO components)."
-echo "-------------------------------------------------------------------"
-echo " * you need to install at least one libreoffice-langpack"
-echo " * you may want to pacman -Ss libreoffice-extensions"
-echo " to see what additional extensions are prepared to install"
-echo " * it's recommended to install {hunspell,mythes,hyphen}-xx pkg
- for spell checking"
-echo " * make sure you have installed some ttf font (ttf-dejavu recommended)"
-}
-
-post_upgrade() {
-# post_install $1
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-update-desktop-database -q
-update-mime-database usr/share/mime > /dev/null 2>&1
- if [ "`vercmp $2 3.4.2rc1`" -lt 0 ]; then
- # important upgrade notice
- echo "LibreOffice has been split into several packages:"
- echo "- libreoffice-common"
- echo "- libreoffice-{base,calc,draw,impress,math,writer} - frontend applications"
- echo "- libreoffice-{gnome,kde4} - desktop integration plugins"
- echo "- libreoffice-{sdk,sdk-doc} - add-on and doc for programming using"
- echo " the LibreOffice APIs and for creating"
- echo " extensions (UNO components)."
- echo "Now you need to install at least one libreoffice-langpack!"
- fi
-}
-
-post_remove() {
-update-desktop-database -q
-gtk-update-icon-cache -f -q /usr/share/icons/hicolor
-update-mime-database usr/share/mime > /dev/null 2>&1
-}
diff --git a/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff b/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff
deleted file mode 100644
index fd61cb4ca..000000000
--- a/testing/libreoffice/scp2-more-reasonable-file-access-rights.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- scp2/inc/macros.inc.old 2011-05-18 17:51:47.000000000 +0200
-+++ scp2/inc/macros.inc 2011-07-18 19:58:27.000000000 +0200
-@@ -92,10 +92,10 @@
- #endif
-
- #define BIN_FILE_BODY \
-- UnixRights = 555
-+ UnixRights = 755
-
- #define TXT_FILE_BODY \
-- UnixRights = 444
-+ UnixRights = 644
-
- #define USER_FILE_BODY \
- UnixRights = 644
diff --git a/testing/libreoffice/vbahelper.visibility.patch b/testing/libreoffice/vbahelper.visibility.patch
deleted file mode 100644
index 5739100d0..000000000
--- a/testing/libreoffice/vbahelper.visibility.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:27:51.507604173 +0000
-+++ vbahelper/inc/vbahelper/vbacollectionimpl.hxx 2011-01-28 20:28:26.230045727 +0000
-@@ -238,7 +238,7 @@
-
- // including a HelperInterface implementation
- template< typename Ifc1 >
--class ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
-+class VBAHELPER_DLLPUBLIC ScVbaCollectionBase : public InheritedHelperInterfaceImpl< Ifc1 >
- {
- typedef InheritedHelperInterfaceImpl< Ifc1 > BaseColBase;
- protected:
---- sc/Library_vbaobj.mk
-+++ sc/Library_vbaobj.mk
-@@ -118,7 +118,6 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
- sc/source/ui/vba/vbaquerytable \
- sc/source/ui/vba/vbarange \
- sc/source/ui/vba/vbasheetobject \
-- sc/source/ui/vba/vbasheetobjects \
- sc/source/ui/vba/vbastyle \
- sc/source/ui/vba/vbastyles \
- sc/source/ui/vba/vbatextboxshape \
-@@ -133,6 +132,11 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
- sc/source/ui/vba/vbawsfunction \
- ))
-
-+$(eval $(call gb_Library_add_cxxobjects,vbaobj,\
-+ sc/source/ui/vba/vbasheetobjects \
-+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
-+))
-+
- ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS)))
- $(eval $(call gb_Library_set_ldflags,vbaobj,\
- $$(LDFLAGS) \
diff --git a/testing/libspiro/PKGBUILD b/testing/libspiro/PKGBUILD
deleted file mode 100644
index b3fef038a..000000000
--- a/testing/libspiro/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id: PKGBUILD 145118 2011-12-17 08:00:09Z bisson $
-# Contributor: Rémy Oudompheng <oudomphe@clipper.ens.fr>
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-
-pkgname=libspiro
-pkgver=20071029
-pkgrel=2
-pkgdesc='Simplifies the drawing of beautiful curves'
-url='http://libspiro.sourceforge.net/'
-license=('GPL')
-options=('!libtool')
-arch=('i686' 'x86_64')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_src-${pkgver}.tar.bz2")
-sha1sums=('d8b407b835b35289af2914877a4c6000b4fdd382')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/testing/linux-api-headers/PKGBUILD b/testing/linux-api-headers/PKGBUILD
deleted file mode 100644
index 83acaeff6..000000000
--- a/testing/linux-api-headers/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 145682 2011-12-27 10:17:45Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=linux-api-headers
-pkgver=3.1.6
-_basever=3.1
-pkgrel=1
-pkgdesc="Kernel headers sanitized for use in userspace"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/libc"
-license=('GPL2')
-provides=("kernel-headers=${pkgver}")
-conflicts=('kernel-headers')
-replaces=('kernel-headers')
-source=(http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.xz
- http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz)
-# NOTE: signatures are not automatically verified by makepkg
- #http://www.kernel.org/pub/linux/kernel/v3.x/linux-${_basever}.tar.sign
- #http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.sign
-md5sums=('edbdc798f23ae0f8045c82f6fa22c536'
- 'b59adeac6d593fe993e964ea9e259c42')
-
-build() {
- cd ${srcdir}/linux-${_basever}
- [[ $pkgver != $_basever ]] && patch -Np1 -i ${srcdir}/patch-${pkgver}
-
- make mrproper
- make headers_check
-}
-
-package() {
- cd ${srcdir}/linux-${_basever}
- make INSTALL_HDR_PATH=${pkgdir}/usr headers_install
-
- # use headers from libdrm
- rm -rf ${pkgdir}/usr/include/drm
-
- # clean-up unnecessary files generated during install
- find ${pkgdir} -name .install -or -name ..install.cmd | xargs rm -f
-}
diff --git a/testing/llvm/PKGBUILD b/testing/llvm/PKGBUILD
deleted file mode 100644
index 6248f6406..000000000
--- a/testing/llvm/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# $Id: PKGBUILD 144360 2011-12-05 04:48:47Z foutrelis $
-# Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
-# Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Sebastian Nowicki <sebnow@gmail.com>
-# Contributor: Devin Cofer <ranguvar{AT]archlinux[DOT}us>
-# Contributor: Tobias Kieslich <tobias@justdreams.de>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
-# Contributor: Tomas Lindquist Olsen <tomas@famolsen.dk>
-# Contributor: Roberto Alsina <ralsina@kde.org>
-# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-
-pkgname=('llvm' 'llvm-ocaml' 'clang' 'clang-analyzer')
-pkgver=3.0
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://llvm.org/"
-license=('custom:University of Illinois/NCSA Open Source License')
-makedepends=('libffi' 'python2' 'ocaml')
-source=(http://llvm.org/releases/$pkgver/$pkgname-$pkgver.tar.gz
- http://llvm.org/releases/$pkgver/clang-$pkgver.tar.gz
- clang-plugin-loader-registry.patch
- cindexer-clang-path.patch
- clang-pure64.patch
- enable-lto.patch
- fix-gold-lto-linking.patch)
-sha256sums=('519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477'
- 'b64e72da356d7c3428cfd7ac620d49ec042c84eaee13c26024879f555f4e126d'
- 'a0a4494f2a692789670be37fd390906dcaa37b1824f740bdaaea21182f2f3a9c'
- '3074df5322900e087377a8e03a02115463ccc0011c25917c2f06df11facd9b92'
- '288a82fbff17bc554f5863734246500e637882af33ee8511019d5e0d6cd20524'
- 'cf8922a932e1859f3783bef2af8ac1e90ce96f8eec79928392327b71b3d7cb89'
- '24d275cdf170f53844bc7174b065fb51b6ddbb9642ced34702cde1f0f74d9192')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver.src"
-
- # At the present, clang must reside inside the LLVM source code tree to build
- # See http://llvm.org/bugs/show_bug.cgi?id=4840
- rm -rf tools/clang
- cp -r "$srcdir/clang-$pkgver.src" tools/clang
-
- # Fix symbolic links from OCaml bindings to LLVM libraries
- sed -i 's:\$(PROJ_libdir):/usr/lib/llvm:' bindings/ocaml/Makefile.ocaml
-
- # Fix installation directories, ./configure doesn't seem to set them right
- sed -i -e 's:\$(PROJ_prefix)/etc/llvm:/etc/llvm:' \
- -e 's:\$(PROJ_prefix)/lib:$(PROJ_prefix)/lib/llvm:' \
- -e 's:\$(PROJ_prefix)/docs/llvm:$(PROJ_prefix)/share/doc/llvm:' \
- Makefile.config.in
-
- # Fix insecure rpath (http://bugs.archlinux.org/task/14017)
- sed -i 's:$(RPATH) -Wl,$(\(ToolDir\|LibDir\|ExmplDir\))::g' Makefile.rules
-
- # Get the correct list of symbols to export
- # See http://lists.cs.uiuc.edu/pipermail/cfe-dev/2010-April/008559.html
- patch -Np1 -i "$srcdir/clang-plugin-loader-registry.patch"
-
- # Fix clang path in CIndexer.cpp (https://bugs.archlinux.org/task/22799)
- patch -d tools/clang -Np0 -i "$srcdir/cindexer-clang-path.patch"
-
- if [[ $CARCH == x86_64 ]]; then
- # Adjust linker path
- patch -d tools/clang -Np0 -i "$srcdir/clang-pure64.patch"
- fi
-
- # Make -flto work
- # Use gold instead of default linker, and always use the plugin
- patch -d tools/clang -Np0 -i "$srcdir/enable-lto.patch"
-
- # Fix libLTO.so location in gold plugin
- patch -Np1 -i "$srcdir/fix-gold-lto-linking.patch"
-
- # Apply strip option to configure
- _optimized_switch="enable"
- [[ $(check_option strip) == n ]] && _optimized_switch="disable"
-
- # Include location of libffi headers in CPPFLAGS
- export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags libffi)"
-
- # Force the use of GCC instead of clang
- CC=gcc CXX=g++ \
- ./configure \
- --prefix=/usr \
- --libdir=/usr/lib/llvm \
- --sysconfdir=/etc \
- --enable-shared \
- --enable-libffi \
- --enable-targets=all \
- --disable-expensive-checks \
- --disable-debug-runtime \
- --disable-assertions \
- --with-binutils-include=/usr/include \
- --$_optimized_switch-optimized
-
- make REQUIRES_RTTI=1
-}
-
-package_llvm() {
- pkgdesc="Low Level Virtual Machine"
- depends=('perl' 'libffi')
-
- cd "$srcdir/$pkgname-$pkgver.src"
-
- # We move the clang directory out of the tree so it won't get installed and
- # then we bring it back in for the clang package
- mv tools/clang "$srcdir"
- # Copy missing file into the expected location
- cp bindings/ocaml/llvm/META.llvm bindings/ocaml/llvm/Release/
- # -j1 is due to race conditions during the installation of the OCaml bindings
- make -j1 DESTDIR="$pkgdir" install
- mv "$srcdir/clang" tools
-
- # OCaml bindings go to a separate package
- rm -rf "$srcdir"/{ocaml,ocamldoc}
- mv "$pkgdir"/usr/{lib/ocaml,share/doc/llvm/ocamldoc} "$srcdir"
-
- # Remove duplicate files installed by the OCaml bindings
- rm "$pkgdir"/usr/{lib/llvm/libllvm*,share/doc/llvm/ocamldoc.tar.gz}
-
- # Fix permissions of static libs
- chmod -x "$pkgdir"/usr/lib/llvm/*.a
-
- # Fix libdir in llvm-config (http://bugs.archlinux.org/task/14487)
- sed -i 's:\(ABS_RUN_DIR/lib\):\1/llvm:' "$pkgdir/usr/bin/llvm-config"
-
- # Get rid of example Hello transformation
- rm "$pkgdir"/usr/lib/llvm/*LLVMHello.*
-
- # Add ld.so.conf.d entry
- install -d "$pkgdir/etc/ld.so.conf.d"
- echo /usr/lib/llvm >"$pkgdir/etc/ld.so.conf.d/llvm.conf"
-
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
-
-package_llvm-ocaml() {
- pkgdesc="OCaml bindings for LLVM"
- depends=("llvm=$pkgver-$pkgrel" 'ocaml')
-
- cd "$srcdir/llvm-$pkgver.src"
-
- install -d "$pkgdir"/{usr/lib,usr/share/doc/llvm}
- cp -r "$srcdir/ocaml" "$pkgdir/usr/lib"
- cp -r "$srcdir/ocamldoc" "$pkgdir/usr/share/doc/llvm"
-
- # Remove execute bit from static libraries
- chmod -x "$pkgdir"/usr/lib/ocaml/libllvm*.a
-
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/llvm-ocaml/LICENSE"
-}
-
-package_clang() {
- pkgdesc="C language family frontend for LLVM"
- url="http://clang.llvm.org/"
- depends=("llvm=$pkgver-$pkgrel" 'gcc')
-
- # Fix installation path for clang docs
- sed -i 's:$(PROJ_prefix)/share/doc/llvm:$(PROJ_prefix)/share/doc/clang:' \
- "$srcdir/llvm-$pkgver.src/Makefile.config"
-
- cd "$srcdir/llvm-$pkgver.src/tools/clang"
- make DESTDIR="$pkgdir" install
-
- # Fix permissions of static libs
- chmod -x "$pkgdir"/usr/lib/llvm/*.a
-
- # Revert the path change in case we want to do a repackage later
- sed -i 's:$(PROJ_prefix)/share/doc/clang:$(PROJ_prefix)/share/doc/llvm:' \
- "$srcdir/llvm-$pkgver.src/Makefile.config"
-
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang/LICENSE"
-}
-
-package_clang-analyzer() {
- pkgdesc="A source code analysis framework"
- url="http://clang-analyzer.llvm.org/"
- depends=("clang=$pkgver-$pkgrel" 'python2')
-
- cd "$srcdir/llvm-$pkgver.src/tools/clang"
-
- install -d "$pkgdir"/usr/{bin,lib/clang-analyzer}
- for _tool in scan-{build,view}; do
- cp -r tools/$_tool "$pkgdir/usr/lib/clang-analyzer/"
- ln -s /usr/lib/clang-analyzer/$_tool/$_tool "$pkgdir/usr/bin/"
- done
-
- # Use Python 2
- sed -i 's/env python$/&2/' \
- "$pkgdir/usr/lib/clang-analyzer/scan-view/scan-view" \
- "$pkgdir/usr/lib/clang-analyzer/scan-build/set-xcode-analyzer"
-
- # Compile Python scripts
- python2 -m compileall "$pkgdir/usr/lib/clang-analyzer"
- python2 -O -m compileall "$pkgdir/usr/lib/clang-analyzer"
-
- install -Dm644 LICENSE.TXT "$pkgdir/usr/share/licenses/clang-analyzer/LICENSE"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/llvm/cindexer-clang-path.patch b/testing/llvm/cindexer-clang-path.patch
deleted file mode 100644
index ddaab690e..000000000
--- a/testing/llvm/cindexer-clang-path.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/libclang/CIndexer.cpp.orig 2011-04-07 13:08:24.000000000 +0300
-+++ tools/libclang/CIndexer.cpp 2011-04-07 13:11:52.224884642 +0300
-@@ -80,6 +80,7 @@ std::string CIndexer::getClangResourcesP
-
- // We now have the CIndex directory, locate clang relative to it.
- LibClangPath.eraseComponent();
-+ LibClangPath.eraseComponent();
- #endif
-
- LibClangPath.appendComponent("clang");
diff --git a/testing/llvm/clang-plugin-loader-registry.patch b/testing/llvm/clang-plugin-loader-registry.patch
deleted file mode 100644
index f46eb9fce..000000000
--- a/testing/llvm/clang-plugin-loader-registry.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-2.7.orig/autoconf/ExportMap.map llvm-2.7/autoconf/ExportMap.map
---- llvm-2.7.orig/autoconf/ExportMap.map 2010-02-25 00:33:41.000000000 +0200
-+++ llvm-2.7/autoconf/ExportMap.map 2010-05-10 14:14:22.000000000 +0300
-@@ -2,6 +2,7 @@
- global: main;
- __progname;
- environ;
-+ _ZN4llvm8RegistryIN5clang14FrontendActionENS_14RegistryTraitsIS2_EEE4HeadE;
-
- local: *;
- };
diff --git a/testing/llvm/clang-pure64.patch b/testing/llvm/clang-pure64.patch
deleted file mode 100644
index 9bbbfaa8b..000000000
--- a/testing/llvm/clang-pure64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp (revision 123373)
-+++ lib/Driver/Tools.cpp (working copy)
-@@ -3306,7 +3306,7 @@
- else if (ToolChain.getArch() == llvm::Triple::ppc64)
- CmdArgs.push_back("/lib64/ld64.so.1");
- else
-- CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
-+ CmdArgs.push_back("/lib/ld-linux-x86-64.so.2");
- }
-
- CmdArgs.push_back("-o");
diff --git a/testing/llvm/enable-lto.patch b/testing/llvm/enable-lto.patch
deleted file mode 100644
index 3c8691b17..000000000
--- a/testing/llvm/enable-lto.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: lib/Driver/ToolChains.cpp
-===================================================================
---- lib/Driver/ToolChains.cpp (revision 123373)
-+++ lib/Driver/ToolChains.cpp (working copy)
-@@ -1398,7 +1398,7 @@
- PPaths.push_back(Twine(GCCInstallation.getParentLibPath() + "/../" +
- GCCInstallation.getTriple() + "/bin").str());
-
-- Linker = GetProgramPath("ld");
-+ Linker = GetProgramPath("ld.gold");
-
- LinuxDistro Distro = DetectLinuxDistro(Arch);
-
-Index: lib/Driver/Tools.cpp
-===================================================================
---- lib/Driver/Tools.cpp (revision 123373)
-+++ lib/Driver/Tools.cpp (working copy)
-@@ -3412,11 +3412,11 @@
- }
- }
-
-- if (Args.hasArg(options::OPT_use_gold_plugin)) {
-+ // if (Args.hasArg(options::OPT_use_gold_plugin)) {
- CmdArgs.push_back("-plugin");
-- std::string Plugin = ToolChain.getDriver().Dir + "/../lib/LLVMgold.so";
-+ std::string Plugin = ToolChain.getDriver().Dir + "/../lib/llvm/LLVMgold.so";
- CmdArgs.push_back(Args.MakeArgString(Plugin));
-- }
-+ // }
-
- C.addCommand(new Command(JA, *this, ToolChain.Linker.c_str(), CmdArgs));
- }
diff --git a/testing/llvm/fix-gold-lto-linking.patch b/testing/llvm/fix-gold-lto-linking.patch
deleted file mode 100644
index 84d166471..000000000
--- a/testing/llvm/fix-gold-lto-linking.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -upr llvm-3.0.src.orig/tools/gold/Makefile llvm-3.0.src/tools/gold/Makefile
---- llvm-3.0.src.orig/tools/gold/Makefile 2011-05-31 23:00:45.000000000 +0300
-+++ llvm-3.0.src/tools/gold/Makefile 2011-12-04 22:06:59.000000000 +0200
-@@ -26,6 +26,6 @@ LINK_COMPONENTS := support
- # Because off_t is used in the public API, the largefile parts are required for
- # ABI compatibility.
- CXXFLAGS+=-I$(BINUTILS_INCDIR) -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
--CXXFLAGS+=$(SharedLibDir)/$(SharedPrefix)LTO$(SHLIBEXT)
-+CXXFLAGS+=-L $(SharedLibDir) -lLTO
-
- include $(LEVEL)/Makefile.common
diff --git a/testing/module-init-tools/PKGBUILD b/testing/module-init-tools/PKGBUILD
deleted file mode 100644
index 918527cd2..000000000
--- a/testing/module-init-tools/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 144112 2011-12-04 04:52:36Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-# Contributor: judd <jvinet@zeroflux.org>
-
-pkgname=module-init-tools
-pkgver=3.16
-pkgrel=3
-pkgdesc="Utilities needed by Linux systems for managing loadable kernel modules"
-arch=('i686' 'x86_64')
-url="https://modules.wiki.kernel.org"
-license=('GPL')
-depends=('glibc')
-makedepends=('docbook2x')
-backup=('etc/modprobe.d/modprobe.conf'
- 'etc/depmod.d/depmod.conf')
-source=("http://www.kernel.org/pub/linux/utils/kernel/$pkgname/$pkgname-$pkgver.tar.bz2"
- modprobe.conf
- depmod.conf
- docfix.patch)
-md5sums=('bc44832c6e41707b8447e2847d2019f5'
- '325657db471b3190f685e5a89c9b90e3'
- '4b8cbcbc54b9029c99fd730e257d4436'
- '4320d19902ded43bed55c804b065cdc7')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- # fix headers in SGML manpage sources and an XML typo
- patch -Np0 < "$srcdir/docfix.patch"
-
- ./configure --prefix=/usr --exec-prefix=/ --enable-zlib
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
-
- make DESTDIR=$pkgdir install
-
- # extra modprobe.d and depmod.d conf dirs
- install -dm755 "$pkgdir/lib/modprobe.d" "$pkgdir/etc/depmod.d"
-
- # Install custom depmod config to allow searching extramodules/
- install -Dm644 "$srcdir/depmod.conf" "$pkgdir/etc/depmod.d/depmod.conf"
-
- # Install our custom (empty) modprobe.conf
- install -Dm644 "$srcdir/modprobe.conf" "$pkgdir/etc/modprobe.d/modprobe.conf"
-}
diff --git a/testing/module-init-tools/depmod.conf b/testing/module-init-tools/depmod.conf
deleted file mode 100644
index 3feb67b05..000000000
--- a/testing/module-init-tools/depmod.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#
-# /etc/depmod.d/depmod.conf
-#
-
-search updates extramodules built-in
diff --git a/testing/module-init-tools/docfix.patch b/testing/module-init-tools/docfix.patch
deleted file mode 100644
index 0151ca3f1..000000000
--- a/testing/module-init-tools/docfix.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- doc/depmod.conf.sgml.orig 2011-06-25 10:07:15.897805024 -0400
-+++ doc/depmod.conf.sgml 2011-06-25 10:07:48.810805020 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/depmod.sgml.orig 2011-06-25 10:07:15.898805024 -0400
-+++ doc/depmod.sgml 2011-06-25 10:07:56.636805021 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
-@@ -52,7 +52,7 @@
- <arg><option>-n</option></arg>
- <arg><option>-v</option></arg>
- <arg><option>-P <replaceable>prefix</replaceable></option></arg>
-- <arg><option>-w</option><arg>
-+ <arg><option>-w</option></arg>
- <arg><option><replaceable>version</replaceable></option></arg>
- <arg rep='repeat'><option><replaceable>filename</replaceable></option></arg>
- </cmdsynopsis>
---- doc/insmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400
-+++ doc/insmod.sgml 2011-06-25 10:07:59.228805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/lsmod.sgml.orig 2011-06-25 10:07:15.899805024 -0400
-+++ doc/lsmod.sgml 2011-06-25 10:08:04.804805020 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/modinfo.sgml.orig 2011-06-25 10:07:15.900805024 -0400
-+++ doc/modinfo.sgml 2011-06-25 10:08:07.630805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/modprobe.conf.sgml.orig 2011-06-25 10:07:15.901805024 -0400
-+++ doc/modprobe.conf.sgml 2011-06-25 10:08:10.173805018 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/modprobe.sgml.orig 2011-06-25 10:07:15.902805024 -0400
-+++ doc/modprobe.sgml 2011-06-25 10:08:13.623805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/modules.dep.sgml.orig 2011-06-25 10:07:15.903805024 -0400
-+++ doc/modules.dep.sgml 2011-06-25 10:08:19.323805019 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
---- doc/rmmod.sgml.orig 2011-06-25 10:07:15.904805024 -0400
-+++ doc/rmmod.sgml 2011-06-25 10:08:27.691805017 -0400
-@@ -1,4 +1,5 @@
--<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
-+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1.2//EN"
-+ "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
- <!ENTITY debian "<productname>Debian GNU/Linux</productname>">
- <!ENTITY docbook "<productname>DocBook</productname>">
- <!ENTITY sgml "<abbrev>SGML</abbrev>">
diff --git a/testing/module-init-tools/modprobe.conf b/testing/module-init-tools/modprobe.conf
deleted file mode 100644
index 551bdfbdf..000000000
--- a/testing/module-init-tools/modprobe.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-#
-# /etc/modprobe.d/modprobe.conf
-#
diff --git a/testing/nilfs-utils/PKGBUILD b/testing/nilfs-utils/PKGBUILD
deleted file mode 100644
index 7312415f6..000000000
--- a/testing/nilfs-utils/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# $Id: PKGBUILD 145311 2011-12-21 18:00:02Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
-pkgname=nilfs-utils
-pkgver=2.1.0
-pkgrel=2
-pkgdesc="A log-structured file system supporting continuous snapshotting (userspace utils)"
-arch=('i686' 'x86_64')
-url="http://www.nilfs.org/"
-license=('GPL2' 'LGPL2.1')
-backup=('etc/nilfs_cleanerd.conf')
-depends=('util-linux')
-options=(!libtool)
-source=(http://www.nilfs.org/download/$pkgname-$pkgver.tar.bz2)
-md5sums=('738f7bee062051c14dcff444bb17ada7')
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --libdir=/lib --enable-libmount
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver"
- make DESTDIR="$pkgdir" install LDCONFIG=/bin/true
-}
diff --git a/testing/ntp/PKGBUILD b/testing/ntp/PKGBUILD
deleted file mode 100644
index 92fee77b1..000000000
--- a/testing/ntp/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 145678 2011-12-27 02:24:38Z bisson $
-# Maintainer: Gaetan Bisson <bisson@archlinux.org>
-# Contributor: kevin <kevin@archlinux.org>
-
-pkgname=ntp
-pkgver=4.2.6.p5
-_realver=4.2.6p5
-pkgrel=2
-pkgdesc='Network Time Protocol reference implementation'
-url='http://www.ntp.org/'
-license=('custom')
-arch=('i686' 'x86_64')
-depends=('openssl' 'readline' 'libcap')
-makedepends=('perl-html-parser')
-backup=('etc/ntp.conf' 'etc/conf.d/ntpd.conf')
-source=("http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-${_realver}.tar.gz"
- 'ntpd'
- 'ntpdate'
- 'ntp.conf'
- 'ntpd.conf')
-sha1sums=('4a5353a4791b6f4315a66c28d504ec6c7926b192'
- '4e324e625c1f080b5c028be5092aa71adbf9bd99'
- '01394b8a952f5edc85d19df8335eeac3980320f4'
- 'f6fa4838a33a3abcdd168a37b3f4a2dddd60472e'
- '6cfcb7bbd34499b30e31dffca2f3e1a036010271')
-
-install=install
-
-build() {
- cd "${srcdir}/${pkgname}-${_realver}"
-
- ./configure \
- --prefix=/usr \
- --mandir=/usr/share/man \
- --enable-linux-caps \
-
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-$_realver"
-
- make DESTDIR="${pkgdir}" install
-
- install -Dm755 ../ntpd "${pkgdir}"/etc/rc.d/ntpd
- install -Dm755 ../ntpdate "${pkgdir}"/etc/rc.d/ntpdate
- install -Dm644 ../ntp.conf "${pkgdir}"/etc/ntp.conf
- install -Dm644 ../ntpd.conf "${pkgdir}"/etc/conf.d/ntpd.conf
-
- cd html
- ../scripts/html2man
- install -d "${pkgdir}"/usr/share/man
- mv man/man* "${pkgdir}"/usr/share/man
- mv "${pkgdir}/usr/share/man/man8/ntpd.8" "${pkgdir}/usr/share/man/man8/ntp-ntpd.8" # we should ditch openntpd
- cd ..
-
- rmdir "${pkgdir}"/usr/{lib,sbin}
- install -d "${pkgdir}/var/lib/ntp"
- install -Dm644 COPYRIGHT "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-
- touch "${pkgdir}"/var/lib/ntp/.placeholder
-}
diff --git a/testing/ntp/install b/testing/ntp/install
deleted file mode 100644
index 926b4126e..000000000
--- a/testing/ntp/install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_upgrade() {
- if [[ $(vercmp $2 4.2.6.p3) -le 0 ]]; then
- cat <<EOF
-
-==> The file /etc/conf.d/ntp-client.conf has been renamed /etc/conf.d/ntpd.conf
-==> If you made changes to the former, please update the latter.
-
-EOF
- fi
- if [[ $(vercmp $2 4.2.6.p5-1) -le 0 ]]; then
- cat <<EOF
-
-==> The PID file /var/run/ntpd.pid has been renamed /run/ntpd.pid
-==> and the new rc.d script only takes the latter into account.
-==> To stop your old ntpd process, please kill it manually.
-
-EOF
- fi
-}
diff --git a/testing/ntp/ntp.conf b/testing/ntp/ntp.conf
deleted file mode 100644
index 49b2f2bb7..000000000
--- a/testing/ntp/ntp.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# With the default settings below, ntpd will only synchronize your clock.
-#
-# For details, see:
-# - the ntp.conf man page
-# - http://support.ntp.org/bin/view/Support/GettingStarted
-# - https://wiki.archlinux.org/index.php/Network_Time_Protocol_daemon
-
-# Select three geolocalized NTP public servers; see http://www.pool.ntp.org/
-server 0.pool.ntp.org
-server 1.pool.ntp.org
-server 2.pool.ntp.org
-
-# Only allow read-only access from localhost
-restrict default nomodify nopeer
-restrict 127.0.0.1
-restrict ::1
-
-# Location of drift and log files
-driftfile /var/lib/ntp/ntp.drift
-logfile /var/log/ntp.log
-
-# NOTE: If you run dhcpcd and have lines like 'restrict' and 'fudge' appearing
-# here, be sure to add '-Y -N' to the dhcpcd_ethX variables in /etc/conf.d/net
diff --git a/testing/ntp/ntpd b/testing/ntp/ntpd
deleted file mode 100755
index 480fa1088..000000000
--- a/testing/ntp/ntpd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-unset PID
-PIDFILE='/run/ntpd.pid'
-
-if [[ -r ${PIDFILE} ]]; then
- read -r PID <"${PIDFILE}"
- if [[ -n ${PID} && ! -d /proc/${PID} ]]; then
- rm -f "${PIDFILE}"
- unset PID
- fi
-fi
-
-case "$1" in
- start)
- stat_busy "Starting NTP Daemon"
- if [[ -z ${PID} ]] && /usr/bin/ntpd ${NTPD_ARGS} -p "${PIDFILE}" &>/dev/null; then
- add_daemon ntpd
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- stop)
- stat_busy "Stopping NTP Daemon"
- if [[ -n ${PID} ]] && kill "${PID}" &>/dev/null; then
- rm ${PIDFILE}
- rm_daemon ntpd
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/ntp/ntpd.conf b/testing/ntp/ntpd.conf
deleted file mode 100644
index e728db579..000000000
--- a/testing/ntp/ntpd.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# client options for "ntpd -q" - ntpdate equivalent
-NTP_CLIENT_OPTION="-g"
-
-# arguments passed to ntpd when started
-NTPD_ARGS="-g"
diff --git a/testing/ntp/ntpdate b/testing/ntp/ntpdate
deleted file mode 100755
index a8e746785..000000000
--- a/testing/ntp/ntpdate
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/ntpd.conf
-
-case "$1" in
- start)
- stat_busy "Starting NTP Client"
- if /usr/bin/ntpd -q ${NTP_CLIENT_OPTION} &>/dev/null; then
- add_daemon ntpdate
- stat_done
- else
- stat_fail
- exit 1
- fi
- ;;
- stop)
- stat_busy "Stopping NTP Client"
- rm_daemon ntpdate
- stat_done
- ;;
- restart)
- $0 stop
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/openldap/PKGBUILD b/testing/openldap/PKGBUILD
deleted file mode 100644
index 8a06572b5..000000000
--- a/testing/openldap/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# $Id: PKGBUILD 145019 2011-12-14 23:01:42Z eric $
-# Maintainer:
-
-pkgbase=openldap
-pkgname=('libldap' 'openldap')
-pkgver=2.4.28
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.openldap.org/"
-license=('custom')
-makedepends=('libfetch' 'libltdl' 'libsasl' 'e2fsprogs' 'util-linux')
-source=(ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/${pkgbase}-${pkgver}.tgz
- slapd slapd.default ntlm.patch)
-sha1sums=('d888beae1723002a5a2ff5509d3040df40885774'
- 'bd1ea19256d3d467f1f803e0f4046ef50f17628f'
- 'd89b8a533045123f1ab46c9c430cf132d58a20a4'
- 'e4afd9f1c810ef4c4cd8fe1101dfe5887f2b7eef')
-
-build() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
- patch -Np1 -i "${srcdir}"/ntlm.patch
- sed -i 's|-m 644 $(LIBRARY)|-m 755 $(LIBRARY)|' libraries/{liblber,libldap,libldap_r}/Makefile.in
- sed -i 's|#define LDAPI_SOCK LDAP_RUNDIR LDAP_DIRSEP "run" LDAP_DIRSEP "ldapi"|#define LDAPI_SOCK LDAP_DIRSEP "run" LDAP_DIRSEP "openldap" LDAP_DIRSEP "ldapi"|' include/ldap_defaults.h
- sed -i 's|%LOCALSTATEDIR%/run|/run/openldap|' servers/slapd/slapd.conf
- sed -i 's|-$(MKDIR) $(DESTDIR)$(localstatedir)/run|-$(MKDIR) $(DESTDIR)/run/openldap|' servers/slapd/Makefile.in
-
- LDFLAGS="$LDFLAGS -L\"${pkgdir}\"/libldap/usr/lib"
- ./configure --prefix=/usr --mandir=/usr/share/man --libexecdir=/usr/lib \
- --sysconfdir=/etc --localstatedir=/var/lib/openldap \
- --enable-ipv6 --enable-syslog --enable-local \
- --enable-bdb --enable-hdb \
- --enable-crypt --enable-dynamic \
- --with-threads --disable-wrappers \
- --enable-spasswd --with-cyrus-sasl \
- --enable-overlays=mod --enable-modules=yes
- make
-}
-
-check() {
- cd "${srcdir}"/${pkgbase}-${pkgver}
- make test
-}
-
-package_libldap() {
- pkgdesc="Lightweight Directory Access Protocol (LDAP) client libraries"
- depends=('libsasl' 'libfetch' 'e2fsprogs')
- backup=('etc/openldap/ldap.conf')
- options=('!libtool')
-
- cd "${srcdir}"/${pkgbase}-${pkgver}
- for dir in include libraries doc/man/man3 ; do
- pushd ${dir}
- make DESTDIR="${pkgdir}" install
- popd
- done
- install -Dm644 doc/man/man5/ldap.conf.5.tmp "${pkgdir}"/usr/share/man/man5/ldap.conf.5
-
-# get rid of duplicate default conf files
- rm "${pkgdir}"/etc/openldap/*.default
-
- ln -sf liblber.so "${pkgdir}"/usr/lib/liblber.so.2
- ln -sf libldap.so "${pkgdir}"/usr/lib/libldap.so.2
-
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_openldap() {
- pkgdesc="Lightweight Directory Access Protocol (LDAP) client and server"
- depends=("libldap>=${pkgver}" 'libltdl' 'util-linux')
- backup=('etc/openldap/slapd.conf' 'etc/conf.d/slapd')
- options=('!libtool' 'emptydirs')
- install=openldap.install
-
- cd "${srcdir}"/${pkgbase}-${pkgver}
- for dir in clients servers doc/man/man{1,5,8} ; do
- pushd ${dir}
- make DESTDIR="${pkgdir}" install
- popd
- done
- rm "${pkgdir}"/usr/share/man/man5/ldap.conf.5
- rm -r "${pkgdir}"/run
-
-# get rid of duplicate default conf files
- rm "${pkgdir}"/etc/openldap/*.default
-
- ln -s ../lib/slapd "${pkgdir}"/usr/sbin/slapd
-
- chown root:439 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
- chmod 640 "${pkgdir}"/etc/openldap/{slapd.conf,DB_CONFIG.example}
-
- install -dm700 -o 439 -g 439 "${pkgdir}"/var/lib/openldap
- install -dm700 -o 439 -g 439 "${pkgdir}"/etc/openldap/slapd.d
- install -Dm755 "${srcdir}"/slapd "${pkgdir}"/etc/rc.d/slapd
- install -Dm644 "${srcdir}"/slapd.default "${pkgdir}"/etc/conf.d/slapd
- install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/openldap/ntlm.patch b/testing/openldap/ntlm.patch
deleted file mode 100644
index 6804b610d..000000000
--- a/testing/openldap/ntlm.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Patch from evolution-exchange (2.10.3). The ldap_ntlm_bind function is
-actually called by evolution-data-server, checked at version 1.12.2.
-Without this patch, the Exchange addressbook integration uses simple binds
-with cleartext passwords.
-
-Russ checked with openldap-software for upstream's opinion on this patch
-on 2007-12-21. Upstream had never received it as a patch submission and
-given that it's apparently only for older Exchange servers that can't do
-SASL and DIGEST-MD5, it's not very appealing.
-
-Bug#457374 filed against evolution-data-server asking if this support is
-still required on 2007-12-21.
-
-Index: trunk/include/ldap.h
-===================================================================
---- trunk.orig/include/ldap.h
-+++ trunk/include/ldap.h
-@@ -2461,5 +2461,25 @@
- LDAPControl **ctrls,
- LDAPDerefRes **drp ));
-
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge));
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
-Index: trunk/libraries/libldap/ntlm.c
-===================================================================
---- /dev/null
-+++ trunk/libraries/libldap/ntlm.c
-@@ -0,0 +1,138 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp )
-+{
-+ BerElement *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+ id, LDAP_REQ_BIND,
-+ ld->ld_version, dn, tag,
-+ cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+ ld->ld_errno = LDAP_ENCODING_ERROR;
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+ return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+ return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+ LDAP_FREE( ld->ld_error );
-+ ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+ LDAP_FREE( ld->ld_matched );
-+ ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+ &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+ ld->ld_errno = LDAP_DECODING_ERROR;
-+ return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
-+
-Index: trunk/libraries/libldap/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap/Makefile.in
-+++ trunk/libraries/libldap/Makefile.in
-@@ -27,7 +27,7 @@
- init.c options.c print.c string.c util-int.c schema.c \
- charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- tls2.c tls_o.c tls_g.c tls_m.c \
-- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- assertion.c deref.c ldif.c fetch.c
-
- OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -40,7 +40,7 @@
- init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- tls2.lo tls_o.lo tls_g.lo tls_m.lo \
-- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- assertion.lo deref.lo ldif.lo fetch.lo
-
- LDAP_INCDIR= ../../include
-Index: trunk/libraries/libldap_r/Makefile.in
-===================================================================
---- trunk.orig/libraries/libldap_r/Makefile.in
-+++ trunk/libraries/libldap_r/Makefile.in
-@@ -29,7 +29,7 @@
- init.c options.c print.c string.c util-int.c schema.c \
- charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
- tls2.c tls_o.c tls_g.c tls_m.c \
-- turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
- assertion.c deref.c ldif.c fetch.c
- SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
- thr_posix.c thr_cthreads.c thr_thr.c thr_lwp.c thr_nt.c \
-@@ -47,7 +47,7 @@
- init.lo options.lo print.lo string.lo util-int.lo schema.lo \
- charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
- tls2.lo tls_o.lo tls_g.lo tls_m.lo \
-- turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
- assertion.lo deref.lo ldif.lo fetch.lo
-
- LDAP_INCDIR= ../../include
diff --git a/testing/openldap/openldap.install b/testing/openldap/openldap.install
deleted file mode 100644
index cf3cb9f25..000000000
--- a/testing/openldap/openldap.install
+++ /dev/null
@@ -1,20 +0,0 @@
-post_install(){
- groupadd -g 439 ldap &>/dev/null
- useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
- chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_upgrade(){
- getent group ldap >/dev/null 2>&1 || groupadd -g 439 ldap &>/dev/null
- getent passwd ldap >/dev/null 2>&1 || useradd -u 439 -g ldap -d /var/lib/openldap -s /bin/false ldap &>/dev/null
- chown -R ldap:ldap var/lib/openldap &>/dev/null
-}
-
-post_remove(){
- if getent passwd ldap >/dev/null 2>&1; then
- userdel ldap
- fi
- if getent group ldap >/dev/null 2>&1; then
- groupdel ldap
- fi
-}
diff --git a/testing/openldap/slapd b/testing/openldap/slapd
deleted file mode 100755
index 4f212da66..000000000
--- a/testing/openldap/slapd
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-[ -f "/etc/conf.d/slapd" ] && . /etc/conf.d/slapd
-
-PID=`pidof -o %PPID /usr/sbin/slapd`
-case "$1" in
- start)
- stat_busy "Starting OpenLDAP"
- [ ! -d /run/openldap ] && install -d -m755 -o ldap -g ldap /run/openldap
- if [ -z "$PID" ]; then
- if [ -z "$SLAPD_SERVICES" ]; then
- /usr/sbin/slapd -u ldap -g ldap $SLAPD_OPTIONS
- else
- /usr/sbin/slapd -u ldap -g ldap -h "$SLAPD_SERVICES" $SLAPD_OPTIONS
- fi
- if [ $? -gt 0 ]; then
- stat_fail
- else
- stat_done
- fi
- add_daemon slapd
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping OpenLDAP"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm -f /run/openldap/slapd.pid
- rm -f /run/openldap/slapd.args
- rm_daemon slapd
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 3
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/openldap/slapd.default b/testing/openldap/slapd.default
deleted file mode 100644
index 72ae2a6a7..000000000
--- a/testing/openldap/slapd.default
+++ /dev/null
@@ -1,6 +0,0 @@
-# slapd normally serves ldap only on all TCP-ports 389. slapd can also
-# service requests on TCP-port 636 (ldaps) and requests via unix
-# sockets.
-# Example usage:
-#SLAPD_SERVICES="ldap://127.0.0.1:389/ ldaps:/// ldapi:///"
-SLAPD_OPTIONS=""
diff --git a/testing/openvpn/PKGBUILD b/testing/openvpn/PKGBUILD
deleted file mode 100644
index 7e7705243..000000000
--- a/testing/openvpn/PKGBUILD
+++ /dev/null
@@ -1,72 +0,0 @@
-# $Id: PKGBUILD 145902 2012-01-03 21:27:30Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-
-pkgname=openvpn
-pkgver=2.2.2
-pkgrel=1
-pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
-arch=(i686 x86_64)
-url="http://openvpn.net/index.php/open-source.html"
-depends=('openssl' 'lzo2' 'iproute2')
-license=('custom')
-backup=(usr/share/openvpn/easy-rsa/vars
- usr/share/openvpn/easy-rsa/openssl-1.0.0.cnf
- etc/conf.d/openvpn-tapdev)
-source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
- http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz.asc
- openvpn.rc
- openvpn-tapdev.rc
- openvpn-tapdev.conf)
-md5sums=('c5181e27b7945fa6276d21873329c5c7'
- '81ff11ec8cd9fc3c8bc646aae24c4298'
- 'a3809b9727f0c2af2d0770f5c7442db2'
- 'd2c48e970088d679dd3c2afd914ff731'
- '722f483c9e3ce2ec66d3301aaf7cf3d5')
-
-build() {
- cd $srcdir/$pkgname-$pkgver
- # Build openvpn
- CFLAGS="$CFLAGS -DPLUGIN_LIBDIR=\\\"/usr/lib/openvpn\\\"" ./configure \
- --prefix=/usr \
- --enable-password-save \
- --mandir=/usr/share/man \
- --enable-iproute2
- make
-
- # Build plugins
- for plug in auth-pam down-root; do
- cd $srcdir/$pkgname-$pkgver/plugin/$plug
- make
- done
-}
-
-package() {
- cd $srcdir/$pkgname-$pkgver
- # Install openvpn
- make DESTDIR=$pkgdir install
- install -d -m755 $pkgdir/etc/openvpn
- # Install examples
- install -d -m755 $pkgdir/usr/share/openvpn
- cp -r sample-config-files $pkgdir/usr/share/openvpn/examples
- find $pkgdir/usr/share/openvpn -type f -exec chmod 644 {} \;
- find $pkgdir/usr/share/openvpn -type d -exec chmod 755 {} \;
- # Install license
- install -D -m644 COPYING $pkgdir/usr/share/licenses/$pkgname/COPYING
- # Install plugins
- for plug in auth-pam down-root; do
- cd $srcdir/$pkgname-$pkgver/plugin/$plug
- install -D -m755 openvpn-$plug.so $pkgdir/usr/lib/openvpn/openvpn-$plug.so
- cd -
- done
- # Install contrib
- install -d -m755 $pkgdir/usr/share/openvpn/contrib
- cp -r contrib $pkgdir/usr/share/openvpn
- # Install easy-rsa
- cd $srcdir/$pkgname-$pkgver
- make -C easy-rsa/2.0 install DESTDIR=$pkgdir PREFIX=usr/share/openvpn/easy-rsa
- rm -f ${pkgdir}/usr/share/openvpn/easy-rsa/openssl-0.9.?.cnf
- # Install rc scripts
- install -D -m755 $srcdir/openvpn.rc $pkgdir/etc/rc.d/openvpn
- install -D -m755 $srcdir/openvpn-tapdev.rc $pkgdir/etc/rc.d/openvpn-tapdev
- install -D -m644 $srcdir/openvpn-tapdev.conf $pkgdir/etc/conf.d/openvpn-tapdev
-}
diff --git a/testing/openvpn/openvpn-tapdev.conf b/testing/openvpn/openvpn-tapdev.conf
deleted file mode 100644
index afa5586dd..000000000
--- a/testing/openvpn/openvpn-tapdev.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# /etc/conf.d/openvpn-tapdev
-#
-# Place openvpn-tapdev before network into your DAEMONS array
-# This will create permanent tap devices which you can use for bridging
-#
-# Example:
-# TAPDEVS="work home"
-# Will create two tap devices "work" and "home"
-#
-
-TAPDEVS=""
diff --git a/testing/openvpn/openvpn-tapdev.rc b/testing/openvpn/openvpn-tapdev.rc
deleted file mode 100755
index 2c51f8248..000000000
--- a/testing/openvpn/openvpn-tapdev.rc
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/openvpn-tapdev
-
-case "$1" in
- start)
- stat_busy "Creating tap devices for OpenVPN ... "
- success=0
- for tapdev in ${TAPDEVS}; do
- stat_append "${tapdev} "
- /usr/sbin/openvpn --mktun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
- done
- if [ $success -eq 0 ]; then
- add_daemon openvpn-tapdev
- stat_done
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Destroying tap devices for OpenVPN ..."
- for tapdev in ${TAPDEVS}; do
- stat_append "${tapdev} "
- /usr/sbin/openvpn --rmtun --dev-type tap --dev ${tapdev} >/dev/null 2>&1 || success=$?
- done
- rm_daemon openvpn-tapdev
- stat_done
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/openvpn/openvpn.rc b/testing/openvpn/openvpn.rc
deleted file mode 100755
index 96c28b641..000000000
--- a/testing/openvpn/openvpn.rc
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-CFGDIR="/etc/openvpn"
-STATEDIR="/var/run/openvpn"
-
-case "$1" in
- start)
- stat_busy "Starting OpenVPN ... "
- success=0
- mkdir -p "${STATEDIR}"
- for cfg in "${CFGDIR}"/*.conf; do
- stat_append "$(basename "${cfg}" .conf) "
- /usr/sbin/openvpn --daemon --writepid "${STATEDIR}"/"$(basename "${cfg}" .conf)".pid --cd "${CFGDIR}" --config "${cfg}" || success=$?
- done
- if [ $success -eq 0 ]; then
- add_daemon openvpn
- stat_done
- else
- stat_fail
- fi
- ;;
- stop)
- stat_busy "Stopping OpenVPN ..."
- for pidfile in "${STATEDIR}"/*.pid; do
- stat_append "$(basename "${pidfile}" .pid) "
- kill $(cat "${pidfile}" 2>/dev/null) 2>/dev/null
- rm -f "${pidfile}"
- done
- rm_daemon openvpn
- stat_done
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/testing/pcre/PKGBUILD b/testing/pcre/PKGBUILD
deleted file mode 100644
index 88e858d56..000000000
--- a/testing/pcre/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 144981 2011-12-13 00:29:03Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Eric Belanger <eric@archlinux.org>
-# Contributor: John Proctor <jproctor@prium.net>
-
-pkgname=pcre
-pkgver=8.21
-pkgrel=1
-pkgdesc="A library that implements Perl 5-style regular expressions"
-arch=('i686' 'x86_64')
-url="http://www.pcre.org/"
-license=('BSD')
-depends=('gcc-libs')
-options=('!libtool')
-source=(ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('0a7b592bea64b7aa7f4011fc7171a730'
- '4768871445dff956e620a9e902b4db55')
-
-build() {
- cd "${srcdir}"/${pkgname}-${pkgver}
-
- [ "${CARCH}" = "x86_64" ] && export CFLAGS="${CFLAGS} -fPIC"
- ./configure --prefix=/usr --enable-jit \
- --enable-utf8 --enable-unicode-properties
- make
-}
-
-check() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- make check
-}
-
-package() {
- cd "${srcdir}"/${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- # grep uses pcre, so we need the libs in /lib
- install -dm755 "${pkgdir}"/lib
- mv "${pkgdir}"/usr/lib/libpcre.so.* "${pkgdir}"/lib/
- ln -sf /lib/libpcre.so.0 "${pkgdir}"/usr/lib/libpcre.so
-
- install -Dm644 LICENCE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}
diff --git a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch b/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
deleted file mode 100644
index 1404460df..000000000
--- a/testing/perl/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From bb249b0b26c2e79a6f55355ef94889070f07fd21 Mon Sep 17 00:00:00 2001
-From: Niko Tyni <ntyni@debian.org>
-Date: Thu, 28 Apr 2011 09:18:54 +0300
-Subject: [PATCH] Append CFLAGS and LDFLAGS to their Config.pm counterparts in
- EU::CBuilder
-
-Since ExtUtils::CBuilder 0.27_04 (bleadperl commit 06e8058f27e4),
-CFLAGS and LDFLAGS from the environment have overridden the Config.pm
-ccflags and ldflags settings. This can cause binary incompatibilities
-between the core Perl and extensions built with EU::CBuilder.
-
-Append to the Config.pm values rather than overriding them.
----
- .../lib/ExtUtils/CBuilder/Base.pm | 6 +++-
- dist/ExtUtils-CBuilder/t/04-base.t | 25 +++++++++++++++++++-
- 2 files changed, 28 insertions(+), 3 deletions(-)
-
-diff --git a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-index b572312..2255c51 100644
---- a/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-+++ b/dist/ExtUtils-CBuilder/lib/ExtUtils/CBuilder/Base.pm
-@@ -40,11 +40,13 @@ sub new {
- $self->{config}{$k} = $v unless exists $self->{config}{$k};
- }
- $self->{config}{cc} = $ENV{CC} if defined $ENV{CC};
-- $self->{config}{ccflags} = $ENV{CFLAGS} if defined $ENV{CFLAGS};
-+ $self->{config}{ccflags} = join(" ", $self->{config}{ccflags}, $ENV{CFLAGS})
-+ if defined $ENV{CFLAGS};
- $self->{config}{cxx} = $ENV{CXX} if defined $ENV{CXX};
- $self->{config}{cxxflags} = $ENV{CXXFLAGS} if defined $ENV{CXXFLAGS};
- $self->{config}{ld} = $ENV{LD} if defined $ENV{LD};
-- $self->{config}{ldflags} = $ENV{LDFLAGS} if defined $ENV{LDFLAGS};
-+ $self->{config}{ldflags} = join(" ", $self->{config}{ldflags}, $ENV{LDFLAGS})
-+ if defined $ENV{LDFLAGS};
-
- unless ( exists $self->{config}{cxx} ) {
- my ($ccpath, $ccbase, $ccsfx ) = fileparse($self->{config}{cc}, qr/\.[^.]*/);
-diff --git a/dist/ExtUtils-CBuilder/t/04-base.t b/dist/ExtUtils-CBuilder/t/04-base.t
-index c3bf6b5..1bb15aa 100644
---- a/dist/ExtUtils-CBuilder/t/04-base.t
-+++ b/dist/ExtUtils-CBuilder/t/04-base.t
-@@ -1,7 +1,7 @@
- #! perl -w
-
- use strict;
--use Test::More tests => 50;
-+use Test::More tests => 64;
- use Config;
- use Cwd;
- use File::Path qw( mkpath );
-@@ -326,6 +326,29 @@ is_deeply( $mksymlists_args,
- "_prepare_mksymlists_args(): got expected arguments for Mksymlists",
- );
-
-+my %testvars = (
-+ CFLAGS => 'ccflags',
-+ LDFLAGS => 'ldflags',
-+);
-+
-+while (my ($VAR, $var) = each %testvars) {
-+ local $ENV{$VAR};
-+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+ isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+ like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+ "honours $var from Config.pm");
-+
-+ $ENV{$VAR} = "-foo -bar";
-+ $base = ExtUtils::CBuilder::Base->new( quiet => 1 );
-+ ok( $base, "ExtUtils::CBuilder::Base->new() returned true value" );
-+ isa_ok( $base, 'ExtUtils::CBuilder::Base' );
-+ like($base->{config}{$var}, qr/\Q$ENV{$VAR}/,
-+ "honours $VAR from the environment");
-+ like($base->{config}{$var}, qr/\Q$Config{$var}/,
-+ "doesn't override $var from Config.pm with $VAR from the environment");
-+}
-+
- #####
-
- for ($source_file, $object_file, $lib_file) {
---
-1.7.4.4
-
diff --git a/testing/perl/ChangeLog b/testing/perl/ChangeLog
deleted file mode 100644
index 9add39e20..000000000
--- a/testing/perl/ChangeLog
+++ /dev/null
@@ -1,66 +0,0 @@
-2011-06-22 Angel Velasquez <angvp@archlinux.org>
- * Added a patch for ExtUtils doesnt overwrite CFLAGS and LDFLAGS
- * Fixed #FS22197, FS#22441, FS#24767
- * Rebuilt perl 5.14.1-2 against db 5.2.28
-
-2011-06-16 Angel Velasquez <angvp@archlinux.org>
- * Fixed #FS24660
- * Rebuilt against db 5.2.28
-
-2011-05-16 Angel Velasquez <angvp@archlinux.org>
- * perl 5.14.0
- * Removed patch for h2ph warning from 5.12.3
- * Removed provides array, you can use corelist -v 5.14.0 to know the
- modules included with the perl core, through Module::CoreList (thx j3nnn1
- for the tip)
-
-2010-11-07 kevin <kevin@archlinux.org>
-
- * perl 5.12.2-1
- - Using /usr/bin/*_perl for script directories
-
-2010-11-06 kevin <kevin@archlinux.org>
-
- - Removed otherlibdirs directive from Configure
- - Removed /usr/*/perl5/site_perl/5.10.1 from INC
- - Finally removed legacy dirs /usr/lib/perl5/current and
- /usr/lib/perl5/site_perl/current from @INC
-
-2010-05-23 kevin <kevin@archlinux.org>
-
- * perl 5.12.1-2
- - Francois updated the provides array.
-
-2010-05-23 kevin <kevin@archlinux.org>
-
- * perl 5.12.1-1
-
-2010-05-16 kevin <kevin@archlinux.org>
-
- * perl 5.12.0-2
-
-2010-05-12 kevin <kevin@archlinux.org>
-
- - FS#19411. Removed the for loop in perlbin.sh which didn't work on zsh.
- This makes the loop variables unnecessary so the script no longer
- pollutes the user's environment.
- - FS#19427. Added /usr/*/perl5/site_perl/5.10.1 to otherlibdirs to support
- user built modules.
-
-2010-05-09 kevin <kevin@archlinux.org>
-
- * perl 5.12.0-1
- - Modified perlbin.sh to only add existing dirs to PATH. Fixes FS#17402,
- path points to non-existant directories
-
-2010-05-07 kevin <kevin@archlinux.org>
-
- - Added this changelog.
- - Added -Dinc_version_list=none to fix FS#19136, double entry in @INC.
- This removes the duplicates and versioned directory entries.
- - Change scriptdirs to /usr/lib/perl5/{core,vendor,site}_perl/bin to fix
- Fix FS#13808, binaries don't follow FHS.
- - Stopped using versioned directories in sitelib and sitearch.
-
-
-# vim: set ft=changelog ts=4 sw=4 et:
diff --git a/testing/perl/PKGBUILD b/testing/perl/PKGBUILD
deleted file mode 100644
index 0f453d4c1..000000000
--- a/testing/perl/PKGBUILD
+++ /dev/null
@@ -1,116 +0,0 @@
-# $Id: PKGBUILD 145739 2011-12-29 21:16:00Z bluewind $
-# Maintainer: Angel Velasquez <angvp@archlinux.org>
-# Contributor: kevin <kevin.archlinux.org>
-# Contributor: judd <jvinet.zeroflux.org>
-# Contributor: francois <francois.archlinux.org>
-pkgname=perl
-pkgver=5.14.2
-pkgrel=5
-pkgdesc="A highly capable, feature-rich programming language"
-arch=(i686 x86_64)
-license=('GPL' 'PerlArtistic')
-url="http://www.perl.org"
-groups=('base')
-depends=('gdbm' 'db' 'coreutils' 'glibc' 'sh')
-changelog=ChangeLog
-source=(http://www.cpan.org/src/5.0/perl-${pkgver}.tar.bz2
-perlbin.sh
-perlbin.csh
-provides.pl
-0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch)
-install=perl.install
-options=('!makeflags' '!purge')
-md5sums=('04a4c5d3c1f9f19d77daff8e8cd19a26'
- '5ed2542fdb9a60682f215bd33701e61a'
- '1f0cbbee783e8a6d32f01be5118e0d5e'
- '31fc0b5bb4935414394c5cfbec2cb8e5'
- 'c25d86206d649046538c3daab7874564')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- if [ "${CARCH}" = "x86_64" ]; then
- # for x86_64
- arch_opts="-Dcccdlflags='-fPIC'"
- else
- # for i686
- arch_opts=""
- fi
-
- ./Configure -des -Dusethreads -Duseshrplib -Doptimize="${CFLAGS}" \
- -Dprefix=/usr -Dinstallprefix=${pkgdir}/usr -Dvendorprefix=/usr \
- -Dprivlib=/usr/share/perl5/core_perl \
- -Darchlib=/usr/lib/perl5/core_perl \
- -Dsitelib=/usr/share/perl5/site_perl \
- -Dsitearch=/usr/lib/perl5/site_perl \
- -Dvendorlib=/usr/share/perl5/vendor_perl \
- -Dvendorarch=/usr/lib/perl5/vendor_perl \
- -Dscriptdir=/usr/bin/core_perl \
- -Dsitescript=/usr/bin/site_perl \
- -Dvendorscript=/usr/bin/vendor_perl \
- -Dinc_version_list=none \
- -Dman1ext=1perl -Dman3ext=3perl ${arch_opts} \
- -Dlddlflags="-shared ${LDFLAGS}" -Dldflags="${LDFLAGS}"
- patch -Np1 -i $srcdir/0001-Append-CFLAGS-and-LDFLAGS-to-their-Config.pm-counter.patch
- make
-}
-
-check() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make test
-}
-
-package() {
- # hack to work around makepkg running the subshell in check_sanity()
- new_provides=($(cd "$srcdir/perl-$pkgver"; LD_PRELOAD=./libperl.so ./perl -Ilib "$srcdir/provides.pl" .))
- provides=(${new_provides[@]})
-
- cd ${srcdir}/${pkgname}-${pkgver}
- make install
-
- ### Perl Settings ###
- # Change man page extensions for site and vendor module builds.
- # Use archlinux email address instead of my own.
- sed -e '/^man1ext=/ s/1perl/1p/' -e '/^man3ext=/ s/3perl/3pm/' \
- -e "/^cf_email=/ s/'.*'/'kevin@archlinux.org'/" \
- -e "/^perladmin=/ s/'.*'/'kevin@archlinux.org'/" \
- -i ${pkgdir}/usr/lib/perl5/core_perl/Config_heavy.pl
-
- ### CPAN Settings ###
- # Set CPAN default config to use the site directories.
- sed -e '/(makepl_arg =>/ s/""/"INSTALLDIRS=site"/' \
- -e '/(mbuildpl_arg =>/ s/""/"installdirs=site"/' \
- -i ${pkgdir}/usr/share/perl5/core_perl/CPAN/FirstTime.pm
-
- ### CPANPLUS Settings ###
- # Set CPANPLUS default config to use the site directories.
- sed -e "/{'makemakerflags'}/ s/'';/'INSTALLDIRS=site';/" \
- -e "/{'buildflags'}/ s/'';/'installdirs=site';/" \
- -i ${pkgdir}/usr/share/perl5/core_perl/CPANPLUS/Config.pm
-
- # Profile script to set paths to perl scripts.
- install -D -m755 ${srcdir}/perlbin.sh \
- ${pkgdir}/etc/profile.d/perlbin.sh
- # Profile script to set paths to perl scripts on csh. (FS#22441)
- install -D -m755 ${srcdir}/perlbin.csh \
- ${pkgdir}/etc/profile.d/perlbin.csh
-
- (cd ${pkgdir}/usr/bin; mv perl${pkgver} perl)
- (cd ${pkgdir}/usr/bin/core_perl; ln -sf c2ph pstruct; ln -sf s2p psed)
- grep -Rl "${pkgdir}" ${pkgdir}/usr | \
- xargs sed -i "s^${pkgdir}^^g"
-
- # Remove all pod files *except* those under /usr/share/perl5/core_perl/pod/
- # (FS#16488)
- rm -f $pkgdir/usr/share/perl5/core_perl/*.pod
- for d in $pkgdir/usr/share/perl5/core_perl/*; do
- if [ -d $d -a $(basename $d) != "pod" ]; then
- find $d -name *.pod -delete
- fi
- done
- find $pkgdir/usr/lib -name *.pod -delete
- find $pkgdir -name .packlist -delete
- # Add /usr/lib/perl5/core_perl/CORE/ to standard library path (FS#24660)
- install -dv ${pkgdir}/etc/ld.so.conf.d
- echo "/usr/lib/perl5/core_perl/CORE" > ${pkgdir}/etc/ld.so.conf.d/perl.conf
-}
diff --git a/testing/perl/fix-h2ph-and-tests.patch b/testing/perl/fix-h2ph-and-tests.patch
deleted file mode 100644
index a2d176ec6..000000000
--- a/testing/perl/fix-h2ph-and-tests.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 8d66b3f930dc6d88b524d103e304308ae73a46e7 Mon Sep 17 00:00:00 2001
-From: Robin Barker <rmbarker@cpan.org>
-Date: Thu, 22 Apr 2010 11:51:20 +0100
-Subject: [PATCH 1/1] Fix h2ph and test
-
----
- lib/h2ph.t | 12 ++++++++++--
- utils/h2ph.PL | 28 +++++++++++++++++++++++-----
- 2 files changed, 33 insertions(+), 7 deletions(-)
-
-diff --git a/lib/h2ph.t b/lib/h2ph.t
-index 27dd7b9..8d62d46 100644
---- a/lib/h2ph.t
-+++ b/lib/h2ph.t
-@@ -18,7 +18,7 @@ if (!(-e $extracted_program)) {
- exit 0;
- }
-
--plan(4);
-+plan(5);
-
- # quickly compare two text files
- sub txt_compare {
-@@ -41,8 +41,16 @@ $result = runperl( progfile => 'lib/h2ph.pht',
- stderr => 1 );
- like( $result, qr/syntax OK$/, "output compiles");
-
-+$result = runperl( progfile => '_h2ph_pre.ph',
-+ switches => ['-c'],
-+ stderr => 1 );
-+like( $result, qr/syntax OK$/, "preamble compiles");
-+
- $result = runperl( switches => ["-w"],
-- prog => '$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);');
-+ stderr => 1,
-+ prog => <<'PROG' );
-+$SIG{__WARN__} = sub { die $_[0] }; require q(lib/h2ph.pht);
-+PROG
- is( $result, '', "output free of warnings" );
-
- # cleanup
-diff --git a/utils/h2ph.PL b/utils/h2ph.PL
-index 8f56db4..1255807 100644
---- a/utils/h2ph.PL
-+++ b/utils/h2ph.PL
-@@ -401,7 +401,10 @@ if ($opt_e && (scalar(keys %bad_file) > 0)) {
- exit $Exit;
-
- sub expr {
-- $new = '"(assembly code)"' and return if /\b__asm__\b/; # freak out.
-+ if (/\b__asm__\b/) { # freak out
-+ $new = '"(assembly code)"';
-+ return
-+ }
- my $joined_args;
- if(keys(%curargs)) {
- $joined_args = join('|', keys(%curargs));
-@@ -770,7 +773,7 @@ sub inc_dirs
- sub build_preamble_if_necessary
- {
- # Increment $VERSION every time this function is modified:
-- my $VERSION = 2;
-+ my $VERSION = 3;
- my $preamble = "$Dest_dir/_h2ph_pre.ph";
-
- # Can we skip building the preamble file?
-@@ -798,7 +801,16 @@ sub build_preamble_if_necessary
- # parenthesized value: d=(v)
- $define{$_} = $1;
- }
-- if ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
-+ if (/^(\w+)\((\w)\)$/) {
-+ my($macro, $arg) = ($1, $2);
-+ my $def = $define{$_};
-+ $def =~ s/$arg/\$\{$arg\}/g;
-+ print PREAMBLE <<DEFINE;
-+unless (defined &$macro) { sub $macro(\$) { my (\$$arg) = \@_; \"$def\" } }
-+
-+DEFINE
-+ } elsif
-+ ($define{$_} =~ /^([+-]?(\d+)?\.\d+([eE][+-]?\d+)?)[FL]?$/) {
- # float:
- print PREAMBLE
- "unless (defined &$_) { sub $_() { $1 } }\n\n";
-@@ -807,8 +819,14 @@ sub build_preamble_if_necessary
- print PREAMBLE
- "unless (defined &$_) { sub $_() { $1 } }\n\n";
- } elsif ($define{$_} =~ /^\w+$/) {
-- print PREAMBLE
-- "unless (defined &$_) { sub $_() { &$define{$_} } }\n\n";
-+ my $def = $define{$_};
-+ if ($isatype{$def}) {
-+ print PREAMBLE
-+ "unless (defined &$_) { sub $_() { \"$def\" } }\n\n";
-+ } else {
-+ print PREAMBLE
-+ "unless (defined &$_) { sub $_() { &$def } }\n\n";
-+ }
- } else {
- print PREAMBLE
- "unless (defined &$_) { sub $_() { \"",
---
-1.6.5.2.74.g610f9.dirty
-
diff --git a/testing/perl/perl.install b/testing/perl/perl.install
deleted file mode 100644
index a355c5bbe..000000000
--- a/testing/perl/perl.install
+++ /dev/null
@@ -1,10 +0,0 @@
-# arg 1: the new package version
-post_install() {
- for ver in 5.8.{0,1,2,3,4,5,6,7,8}; do
- [ -h usr/lib/perl5/$ver ] && rm usr/lib/perl5/$ver
- [ -h usr/lib/perl5/site_perl/$ver ] && rm usr/lib/perl5/site_perl/$ver
- [ -h usr/bin/perl$ver ] && rm usr/bin/perl$ver
- done
- return 0
-}
-
diff --git a/testing/perl/perlbin.csh b/testing/perl/perlbin.csh
deleted file mode 100644
index 535f0b18d..000000000
--- a/testing/perl/perlbin.csh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && setenv PATH ${PATH}:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && setenv PATH ${PATH}:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && setenv PATH ${PATH}:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && setenv PATH ${PATH}:/usr/bin/core_perl
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
diff --git a/testing/perl/perlbin.sh b/testing/perl/perlbin.sh
deleted file mode 100755
index 20f830436..000000000
--- a/testing/perl/perlbin.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Set path to perl scriptdirs if they exist
-# https://wiki.archlinux.org/index.php/Perl_Policy#Binaries_and_Scripts
-# Added /usr/bin/*_perl dirs for scripts
-# Remove /usr/lib/perl5/*_perl/bin in next release
-
-[ -d /usr/bin/site_perl ] && PATH=$PATH:/usr/bin/site_perl
-[ -d /usr/lib/perl5/site_perl/bin ] && PATH=$PATH:/usr/lib/perl5/site_perl/bin
-
-[ -d /usr/bin/vendor_perl ] && PATH=$PATH:/usr/bin/vendor_perl
-[ -d /usr/lib/perl5/vendor_perl/bin ] && PATH=$PATH:/usr/lib/perl5/vendor_perl/bin
-
-[ -d /usr/bin/core_perl ] && PATH=$PATH:/usr/bin/core_perl
-
-export PATH
-
-# If you have modules in non-standard directories you can add them here.
-#export PERLLIB=dir1:dir2
-
diff --git a/testing/perl/provides.pl b/testing/perl/provides.pl
deleted file mode 100644
index 3bf369577..000000000
--- a/testing/perl/provides.pl
+++ /dev/null
@@ -1,286 +0,0 @@
-# provides.pl
-##
-# Script for printing out a provides list of every CPAN distribution
-# that is bundled with perl.
-#
-# Justin Davis <jrcd83@gmail.com>
-
-use warnings 'FATAL' => 'all';
-use strict;
-
-package Common;
-
-sub evalver
-{
- my ($path, $mod) = @_;
- $mod ||= "";
-
- open my $fh, '<', $path or die "open $path: $!";
-
- while (<$fh>) {
- next unless /\s*(?:\$${mod}::|\$)VERSION\s*=\s*(.+)/;
- my $ver = eval $1;
- return $ver unless $@;
- warn qq{$path:$. bad version string "$ver"\n};
- }
-
- close $fh;
- return undef;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dists;
-
-sub maindistfile
-{
- my ($dist, $dir) = @_;
-
- # libpath is the modern style, installing modules under lib/
- # with dirs matching the name components.
- my $libpath = join q{/}, 'lib', split /-/, "${dist}.pm";
-
- # dumbpath is an old style where there's no subdirs and just
- # a .pm file.
- my $dumbpath = $dist;
- $dumbpath =~ s/\A.+-//;
- $dumbpath .= ".pm";
-
- my @paths = ($libpath, $dumbpath);
- # Some modules (with simple names like XSLoader, lib, etc) are
- # generated by Makefile.PL. Search through their generating code.
- push @paths, "${dist}_pm.PL" if $dist =~ tr/-/-/ == 0;
-
- for my $path (map { "$dir/$_" } @paths) { return $path if -f $path; }
- return undef;
-}
-
-sub module_ver
-{
- my ($dist, $dir) = @_;
-
- my $path = maindistfile($dist, $dir) or return undef;
-
- my $mod = $dist;
- $mod =~ s/-/::/g;
- my $ver = Common::evalver($path, $mod);
- unless ($ver) {
- warn "failed to find version in module file for $dist\n";
- return undef;
- }
-
- return $ver;
-}
-
-sub changelog_ver
-{
- my ($dist, $dir) = @_;
-
- my $path;
- for my $tmp (glob "$dir/{Changes,ChangeLog}") {
- if (-f $tmp) { $path = $tmp; last; }
- }
- return undef unless $path;
-
- open my $fh, '<', $path or die "open: $!";
- while (<$fh>) {
- return $1 if /\A\s*(?:$dist[ \t]*)?([0-9._]+)/;
- return $1 if /\A\s*version\s+([0-9._]+)/i;
- }
- close $fh;
-
- return undef;
-}
-
-# for some reason podlators has a VERSION file with perl code in it
-sub verfile_ver
-{
- my ($dist, $dir) = @_;
-
- my $path = "$dir/VERSION";
- return undef unless -f $path; # no warning, only podlaters has it
-
- return Common::evalver($path);
-}
-
-# scans a directory full of nicely separated dist. directories.
-sub scan_distroot
-{
- my ($distroot) = @_;
- opendir my $cpand, "$distroot" or die "failed to open $distroot";
- my @dists = grep { !/^\./ && -d "$distroot/$_" } readdir $cpand;
- closedir $cpand;
-
- my @found;
- for my $dist (@dists) {
- my $distdir = "$distroot/$dist";
- my $ver = (module_ver($dist, $distdir)
- || changelog_ver($dist, $distdir)
- || verfile_ver($dist, $distdir));
-
- if ($ver) { push @found, [ $dist, $ver ]; }
- else { warn "failed to find version for $dist\n"; }
- }
- return @found;
-}
-
-sub find
-{
- my ($srcdir) = @_;
- return map { scan_distroot($_) } glob "$srcdir/{cpan,dist}";
-}
-
-#-----------------------------------------------------------------------------
-
-package Modules;
-
-use HTTP::Tiny qw();
-use File::Find qw();
-use File::stat;
-
-*findfile = *File::Find::find;
-
-sub cpan_provider
-{
- my ($module) = @_;
- my $url = "http://cpanmetadb.appspot.com/v1.0/package/$module";
- my $http = HTTP::Tiny->new;
- my $resp = $http->get($url);
- return undef unless $resp->{'success'};
-
- my ($cpanpath) = $resp->{'content'} =~ /^distfile: (.*)$/m
- or return undef;
-
- my $dist = $cpanpath;
- $dist =~ s{\A.+/}{}; # remove author directory
- $dist =~ s{-[^-]+\z}{}; # remove version and extension
- return ($dist eq 'perl' ? undef : $dist);
-}
-
-sub find
-{
- my ($srcdir) = @_;
- my $libdir = "$srcdir/lib/";
- die "failed to find $libdir directory" unless -d $libdir;
-
- # Find only the module files that have not changed since perl
- # was extracted. We don't want the files perl just recently
- # installed into lib/. We processed those already.
- my @modfiles;
- my $finder = sub {
- return unless /[.]pm\z/;
- push @modfiles, $_;
- };
- findfile({ 'no_chdir' => 1, 'wanted' => $finder }, $libdir);
-
- # First we have to find what the oldest ctime actually is.
- my $oldest = time;
- @modfiles = map {
- my $modfile = $_;
- my $ctime = (stat $modfile)->ctime;
- $oldest = $ctime if $ctime < $oldest;
- [ $modfile, $ctime ]; # save ctime for later
- } @modfiles;
-
- # Then we filter out any file that was created more than a
- # few seconds after that. Process the rest.
- my @mods;
- for my $modfile (@modfiles) {
- my ($mod, $ctime) = @$modfile;
- next if $ctime - $oldest > 5; # ignore newer files
-
- my $path = $mod;
- $mod =~ s{[.]pm\z}{};
- $mod =~ s{\A$libdir}{};
- $mod =~ s{/}{::}g;
-
- my $ver = Common::evalver($path) || q{};
- push @mods, [ $mod, $ver ];
- }
-
- # Convert modules names to the dist names who provide them.
- my %seen;
- my @dists;
- for my $modref (@mods) {
- my ($mod, $ver) = @$modref;
- my $dist = cpan_provider($mod) or next; # filter out core modules
- next if $seen{$dist}++; # avoid duplicate dists
- push @dists, [ $dist, $ver ];
- }
- return @dists;
-}
-
-#-----------------------------------------------------------------------------
-
-package Dist2Pkg;
-
-sub name
-{
- my ($name) = @_;
- my $orig = $name;
-
- # Package names should be lowercase and consist of alphanumeric
- # characters only (and hyphens!)...
- $name =~ tr/A-Z/a-z/;
- $name =~ tr/_+/-/; # _ and +'s converted to - (ie Tabbed-Text+Wrap)
- $name =~ tr/-a-z0-9+//cd; # Delete all other chars.
- $name =~ tr/-/-/s;
-
- # Delete leading or trailing hyphens...
- $name =~ s/\A-|-\z//g;
-
- die qq{Dist. name '$orig' completely violates packaging standards}
- unless $name;
-
- return "perl-$name";
-}
-
-sub version
-{
- my ($version) = @_;
-
- # Package versions should be numbers and decimal points only...
- $version =~ tr/-/./;
- $version =~ tr/_0-9.-//cd;
-
- # Remove developer versions because pacman has no special logic
- # to compare them to regular versions like perl does.
- $version =~ s/_[^_]+\z//;
-
- $version =~ tr/_//d; # delete other underscores
- $version =~ tr/././s; # only one period at a time
- $version =~ s/\A[.]|[.]\z//g; # shouldn't start or stop with a period
-
- return $version;
-}
-
-#-----------------------------------------------------------------------------
-
-package main;
-
-my %CPANNAME = ('List-Util' => 'Scalar-List-Utils',
- 'Text-Tabs' => 'Text-Tabs+Wrap',
- 'Cwd' => 'PathTools');
-
-my $perldir = shift or die "Usage: $0 [path to perl source directory]\n";
-die "$perldir is not a valid directory." unless -d $perldir;
-
-my @dists = (Dists::find($perldir), Modules::find($perldir));
-for my $dist (@dists) {
- my $name = $dist->[0];
- $dist->[0] = $CPANNAME{$name} if exists $CPANNAME{$name};
-}
-
-my @pkgs = map {
- my ($name, $ver) = @$_;
- $name = Dist2Pkg::name($name);
- $ver = Dist2Pkg::version($ver);
- [ $name, $ver ];
-} @dists;
-
-@pkgs = sort { $a->[0] cmp $b->[0] } @pkgs;
-
-for my $pkg (@pkgs) {
- my ($name, $ver) = @$pkg;
- print "$name=$ver\n";
-}
diff --git a/testing/php/PKGBUILD b/testing/php/PKGBUILD
deleted file mode 100644
index a449de573..000000000
--- a/testing/php/PKGBUILD
+++ /dev/null
@@ -1,365 +0,0 @@
-# $Id: PKGBUILD 145227 2011-12-19 18:04:16Z andrea $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=php
-pkgname=('php'
- 'php-cgi'
- 'php-apache'
- 'php-fpm'
- 'php-embed'
- 'php-pear'
- 'php-enchant'
- 'php-gd'
- 'php-intl'
- 'php-ldap'
- 'php-mcrypt'
- 'php-mssql'
- 'php-odbc'
- 'php-pgsql'
- 'php-pspell'
- 'php-snmp'
- 'php-sqlite'
- 'php-tidy'
- 'php-xsl')
-pkgver=5.3.8
-_suhosinver=5.3.7-0.9.10
-pkgrel=6
-arch=('i686' 'x86_64')
-license=('PHP')
-url='http://www.php.net'
-makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix'
- 'sqlite3' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
- 'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
- 'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
- "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz"
- "http://download.suhosin.org/suhosin-patch-${_suhosinver}.patch.gz.sig"
- 'php.ini.patch' 'apache.conf' 'rc.d.php-fpm' 'php-fpm.conf.in.patch'
- 'logrotate.d.php-fpm')
-md5sums=('704cd414a0565d905e1074ffdc1fadfb'
- '08582e502fed8221c6577042ca45ddb8'
- '5bf4473f658404aa9a97bf026ecef8e9'
- '65606c606df97a0760dfe5aaf9893afc'
- 'dec2cbaad64e3abf4f0ec70e1de4e8e9'
- 'b01be5f816988fcee7e78225836e5e27'
- '09005dabd90c48ddd392b3dbf05f8a82'
- '07c4e412909ac65a44ec90e7a2c4bade')
-
-build() {
- phpconfig="--srcdir=../${pkgbase}-${pkgver} \
- --prefix=/usr \
- --sysconfdir=/etc/php \
- --localstatedir=/var \
- --with-layout=GNU \
- --with-config-file-path=/etc/php \
- --with-config-file-scan-dir=/etc/php/conf.d \
- --enable-inline-optimization \
- --disable-debug \
- --disable-rpath \
- --disable-static \
- --enable-shared \
- --mandir=/usr/share/man \
- --without-pear \
- "
-
- phpextensions="--enable-bcmath=shared \
- --enable-calendar=shared \
- --enable-dba=shared \
- --enable-exif=shared \
- --enable-ftp=shared \
- --enable-gd-native-ttf \
- --enable-intl=shared \
- --enable-json=shared \
- --enable-mbregex \
- --enable-mbstring \
- --enable-pdo \
- --enable-phar=shared \
- --enable-posix=shared \
- --enable-session \
- --enable-shmop=shared \
- --enable-soap=shared \
- --enable-sockets=shared \
- --enable-sqlite-utf8 \
- --enable-sysvmsg=shared \
- --enable-sysvsem=shared \
- --enable-sysvshm=shared \
- --enable-xml \
- --enable-zip=shared \
- --with-bz2=shared \
- --with-curl=shared \
- --with-db4=/usr \
- --with-enchant=shared,/usr \
- --with-freetype-dir=shared,/usr \
- --with-gd=shared \
- --with-gdbm=shared \
- --with-gettext=shared \
- --with-gmp=shared \
- --with-iconv=shared \
- --with-icu-dir=/usr \
- --with-imap-ssl=shared \
- --with-imap=shared \
- --with-jpeg-dir=shared,/usr \
- --with-ldap=shared \
- --with-ldap-sasl \
- --with-mcrypt=shared \
- --with-mhash \
- --with-mssql=shared \
- --with-mysql-sock=/var/run/mysqld/mysqld.sock \
- --with-mysql=shared,mysqlnd \
- --with-mysqli=shared,mysqlnd \
- --with-openssl=shared \
- --with-pcre-regex=/usr \
- --with-pdo-mysql=shared,mysqlnd \
- --with-pdo-odbc=shared,unixODBC,/usr \
- --with-pdo-pgsql=shared \
- --with-pdo-sqlite=shared,/usr \
- --with-pgsql=shared \
- --with-png-dir=shared,/usr \
- --with-pspell=shared \
- --with-regex=php \
- --with-snmp=shared \
- --with-sqlite3=shared,/usr \
- --with-sqlite=shared \
- --with-tidy=shared \
- --with-unixODBC=shared,/usr \
- --with-xmlrpc=shared \
- --with-xsl=shared \
- --with-zlib \
- --without-db2 \
- --without-db3 \
- "
-
- EXTENSION_DIR=/usr/lib/php/modules
- export EXTENSION_DIR
- PEAR_INSTALLDIR=/usr/share/pear
- export PEAR_INSTALLDIR
-
- cd ${srcdir}/${pkgbase}-${pkgver}
-
- # apply suhosin patch
- patch -p1 -i ${srcdir}/suhosin-patch-${_suhosinver}.patch
-
- # adjust paths
- patch -p0 -i ${srcdir}/php.ini.patch
- patch -p0 -i ${srcdir}/php-fpm.conf.in.patch
-
- # php
- mkdir ${srcdir}/build-php
- cd ${srcdir}/build-php
- ln -s ../${pkgbase}-${pkgver}/configure
- ./configure ${phpconfig} \
- --disable-cgi \
- --with-readline \
- --enable-pcntl \
- ${phpextensions}
- make
-
- # cgi and fcgi
- # reuse the previous run; this will save us a lot of time
- cp -a ${srcdir}/build-php ${srcdir}/build-cgi
- cd ${srcdir}/build-cgi
- ./configure ${phpconfig} \
- --disable-cli \
- --enable-cgi \
- ${phpextensions}
- make
-
- # apache
- cp -a ${srcdir}/build-php ${srcdir}/build-apache
- cd ${srcdir}/build-apache
- ./configure ${phpconfig} \
- --disable-cli \
- --with-apxs2 \
- ${phpextensions}
- make
-
- # fpm
- cp -a ${srcdir}/build-php ${srcdir}/build-fpm
- cd ${srcdir}/build-fpm
- ./configure ${phpconfig} \
- --disable-cli \
- --enable-fpm \
- --with-fpm-user=http \
- --with-fpm-group=http \
- ${phpextensions}
- make
-
- # embed
- cp -a ${srcdir}/build-php ${srcdir}/build-embed
- cd ${srcdir}/build-embed
- ./configure ${phpconfig} \
- --disable-cli \
- --enable-embed=shared \
- ${phpextensions}
- make
-
- # pear
- cp -a ${srcdir}/build-php ${srcdir}/build-pear
- cd ${srcdir}/build-pear
- ./configure ${phpconfig} \
- --disable-cgi \
- --with-readline \
- --enable-pcntl \
- --with-pear \
- ${phpextensions}
- make
-}
-
-# check() {
-# cd ${srcdir}/build-php
-# make test
-# }
-
-package_php() {
- pkgdesc='An HTML-embedded scripting language'
- depends=('pcre' 'libxml2' 'bzip2' 'curl')
- replaces=('php-fileinfo' 'php-gmp' 'php-curl')
- provides=('php-fileinfo' 'php-gmp' 'php-curl')
- conflicts=('php-fileinfo' 'php-gmp' 'php-curl')
- backup=('etc/php/php.ini')
-
- cd ${srcdir}/build-php
- make -j1 INSTALL_ROOT=${pkgdir} install
- install -d -m755 ${pkgdir}/usr/share/pear
- # install php.ini
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/php.ini-production ${pkgdir}/etc/php/php.ini
- install -d -m755 ${pkgdir}/etc/php/conf.d/
-
- # remove static modules
- rm -f ${pkgdir}/usr/lib/php/modules/*.a
- # remove modules provided by sub packages
- rm -f ${pkgdir}/usr/lib/php/modules/{enchant,gd,intl,ldap,mcrypt,mssql,odbc,pdo_odbc,pgsql,pdo_pgsql,pspell,snmp,sqlite3,pdo_sqlite,tidy,xsl}.so
- # remove empty directory
- rmdir ${pkgdir}/usr/include/php/include
-}
-
-package_php-cgi() {
- pkgdesc='CGI and FCGI SAPI for PHP'
- depends=('php')
-
- install -D -m755 ${srcdir}/build-cgi/sapi/cgi/php-cgi ${pkgdir}/usr/bin/php-cgi
-}
-
-package_php-apache() {
- pkgdesc='Apache SAPI for PHP'
- depends=('php' 'apache')
- backup=('etc/httpd/conf/extra/php5_module.conf')
-
- install -D -m755 ${srcdir}/build-apache/libs/libphp5.so ${pkgdir}/usr/lib/httpd/modules/libphp5.so
- install -D -m644 ${srcdir}/apache.conf ${pkgdir}/etc/httpd/conf/extra/php5_module.conf
-}
-
-package_php-fpm() {
- pkgdesc='FastCGI Process Manager for PHP'
- depends=('php')
- backup=('etc/php/php-fpm.conf')
-
- install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm
- install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8
- install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
- install -D -m755 ${srcdir}/rc.d.php-fpm ${pkgdir}/etc/rc.d/php-fpm
- install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm
- install -d -m755 ${pkgdir}/etc/php/fpm.d
-}
-
-package_php-embed() {
- pkgdesc='Embed SAPI for PHP'
- depends=('php')
-
- install -D -m755 ${srcdir}/build-embed/libs/libphp5.so ${pkgdir}/usr/lib/libphp5.so
- install -D -m644 ${srcdir}/${pkgbase}-${pkgver}/sapi/embed/php_embed.h ${pkgdir}/usr/include/php/sapi/embed/php_embed.h
-}
-
-package_php-pear() {
- pkgdesc='PHP Extension and Application Repository'
- depends=('php')
- backup=('etc/php/pear.conf')
-
- cd ${srcdir}/build-pear
- make -j1 install-pear INSTALL_ROOT=${pkgdir}
- local i
- while read i; do
- [ ! -e "$i" ] || rm -rf "$i"
- done < <(find ${pkgdir} -name '.*')
-}
-
-package_php-enchant() {
- depends=('php' 'enchant')
- pkgdesc='enchant module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/enchant.so ${pkgdir}/usr/lib/php/modules/enchant.so
-}
-
-package_php-gd() {
- depends=('php' 'libpng' 'libjpeg' 'freetype2')
- pkgdesc='gd module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/gd.so ${pkgdir}/usr/lib/php/modules/gd.so
-}
-
-package_php-intl() {
- depends=('php' 'icu')
- pkgdesc='intl module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/intl.so ${pkgdir}/usr/lib/php/modules/intl.so
-}
-
-package_php-ldap() {
- depends=('php' 'libldap')
- pkgdesc='ldap module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/ldap.so ${pkgdir}/usr/lib/php/modules/ldap.so
-}
-
-package_php-mcrypt() {
- depends=('php' 'libmcrypt' 'libltdl')
- pkgdesc='mcrypt module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/mcrypt.so ${pkgdir}/usr/lib/php/modules/mcrypt.so
-}
-
-package_php-mssql() {
- depends=('php' 'freetds')
- pkgdesc='mssql module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/mssql.so ${pkgdir}/usr/lib/php/modules/mssql.so
-}
-
-package_php-odbc() {
- depends=('php' 'unixodbc')
- pkgdesc='ODBC modules for PHP'
- install -D -m755 ${srcdir}/build-php/modules/odbc.so ${pkgdir}/usr/lib/php/modules/odbc.so
- install -D -m755 ${srcdir}/build-php/modules/pdo_odbc.so ${pkgdir}/usr/lib/php/modules/pdo_odbc.so
-}
-
-package_php-pgsql() {
- depends=('php' 'postgresql-libs')
- pkgdesc='PostgreSQL modules for PHP'
- install -D -m755 ${srcdir}/build-php/modules/pgsql.so ${pkgdir}/usr/lib/php/modules/pgsql.so
- install -D -m755 ${srcdir}/build-php/modules/pdo_pgsql.so ${pkgdir}/usr/lib/php/modules/pdo_pgsql.so
-}
-
-package_php-pspell() {
- depends=('php' 'aspell')
- pkgdesc='pspell module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/pspell.so ${pkgdir}/usr/lib/php/modules/pspell.so
-}
-
-package_php-snmp() {
- depends=('php' 'net-snmp')
- pkgdesc='snmp module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/snmp.so ${pkgdir}/usr/lib/php/modules/snmp.so
-}
-
-package_php-sqlite() {
- depends=('php' 'sqlite3')
- pkgdesc='sqlite3 module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/sqlite3.so ${pkgdir}/usr/lib/php/modules/sqlite3.so
- install -D -m755 ${srcdir}/build-php/modules/pdo_sqlite.so ${pkgdir}/usr/lib/php/modules/pdo_sqlite.so
-}
-
-package_php-tidy() {
- depends=('php' 'tidyhtml')
- pkgdesc='tidy module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/tidy.so ${pkgdir}/usr/lib/php/modules/tidy.so
-}
-
-package_php-xsl() {
- depends=('php' 'libxslt')
- pkgdesc='xsl module for PHP'
- install -D -m755 ${srcdir}/build-php/modules/xsl.so ${pkgdir}/usr/lib/php/modules/xsl.so
-}
diff --git a/testing/php/apache.conf b/testing/php/apache.conf
deleted file mode 100644
index c3ca0aad5..000000000
--- a/testing/php/apache.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Required modules: dir_module, php5_module
-
-<IfModule dir_module>
- <IfModule php5_module>
- DirectoryIndex index.php index.html
- <FilesMatch "\.php$">
- SetHandler application/x-httpd-php
- </FilesMatch>
- <FilesMatch "\.phps$">
- SetHandler application/x-httpd-php-source
- </FilesMatch>
- </IfModule>
-</IfModule>
diff --git a/testing/php/logrotate.d.php-fpm b/testing/php/logrotate.d.php-fpm
deleted file mode 100644
index 7a1ba2597..000000000
--- a/testing/php/logrotate.d.php-fpm
+++ /dev/null
@@ -1,6 +0,0 @@
-/var/log/php-fpm.log {
- missingok
- postrotate
- /etc/rc.d/php-fpm logrotate >/dev/null || true
- endscript
-}
diff --git a/testing/php/php-fpm.conf.in.patch b/testing/php/php-fpm.conf.in.patch
deleted file mode 100644
index b4dd32f96..000000000
--- a/testing/php/php-fpm.conf.in.patch
+++ /dev/null
@@ -1,80 +0,0 @@
---- sapi/fpm/php-fpm.conf.in 2011-07-04 23:22:56.000000000 +0200
-+++ sapi/fpm/php-fpm.conf.in 2011-08-12 16:56:23.686606725 +0200
-@@ -12,7 +12,7 @@
- ; Relative path can also be used. They will be prefixed by:
- ; - the global prefix if it's been set (-p arguement)
- ; - @prefix@ otherwise
--;include=etc/fpm.d/*.conf
-+;include=/etc/php/fpm.d/*.conf
-
- ;;;;;;;;;;;;;;;;;;
- ; Global Options ;
-@@ -22,7 +22,7 @@
- ; Pid file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
- ; Default Value: none
--;pid = run/php-fpm.pid
-+pid = run/php-fpm/php-fpm.pid
-
- ; Error log file
- ; Note: the default prefix is @EXPANDED_LOCALSTATEDIR@
-@@ -102,7 +102,8 @@
- ; specific port;
- ; '/path/to/unix/socket' - to listen on a unix socket.
- ; Note: This value is mandatory.
--listen = 127.0.0.1:9000
-+;listen = 127.0.0.1:9000
-+listen = /var/run/php-fpm/php-fpm.sock
-
- ; Set listen(2) backlog. A value of '-1' means unlimited.
- ; Default Value: 128 (-1 on FreeBSD and OpenBSD)
-@@ -121,9 +122,9 @@
- ; BSD-derived systems allow connections regardless of permissions.
- ; Default Values: user and group are set as the running user
- ; mode is set to 0666
--;listen.owner = @php_fpm_user@
--;listen.group = @php_fpm_group@
--;listen.mode = 0666
-+listen.owner = @php_fpm_user@
-+listen.group = @php_fpm_group@
-+listen.mode = 0660
-
- ; Unix user/group of processes
- ; Note: The user is mandatory. If the group is not set, the default user's group
-@@ -163,23 +164,23 @@
- ; The number of child processes created on startup.
- ; Note: Used only when pm is set to 'dynamic'
- ; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
--;pm.start_servers = 20
-+pm.start_servers = 20
-
- ; The desired minimum number of idle server processes.
- ; Note: Used only when pm is set to 'dynamic'
- ; Note: Mandatory when pm is set to 'dynamic'
--;pm.min_spare_servers = 5
-+pm.min_spare_servers = 5
-
- ; The desired maximum number of idle server processes.
- ; Note: Used only when pm is set to 'dynamic'
- ; Note: Mandatory when pm is set to 'dynamic'
--;pm.max_spare_servers = 35
-+pm.max_spare_servers = 35
-
- ; The number of requests each child process should execute before respawning.
- ; This can be useful to work around memory leaks in 3rd party libraries. For
- ; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
- ; Default Value: 0
--;pm.max_requests = 500
-+pm.max_requests = 500
-
- ; The URI to view the FPM status page. If this value is not set, no URI will be
- ; recognized as a status page. By default, the status page shows the following
-@@ -333,7 +334,7 @@
- ; Chdir to this directory at the start.
- ; Note: relative path can be used.
- ; Default Value: current directory or / when chroot
--;chdir = /var/www
-+;chdir = /srv/http
-
- ; Redirect worker stdout and stderr into main error log. If not set, stdout and
- ; stderr will be redirected to /dev/null according to FastCGI specs.
diff --git a/testing/php/php.ini.patch b/testing/php/php.ini.patch
deleted file mode 100644
index 46c842921..000000000
--- a/testing/php/php.ini.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- php.ini-production 2011-02-09 01:25:44.000000000 +0100
-+++ php.ini-production 2011-03-19 11:11:44.496987763 +0100
-@@ -376,7 +376,7 @@
- ; or per-virtualhost web server configuration file. This directive is
- ; *NOT* affected by whether Safe Mode is turned On or Off.
- ; http://php.net/open-basedir
--;open_basedir =
-+open_basedir = /srv/http/:/home/:/tmp/:/usr/share/pear/
-
- ; This directive allows you to disable certain functions for security reasons.
- ; It receives a comma-delimited list of function names. This directive is
-@@ -781,7 +781,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
-
- ; UNIX: "/path1:/path2"
--;include_path = ".:/php/includes"
-+include_path = ".:/usr/share/pear"
- ;
- ; Windows: "\path1;\path2"
- ;include_path = ".;c:\php\includes"
-@@ -804,7 +804,7 @@
-
- ; Directory in which the loadable extensions (modules) reside.
- ; http://php.net/extension-dir
--; extension_dir = "./"
-+extension_dir = "/usr/lib/php/modules/"
- ; On windows:
- ; extension_dir = "ext"
-
-@@ -938,53 +938,49 @@
- ; If you only provide the name of the extension, PHP will look for it in its
- ; default extension directory.
- ;
--; Windows Extensions
--; Note that ODBC support is built in, so no dll is needed for it.
--; Note that many DLL files are located in the extensions/ (PHP 4) ext/ (PHP 5)
--; extension folders as well as the separate PECL DLL download (PHP 5).
--; Be sure to appropriately set the extension_dir directive.
--;
--;extension=php_bz2.dll
--;extension=php_curl.dll
--;extension=php_fileinfo.dll
--;extension=php_gd2.dll
--;extension=php_gettext.dll
--;extension=php_gmp.dll
--;extension=php_intl.dll
--;extension=php_imap.dll
--;extension=php_interbase.dll
--;extension=php_ldap.dll
--;extension=php_mbstring.dll
--;extension=php_exif.dll ; Must be after mbstring as it depends on it
--;extension=php_mysql.dll
--;extension=php_mysqli.dll
--;extension=php_oci8.dll ; Use with Oracle 10gR2 Instant Client
--;extension=php_oci8_11g.dll ; Use with Oracle 11g Instant Client
--;extension=php_openssl.dll
--;extension=php_pdo_firebird.dll
--;extension=php_pdo_mssql.dll
--;extension=php_pdo_mysql.dll
--;extension=php_pdo_oci.dll
--;extension=php_pdo_odbc.dll
--;extension=php_pdo_pgsql.dll
--;extension=php_pdo_sqlite.dll
--;extension=php_pgsql.dll
--;extension=php_pspell.dll
--;extension=php_shmop.dll
--
--; The MIBS data available in the PHP distribution must be installed.
--; See http://www.php.net/manual/en/snmp.installation.php
--;extension=php_snmp.dll
--
--;extension=php_soap.dll
--;extension=php_sockets.dll
--;extension=php_sqlite.dll
--;extension=php_sqlite3.dll
--;extension=php_sybase_ct.dll
--;extension=php_tidy.dll
--;extension=php_xmlrpc.dll
--;extension=php_xsl.dll
--;extension=php_zip.dll
-+;extension=bcmath.so
-+;extension=bz2.so
-+;extension=calendar.so
-+extension=curl.so
-+;extension=dba.so
-+;extension=enchant.so
-+;extension=exif.so
-+;extension=ftp.so
-+;extension=gd.so
-+extension=gettext.so
-+;extension=gmp.so
-+;extension=iconv.so
-+;extension=imap.so
-+;extension=intl.so
-+extension=json.so
-+;extension=ldap.so
-+;extension=mcrypt.so
-+;extension=mssql.so
-+;extension=mysqli.so
-+;extension=mysql.so
-+;extension=odbc.so
-+;extension=openssl.so
-+;extension=pdo_mysql.so
-+;extension=pdo_odbc.so
-+;extension=pdo_pgsql.so
-+;extension=pdo_sqlite.so
-+;extension=pgsql.so
-+;extension=phar.so
-+;extension=posix.so
-+;extension=pspell.so
-+;extension=shmop.so
-+;extension=snmp.so
-+;extension=soap.so
-+;extension=sockets.so
-+;extension=sqlite3.so
-+;extension=sqlite.so
-+;extension=sysvmsg.so
-+;extension=sysvsem.so
-+;extension=sysvshm.so
-+;extension=tidy.so
-+;extension=xmlrpc.so
-+;extension=xsl.so
-+;extension=zip.so
-
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
diff --git a/testing/php/rc.d.php-fpm b/testing/php/rc.d.php-fpm
deleted file mode 100644
index 54bcf4d5b..000000000
--- a/testing/php/rc.d.php-fpm
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-wait_for_pid () {
- try=0
- while test $try -lt 35 ; do
- case "$1" in
- 'created')
- if [ -f "$2" ] ; then
- try=''
- break
- fi
- ;;
- 'removed')
- if [ ! -f "$2" ] ; then
- try=''
- break
- fi
- ;;
- esac
-
- stat_append '.'
- try=`expr $try + 1`
- sleep 1
- done
-}
-
-test_config() {
- stat_busy 'Checking configuration'
- if [ $(id -u) -ne 0 ]; then
- stat_append '(This script must be run as root)'
- stat_die
- fi
-
- if [ ! -r /etc/php/php-fpm.conf ]; then
- stat_append '(/etc/php/php-fpm.conf not found)'
- stat_die
- fi
-
- local test=$(/usr/sbin/php-fpm -t 2>&1)
- if [ $? -gt 0 ]; then
- stat_append '(error in /etc/php/php-fpm.conf)'
- stat_die
- elif echo $test | grep -qi 'error'; then
- stat_append '(error in /etc/php/php.ini)'
- stat_die
- fi
-
- [ -d /var/run/php-fpm ] || install -d -m755 /var/run/php-fpm
-
- stat_done
-}
-
-case "$1" in
- start)
- test_config
- stat_busy 'Starting php-fpm'
-
- /usr/sbin/php-fpm
-
- if [ "$?" != 0 ] ; then
- stat_fail
- exit 1
- fi
-
- wait_for_pid created /var/run/php-fpm/php-fpm.pid
-
- if [ -n "$try" ] ; then
- stat_fail
- exit 1
- else
- add_daemon php-fpm
- stat_done
- fi
- ;;
-
- stop)
- test_config
- stat_busy 'Gracefully shutting down php-fpm'
-
- if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
- stat_fail
- exit 1
- fi
-
- kill -QUIT `cat /var/run/php-fpm/php-fpm.pid`
-
- wait_for_pid removed /var/run/php-fpm.pid
-
- if [ -n "$try" ] ; then
- stat_fail
- exit 1
- else
- rm_daemon php-fpm
- stat_done
- fi
- ;;
-
- force-quit)
- stat_busy 'Terminating php-fpm'
-
- if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
- stat_fail
- exit 1
- fi
-
- kill -TERM `cat /var/run/php-fpm/php-fpm.pid`
-
- wait_for_pid removed /var/run/php-fpm/php-fpm.pid
-
- if [ -n "$try" ] ; then
- stat_fail
- exit 1
- else
- rm_daemon php-fpm
- stat_done
- fi
- ;;
-
- restart)
- $0 stop
- $0 start
- ;;
-
- reload)
- test_config
- stat_busy 'Reload service php-fpm'
-
- if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
- stat_fail
- exit 1
- fi
-
- kill -USR2 `cat /var/run/php-fpm/php-fpm.pid`
- stat_done
- ;;
-
- logrotate)
- stat_busy 'Reopen php-fpm log'
-
- if [ ! -r /var/run/php-fpm/php-fpm.pid ] ; then
- stat_fail
- exit 1
- fi
-
- kill -USR1 `cat /var/run/php-fpm/php-fpm.pid`
- stat_done
- ;;
-
- *)
- echo "usage: $0 {start|stop|force-quit|restart|reload|logrotate}"
- exit 1
- ;;
-
-esac
diff --git a/testing/pulseaudio/PKGBUILD b/testing/pulseaudio/PKGBUILD
deleted file mode 100644
index 65a83fa30..000000000
--- a/testing/pulseaudio/PKGBUILD
+++ /dev/null
@@ -1,104 +0,0 @@
-# $Id: PKGBUILD 145756 2011-12-30 00:51:02Z heftig $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
-# Contributor: Corrado Primier <bardo@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgbase=pulseaudio
-pkgname=(pulseaudio libpulse)
-pkgdesc="A featureful, general-purpose sound server"
-pkgver=1.1
-pkgrel=2
-arch=(i686 x86_64)
-url="http://pulseaudio.org/"
-license=(GPL LGPL)
-makedepends=(libasyncns libcap attr libxtst libsm libsamplerate libtool rtkit
- speex tdb udev dbus-core avahi bluez gconf intltool jack
- lirc-utils openssl fftw orc json-c gtk2)
-options=(!emptydirs !libtool)
-source=(http://freedesktop.org/software/$pkgbase/releases/$pkgbase-$pkgver.tar.xz
- $pkgbase.xinit)
-sha256sums=('6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee'
- 'a0db6cdc74fbf0ca10e2343c08e1e228f109221c6c0ff91b0bfade5c4bdf03cf')
-
-build() {
- cd "$srcdir/$pkgbase-$pkgver"
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --localstatedir=/var \
- --with-database=tdb \
- --disable-hal \
- --disable-tcpwrap \
- --disable-rpath \
- --disable-default-build-tests
-
- # fight unused direct deps
- sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
- make
-}
-
-package_pulseaudio() {
- depends=("libpulse=$pkgver-$pkgrel" rtkit libtool speex tdb udev fftw orc
- libsamplerate)
- optdepends=('avahi: zeroconf support'
- 'bluez: bluetooth support'
- 'gconf: configuration through gconf (paprefs)'
- 'jack: jack support'
- 'lirc-utils: infra-red support'
- 'openssl: RAOP support'
- 'python2-pyqt: Equalizer GUI (qpaeq)')
- backup=(etc/pulse/{daemon.conf,default.pa,system.pa})
- install=pulseaudio.install
-
- cd "$srcdir/$pkgbase-$pkgver"
- make -j1 DESTDIR="$pkgdir" install
-
- # Lower resample quality, saves CPU
- sed -e '/resample-method/iresample-method=speex-float-0' \
- -i "$pkgdir/etc/pulse/daemon.conf"
-
- # Disable cork-request module, can result in e.g. media players unpausing
- # when there's a Skype call incoming
- sed -e 's|/usr/bin/pactl load-module module-x11-cork-request|#&|' \
- -i "$pkgdir/usr/bin/start-pulseaudio-x11"
-
- # Make ConsoleKit optional
- sed -e $'/load-module module-console-kit/{i.nofail\n;a.fail\n;}' \
- -i "$pkgdir/etc/pulse/default.pa"
-
- # Python fix
- sed -i '1s:python$:&2:' "$pkgdir/usr/bin/qpaeq"
-
- install -Dm755 "$srcdir/pulseaudio.xinit" "$pkgdir/etc/X11/xinit/xinitrc.d/pulseaudio"
-
- rm "$pkgdir/etc/dbus-1/system.d/pulseaudio-system.conf"
-
-### Split libpulse
-
- mkdir -p "$srcdir"/libpulse/{etc/pulse,usr/{lib,share/man/man5}}
-
- mv {"$pkgdir","$srcdir/libpulse"}/etc/pulse/client.conf
-
- mv "$pkgdir"/usr/lib/libpulse{,dsp,-simple,-mainloop-glib}.so* \
- "$pkgdir"/usr/lib/libpulsecommon-*.so \
- "$srcdir/libpulse/usr/lib"
-
- mv {"$pkgdir","$srcdir/libpulse"}/usr/lib/pkgconfig
- mv {"$pkgdir","$srcdir/libpulse"}/usr/include
-
- mv {"$pkgdir","$srcdir/libpulse"}/usr/share/man/man5/pulse-client.conf.5
- mv {"$pkgdir","$srcdir/libpulse"}/usr/share/vala
-}
-
-package_libpulse() {
- pkgdesc="$pkgdesc (client library)"
- depends=(dbus-core libasyncns libcap libxtst libsm libsndfile json-c)
- optdepends=('alsa-plugins: ALSA support'
- 'avahi: zeroconf support')
- backup=(etc/pulse/client.conf)
-
- mv "$srcdir"/libpulse/* "$pkgdir"
-}
diff --git a/testing/pulseaudio/pulseaudio.install b/testing/pulseaudio/pulseaudio.install
deleted file mode 100644
index fd7db3b36..000000000
--- a/testing/pulseaudio/pulseaudio.install
+++ /dev/null
@@ -1,23 +0,0 @@
-post_install() {
- cat << MES
->>> See the wiki at http://wiki.archlinux.org/index.php/PulseAudio for details
- on configuring your system for PulseAudio.
-
->>> Make sure to install pulseaudio-alsa to configure ALSA for PulseAudio.
-MES
-}
-
-post_upgrade() {
- # Delete old users and groups
- # System-wide daemon not supported anymore
- if (( $(vercmp $2 0.9.22) < 0 )); then
- getent passwd pulse &>/dev/null && usr/sbin/userdel -f pulse
- getent group pulse-access &>/dev/null && usr/sbin/groupdel pulse-access
- getent group pulse-rt &>/dev/null && usr/sbin/groupdel pulse-rt
- getent group pulse &>/dev/null && usr/sbin/groupdel pulse
- fi
-
- true
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/pulseaudio/pulseaudio.xinit b/testing/pulseaudio/pulseaudio.xinit
deleted file mode 100644
index 2d30c0943..000000000
--- a/testing/pulseaudio/pulseaudio.xinit
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-case "$DESKTOP_SESSION" in
- gnome|kde*|xfce*) # PulseAudio is started via XDG Autostart
- ;;
- *)
- # Extra checks in case DESKTOP_SESSION is not set correctly
- if [[ -z $KDE_FULL_SESSION && -z $GNOME_DESKTOP_SESSION_ID ]]; then
- /usr/bin/start-pulseaudio-x11
- fi
- ;;
-esac
diff --git a/testing/pyqt/PKGBUILD b/testing/pyqt/PKGBUILD
deleted file mode 100644
index df569bb5b..000000000
--- a/testing/pyqt/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 145217 2011-12-19 18:04:00Z andrea $
-# Maintainer:
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
-
-pkgbase=pyqt
-pkgname=('pyqt' 'python2-pyqt')
-pkgver=4.8.6
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
-license=('GPL')
-makedepends=('qt' 'python-sip' 'dbus-python' 'python2-sip' 'phonon'
- 'python-opengl' 'qt-assistant-compat' 'qtwebkit')
-source=("http://riverbankcomputing.co.uk/static/Downloads/PyQt4/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('9bfd7b08b8e438b83cc50d5c58191f97')
-
-build() {
- cd "${srcdir}"
- cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
-
- cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
- python configure.py \
- --confirm-license \
- --qsci-api
-
- # Thanks Gerardo for the rpath fix
- find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
- make
-
- ### Python2 version ###
- cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
- python2 configure.py \
- --confirm-license \
- -v /usr/share/sip \
- --qsci-api
-
- # Thanks Gerardo for the rpath fix
- find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
-
- make
-}
-
-package_pyqt(){
- pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
- depends=('qtwebkit' 'python-sip')
- optdepends=('phonon: enable audio and video in PyQt applications'
- 'qscintilla: QScintilla API'
- 'qt-assistant-compat: add PyQt online help in Qt Assistant')
- replaces=('python-qt')
- provides=('python-qt')
-
- cd "${srcdir}/PyQt-x11-gpl-${pkgver}"
- # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-}
-
-package_python2-pyqt(){
- pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
- depends=('pyqt' 'python2-sip' 'dbus-python')
- optdepends=('phonon: enable audio and video in PyQt applications'
- 'python-opengl: enable OpenGL 3D graphics in PyQt applications'
- 'qscintilla: QScintilla API'
- 'qt-assistant-compat: add PyQt online help in Qt Assistant')
- replaces=('python2-qt')
- provides=('python2-qt')
- options=('!emptydirs')
-
- cd "${srcdir}/Py2Qt-x11-gpl-${pkgver}"
- # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
- make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
-
- # Provided by pyqt
- rm ${pkgdir}/usr/bin/{pylupdate4,pyrcc4,pyuic4}
- rm ${pkgdir}/usr/lib/qt/plugins/designer/libpythonplugin.so
- rm ${pkgdir}/usr/share/qt/qsci/api/python/PyQt4.api
-}
diff --git a/testing/qt/PKGBUILD b/testing/qt/PKGBUILD
deleted file mode 100644
index cc2b26f1d..000000000
--- a/testing/qt/PKGBUILD
+++ /dev/null
@@ -1,126 +0,0 @@
-# $Id: PKGBUILD 145207 2011-12-19 18:03:03Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=qt
-pkgname=('qt' 'qt-private-headers')
-pkgver=4.8.0
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://qt-project.org/'
-license=('GPL3' 'LGPL')
-makedepends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
- 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils' 'mesa' 'postgresql-libs'
- 'mysql' 'unixodbc' 'cups' 'gtk2')
-options=('!libtool')
-_pkgfqn="${pkgbase}-everywhere-opensource-src-${pkgver}"
-source=("http://get.qt.nokia.com/qt/source/${_pkgfqn}.tar.gz"
- 'assistant.desktop' 'designer.desktop' 'linguist.desktop'
- 'qtconfig.desktop')
-md5sums=('e8a5fdbeba2927c948d9f477a6abe904'
- 'fc211414130ab2764132e7370f8e5caa'
- '85179f5e0437514f8639957e1d8baf62'
- 'f11852b97583610f3dbb669ebc3e21bc'
- '6b771c8a81dd90b45e8a79afa0e5bbfd')
-
-build() {
- cd "${srcdir}"/${_pkgfqn}
-
- export QT4DIR="${srcdir}"/${_pkgfqn}
- export LD_LIBRARY_PATH=${QT4DIR}/lib:${LD_LIBRARY_PATH}
-
- sed -i "s|-O2|${CXXFLAGS}|" mkspecs/common/g++-base.conf
- sed -i "/^QMAKE_LFLAGS_RPATH/s| -Wl,-rpath,||g" mkspecs/common/gcc-base-unix.conf
- sed -i "/^QMAKE_LFLAGS\s/s|+=|+= ${LDFLAGS}|g" mkspecs/common/gcc-base.conf
-
- ./configure -confirm-license -opensource \
- -prefix /usr \
- -docdir /usr/share/doc/qt \
- -plugindir /usr/lib/qt/plugins \
- -importdir /usr/lib/qt/imports \
- -datadir /usr/share/qt \
- -translationdir /usr/share/qt/translations \
- -sysconfdir /etc \
- -examplesdir /usr/share/doc/qt/examples \
- -demosdir /usr/share/doc/qt/demos \
- -plugin-sql-{psql,mysql,sqlite,odbc} \
- -system-sqlite \
- -no-phonon \
- -no-phonon-backend \
- -no-webkit \
- -graphicssystem raster \
- -openssl-linked \
- -nomake demos \
- -nomake examples \
- -nomake docs \
- -silent \
- -no-rpath \
- -optimized-qmake \
- -reduce-relocations \
- -dbus-linked \
- -no-openvg
- make
-}
-
-package_qt() {
- pkgdesc='A cross-platform application and UI framework'
- depends=('libtiff' 'libpng' 'libmng' 'sqlite3' 'ca-certificates' 'glib2' 'dbus'
- 'fontconfig' 'libgl' 'libsm' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
- 'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
- optdepends=('postgresql-libs: PostgreSQL driver'
- 'libmysqlclient: MySQL driver'
- 'unixodbc: ODBC driver'
- 'libxinerama: Xinerama support'
- 'libxcursor: Xcursor support'
- 'libxfixes: Xfixes support')
- install='qt.install'
-
- cd "${srcdir}"/${_pkgfqn}
- make INSTALL_ROOT="${pkgdir}" install
-
- # install missing icons and desktop files
- for icon in tools/linguist/linguist/images/icons/linguist-*-32.png ; do
- size=$(echo $(basename ${icon}) | cut -d- -f2)
- install -p -D -m644 ${icon} \
- "${pkgdir}/usr/share/icons/hicolor/${size}x${size}/apps/linguist.png"
- done
- install -p -D -m644 src/gui/dialogs/images/qtlogo-64.png \
- "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qtlogo.png"
- install -p -D -m644 tools/assistant/tools/assistant/images/assistant.png \
- "${pkgdir}/usr/share/icons/hicolor/32x32/apps/assistant.png"
- install -p -D -m644 tools/designer/src/designer/images/designer.png \
- "${pkgdir}/usr/share/icons/hicolor/128x128/apps/designer.png"
- install -d "${pkgdir}/usr/share/applications"
- install -m644 "${srcdir}"/{linguist,designer,assistant,qtconfig}.desktop \
- "${pkgdir}/usr/share/applications/"
-
- # install license addition
- install -D -m644 LGPL_EXCEPTION.txt \
- ${pkgdir}/usr/share/licenses/qt/LGPL_EXCEPTION.txt
-
- # Fix wrong path in pkgconfig files
- find "${pkgdir}/usr/lib/pkgconfig" -type f -name '*.pc' \
- -exec perl -pi -e "s, -L${srcdir}/?\S+,,g" {} \;
-
- # Fix wrong path in prl files
- find "${pkgdir}/usr/lib" -type f -name '*.prl' \
- -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
-}
-
-package_qt-private-headers(){
- pkgdesc="Qt private headers for development"
- depends=("qt=${pkgver}")
-
- install -d "${pkgdir}"/usr/include/{QtCore,QtDeclarative,QtGui,QtScript}
- install -d "${pkgdir}"/usr/src/{corelib,declarative,gui,script}
-
- for i in QtCore QtDeclarative QtGui QtScript; do
- cp -r "${srcdir}"/${_pkgfqn}/include/${i}/private/ \
- "${pkgdir}"/usr/include/${i}/
- done
-
- for i in corelib declarative gui script; do
- cp -r "${srcdir}"/${_pkgfqn}/src/${i} "${pkgdir}"/usr/src/
- done
-}
diff --git a/testing/qt/assistant.desktop b/testing/qt/assistant.desktop
deleted file mode 100644
index a9e98c44b..000000000
--- a/testing/qt/assistant.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Qt Assistant
-Comment=Shows Qt documentation and examples
-Exec=/usr/bin/assistant
-Icon=assistant
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;Documentation;
diff --git a/testing/qt/designer.desktop b/testing/qt/designer.desktop
deleted file mode 100644
index 9b7b6e9aa..000000000
--- a/testing/qt/designer.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Qt Designer
-GenericName=Interface Designer
-Comment=Design GUIs for Qt applications
-Exec=/usr/bin/designer
-Icon=designer
-MimeType=application/x-designer;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/testing/qt/linguist.desktop b/testing/qt/linguist.desktop
deleted file mode 100644
index 8cbe86599..000000000
--- a/testing/qt/linguist.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Linguist
-Comment=Add translations to Qt applications
-Exec=/usr/bin/linguist
-Icon=linguist
-MimeType=text/vnd.trolltech.linguist;application/x-linguist;
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Development;
diff --git a/testing/qt/qt.install b/testing/qt/qt.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/testing/qt/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
diff --git a/testing/qt/qtconfig.desktop b/testing/qt/qtconfig.desktop
deleted file mode 100644
index 46dcf9e3d..000000000
--- a/testing/qt/qtconfig.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Qt Config
-Comment=Configure Qt behavior, styles, fonts
-Exec=/usr/bin/qtconfig
-Icon=qtlogo
-Terminal=false
-Encoding=UTF-8
-Type=Application
-Categories=Qt;Settings;
-NoDisplay=true
diff --git a/testing/qt3/PKGBUILD b/testing/qt3/PKGBUILD
deleted file mode 100644
index ea8a2a76f..000000000
--- a/testing/qt3/PKGBUILD
+++ /dev/null
@@ -1,133 +0,0 @@
-# $Id: PKGBUILD 145229 2011-12-19 18:04:21Z andrea $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=qt3
-pkgver=3.3.8
-pkgrel=21
-pkgdesc="The QT3 gui toolkit"
-arch=('i686' 'x86_64')
-url="http://www.trolltech.com/products/qt/index.html"
-license=('GPL')
-depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'mesa' 'libxft'
- 'libxrandr' 'libmng')
-makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite3')
-optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
-options=('!libtool')
-install=qt.install
-source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.bz2
- qt.profile qt3-png14.patch qt-copy-kde-patches.tar.bz2
- qt-patches.tar.bz2 utf8-bug-qt3.diff qt-font-default-subst.diff
- mysql.patch eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
-sha1sums=('91b192cb8e80679607d24ae35d6e20ed68d149d7'
- 'd2e257a9011208b2cb81b9cf47915b9a2f9dab83'
- 'c8ea644266f4d6d6be9adf894f03138b8eca3fc2'
- '9cb2e5bec782069692ee337cfa171539d9d73753'
- '116afa0e737bdf27ea27f9b3653aeb56db9ec151'
- 'ca5ecb29c7f1c826d48703339a3371038e306bb7'
- 'd928ff55adb52c4bab2fb268df022651551cd70c'
- 'bb6aad81cce143c23ff7840b1d79f6b2007a0c04'
- '40c7b8f06a21f809ddeb8b5560e9da63ccac6a17'
- '1346320614f6f86fbeb10b9fbad721dea29f5b61'
- 'd9b83b8f6f9c8bd98d290dc1d0e9913a00b62c3f')
-
-# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
-# other qt-patches come from fedora and gentoo
-
-build() {
- unset QMAKESPEC
- export QTDIR="${srcdir}"/qt-x11-free-${pkgver}
- export PATH=${QTDIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
- export QMAKESPEC=$QTDIR/mkspecs/linux-g++
- cd "${srcdir}"/qt-x11-free-${pkgver}
- # apply qt patches from kde.org
- for i in ../qt-copy-kde-patches/*; do
- patch -Np0 -i $i
- done
- # apply other qt patches and one security fix from debian/gentoo
- for i in ../qt-patches/*; do
- patch -Np1 -i $i
- done
- # fix utf8 bug
- patch -p0 -i "${srcdir}"/utf8-bug-qt3.diff
- # fix asia fonts
- patch -p0 -i "${srcdir}"/qt-font-default-subst.diff
- # fix segfaults on exit when using mysql DB driver
- patch -p0 -i "${srcdir}"/mysql.patch
- # fix CJK font/chars select error (FS#11245)
- patch -p1 -i "${srcdir}"/eastern_asian_languagues.diff
- # fix build problem against new unixODBC
- patch -p1 -i "${srcdir}"/qt-odbc.patch
- # fix build with gcc 4.6.0
- patch -p1 -i "${srcdir}"/gcc-4.6.patch
-
- patch -p0 -i "${srcdir}"/qt3-png14.patch
- # start compiling qt
- sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
- rm -rf doc/html examples tutorial
- sed -i "s|sub-tutorial sub-examples||" Makefile
- sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
- sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
- sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
- sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
- sed -i "s|read acceptance|acceptance=yes|" configure
-
- # remove unwanted mkspecs
- rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
-
- if [ "$CARCH" = "x86_64" ]; then
- export ARCH="-64"
- else unset ARCH
- fi
-
- ./configure -prefix /opt/qt \
- -platform linux-g++$ARCH \
- -system-zlib \
- -qt-gif \
- -release \
- -shared \
- -sm \
- -nis \
- -thread \
- -stl \
- -system-lib{png,jpeg,mng} \
- -no-g++-exceptions \
- -plugin-sql-{mysql,psql,sqlite,odbc}
-
- # fix /opt/qt/lib path
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/src/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/designer/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/editor/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/assistant/lib/Makefile
- [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" "${srcdir}"/qt-x11-free-${pkgver}/tools/designer/uilib/Makefile
-
- cd "${srcdir}"/qt-x11-free-${pkgver}
- make -C qmake
- cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/mysql
- "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
- cd "${srcdir}"/qt-x11-free-${pkgver}/plugins/src/sqldrivers/psql
- "${srcdir}"/qt-x11-free-${pkgver}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
-
- cd "${srcdir}"/qt-x11-free-${pkgver}
- # fix the broken makefiles
- #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
- make
-}
-
-package() {
- cd "${srcdir}"/qt-x11-free-${pkgver}
- make INSTALL_ROOT="${pkgdir}" install
- rm -rf "${pkgdir}"/opt/qt/{phrasebooks,templates,translations}
- sed -i "s|-L${srcdir}/qt-x11-free-${pkgver}/lib ||g" "${pkgdir}"/opt/qt/lib/*.prl
- install -D -m755 qmake/qmake "${pkgdir}"/opt/qt/bin/qmake
- install -D -m755 "${srcdir}"/qt.profile "${pkgdir}"/etc/profile.d/qt3.sh
- ln -sf /opt/qt/bin/qtconfig "${pkgdir}"/opt/qt/bin/qt3config
- rm -f "${pkgdir}"/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
-
- # install man pages
- install -d -m755 "${pkgdir}"/opt/qt/man
- cp -r "${srcdir}"/qt-x11-free-${pkgver}/doc/man/{man1,man3} "${pkgdir}"/opt/qt/man/
-
- install -d -m755 "${pkgdir}"/etc/ld.so.conf.d/
- echo '/opt/qt/lib' > "${pkgdir}"/etc/ld.so.conf.d/qt3.conf
-}
diff --git a/testing/qt3/eastern_asian_languagues.diff b/testing/qt3/eastern_asian_languagues.diff
deleted file mode 100644
index 7c25eef7d..000000000
--- a/testing/qt3/eastern_asian_languagues.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-01-15 21:09:13.000000000 +0200
-+++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp 2008-03-10 11:34:22.000000000 +0200
-@@ -966,20 +966,22 @@
-
- #ifdef Q_WS_X11
- if (script == QFont::Han) {
-- // modify script according to locale
-- static QFont::Script defaultHan = QFont::UnknownScript;
-- if (defaultHan == QFont::UnknownScript) {
-- QCString locale = setlocale(LC_ALL, NULL);
-- if (locale.contains("ko"))
-- defaultHan = QFont::Han_Korean;
-- else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
-- defaultHan = QFont::Han_TraditionalChinese;
-- else if (locale.contains("zh"))
-- defaultHan = QFont::Han_SimplifiedChinese;
-- else
-- defaultHan = QFont::Han_Japanese;
-- }
-- script = defaultHan;
-+ // modify script according to locale
-+ static QFont::Script defaultHan;
-+ QCString locale = setlocale(LC_ALL, NULL);
-+
-+ if (locale.contains("ko"))
-+ defaultHan = QFont::Han_Korean;
-+ else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
-+ defaultHan = QFont::Han_TraditionalChinese;
-+ else if (locale.contains("zh"))
-+ defaultHan = QFont::Han_SimplifiedChinese;
-+ else if (locale.contains("ja"))
-+ defaultHan = QFont::Han_Japanese;
-+ else
-+ defaultHan = QFont::Han; // don't change
-+
-+ script = defaultHan;
- }
- #endif
-
diff --git a/testing/qt3/gcc-4.6.patch b/testing/qt3/gcc-4.6.patch
deleted file mode 100644
index bcbffcea6..000000000
--- a/testing/qt3/gcc-4.6.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -up qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef qt-x11-free-3.3.8b/src/tools/qmap.h
---- qt-x11-free-3.3.8b/src/tools/qmap.h.cstddef 2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qmap.h 2011-01-30 21:14:29.275088725 -0600
-@@ -49,6 +49,7 @@
- #include "qvaluelist.h"
- #endif // QT_H
-
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <map>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluelist.h
---- qt-x11-free-3.3.8b/src/tools/qvaluelist.h.cstddef 2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h 2011-01-30 21:14:01.765846592 -0600
-@@ -47,6 +47,7 @@
- #include "qdatastream.h"
- #endif // QT_H
-
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <iterator>
- #include <list>
-diff -up qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef qt-x11-free-3.3.8b/src/tools/qvaluevector.h
---- qt-x11-free-3.3.8b/src/tools/qvaluevector.h.cstddef 2008-01-15 13:09:13.000000000 -0600
-+++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h 2011-01-30 21:14:01.765846592 -0600
-@@ -45,6 +45,7 @@
- #include "qdatastream.h"
- #endif // QT_H
-
-+#include <cstddef>
- #ifndef QT_NO_STL
- #include <vector>
- #endif
diff --git a/testing/qt3/mysql.patch b/testing/qt3/mysql.patch
deleted file mode 100644
index 5f61edc67..000000000
--- a/testing/qt3/mysql.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- src/sql/drivers/mysql/qsql_mysql.cpp
-+++ src/sql/drivers/mysql/qsql_mysql.cpp
-@@ -37,7 +37,6 @@
- #include "qsql_mysql.h"
- #include <private/qsqlextension_p.h>
-
--#include <qapplication.h>
- #include <qdatetime.h>
- #include <qvaluevector.h>
- #include <qsqlrecord.h>
-@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
- }
-
- /////////////////////////////////////////////////////////
--static void qServerEnd()
--{
--#ifndef Q_NO_MYSQL_EMBEDDED
--# if MYSQL_VERSION_ID >= 40000
-- mysql_server_end();
--# endif // MYSQL_VERSION_ID
--#endif // Q_NO_MYSQL_EMBEDDED
--}
-
- static void qServerInit()
- {
-@@ -366,9 +357,7 @@ static void qServerInit()
- qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
- # endif
- }
-- qAddPostRoutine(qServerEnd);
- init = TRUE;
--
- # endif // MYSQL_VERSION_ID
- #endif // Q_NO_MYSQL_EMBEDDED
- }
-@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
- QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
- delete ext;
- }
-+#ifndef Q_NO_MYSQL_EMBEDDED
-+# if MYSQL_VERSION_ID > 40000
-+ mysql_server_end();
-+# endif
-+#endif
- }
-
- bool QMYSQLDriver::hasFeature( DriverFeature f ) const
diff --git a/testing/qt3/qt-copy-kde-patches.tar.bz2 b/testing/qt3/qt-copy-kde-patches.tar.bz2
deleted file mode 100644
index 19d899963..000000000
--- a/testing/qt3/qt-copy-kde-patches.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/testing/qt3/qt-font-default-subst.diff b/testing/qt3/qt-font-default-subst.diff
deleted file mode 100644
index 3e286f74e..000000000
--- a/testing/qt3/qt-font-default-subst.diff
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/kernel/qfontdatabase_x11.cpp
-+++ src/kernel/qfontdatabase_x11.cpp
-@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s
- if (script == QFont::Latin)
- // add Euro character
- FcCharSetAddChar(cs, 0x20ac);
-- if (script == QFont::Han_SimplifiedChinese)
-- FcCharSetAddChar(cs, 0x3400);
-- if (script == QFont::Han_TraditionalChinese){
-- FcCharSetAddChar(cs, 0x3435);
-- FcCharSetAddChar(cs, 0xE000);
-- FcCharSetAddChar(cs, 0xF6B1);
-- }
-- if (script == QFont::MiscellaneousSymbols)
-- FcCharSetAddChar(cs, 0x2714);
- FcPatternAddCharSet(pattern, FC_CHARSET, cs);
- FcCharSetDestroy(cs);
- }
-@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c
- FcPatternPrint(pattern);
- #endif
-
-+ // XftFontMatch calls the right ConfigSubstitute variants, but as we use
-+ // FcFontMatch/Sort here we have to do it manually.
- FcConfigSubstitute(0, pattern, FcMatchPattern);
-+ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
-+
- // qDebug("1: pattern contains:");
- // FcPatternPrint(pattern);
-
-@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c
- value.u.s = (const FcChar8 *)cs.data();
- FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
- }
--#ifdef FONT_MATCH_DEBUG
-- printf("final pattern contains:\n");
-- FcPatternPrint(pattern);
--#endif
- }
-
- if (script != QFont::Unicode) {
-@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c
- if (script == QFont::Latin)
- // add Euro character
- FcCharSetAddChar(cs, 0x20ac);
-- if (script == QFont::Han_SimplifiedChinese)
-- FcCharSetAddChar(cs, 0x3400);
-- if (script == QFont::Han_TraditionalChinese) {
-- FcCharSetAddChar(cs, 0x3435);
-- FcCharSetAddChar(cs, 0xE000);
-- FcCharSetAddChar(cs, 0xF6B1);
-- }
-- if (script == QFont::MiscellaneousSymbols)
-- FcCharSetAddChar(cs, 0x2714);
- FcPatternAddCharSet(pattern, FC_CHARSET, cs);
- FcCharSetDestroy(cs);
- }
-
-+#ifdef FONT_MATCH_DEBUG
-+ printf("final pattern contains:\n");
-+ FcPatternPrint(pattern);
-+#endif
-+
- QFontEngine *fe = 0;
-
- for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
---- src/kernel/qfontdatabase.cpp
-+++ src/kernel/qfontdatabase.cpp
-@@ -554,7 +554,7 @@ static const unsigned short sample_chars
- // GeometricSymbols,
- { 0x2500, 0x0 },
- // MiscellaneousSymbols,
-- { 0x2640, 0x0 },
-+ { 0x2640, 0x2714, 0x0 },
- // EnclosedAndSquare,
- { 0x2460, 0x0 },
- // Braille,
diff --git a/testing/qt3/qt-odbc.patch b/testing/qt3/qt-odbc.patch
deleted file mode 100644
index 6f21e3cf1..000000000
--- a/testing/qt3/qt-odbc.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
---- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig 2009-02-24 11:32:27.000000000 +0100
-+++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp 2009-02-24 11:33:43.000000000 +0100
-@@ -57,13 +57,13 @@
- #endif
-
- // newer platform SDKs use SQLLEN instead of SQLINTEGER
--#ifdef SQLLEN
-+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLLEN SQLLEN
- #else
- # define QSQLLEN SQLINTEGER
- #endif
-
--#ifdef SQLULEN
-+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
- # define QSQLULEN SQLULEN
- #else
- # define QSQLULEN SQLUINTEGER
diff --git a/testing/qt3/qt-patches.tar.bz2 b/testing/qt3/qt-patches.tar.bz2
deleted file mode 100644
index 3f4aee171..000000000
--- a/testing/qt3/qt-patches.tar.bz2
+++ /dev/null
Binary files differ
diff --git a/testing/qt3/qt.install b/testing/qt3/qt.install
deleted file mode 100644
index 6d042daae..000000000
--- a/testing/qt3/qt.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
- post_remove
-}
-
-post_upgrade() {
- post_remove
-}
-
-post_remove() {
- # this can be removed in future versions
- sed -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
-}
diff --git a/testing/qt3/qt.profile b/testing/qt3/qt.profile
deleted file mode 100644
index ed4d232ae..000000000
--- a/testing/qt3/qt.profile
+++ /dev/null
@@ -1,4 +0,0 @@
-export QTDIR=/opt/qt
-export QT_XFT=true
-export PATH=$PATH:$QTDIR/bin
-export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
diff --git a/testing/qt3/qt3-png14.patch b/testing/qt3/qt3-png14.patch
deleted file mode 100644
index e8a194529..000000000
--- a/testing/qt3/qt3-png14.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/kernel/qpngio.cpp.orig 2010-01-16 22:02:41.000000000 +0100
-+++ src/kernel/qpngio.cpp 2010-01-16 22:03:56.000000000 +0100
-@@ -159,7 +159,7 @@
- image.setColor( i, qRgba(c,c,c,0xff) );
- }
- if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
-- const int g = info_ptr->trans_values.gray;
-+ const int g = info_ptr->trans_color.gray;
- if (g < ncols) {
- image.setAlphaBuffer(TRUE);
- image.setColor(g, image.color(g) & RGB_MASK);
-@@ -187,7 +187,7 @@
- info_ptr->palette[i].red,
- info_ptr->palette[i].green,
- info_ptr->palette[i].blue,
-- info_ptr->trans[i]
-+ info_ptr->trans_alpha[i]
- )
- );
- i++;
-@@ -321,9 +321,9 @@
- png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
- if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
- QRgb trans = 0xFF000000 | qRgb(
-- (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
-- (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
-- (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
-+ (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
-+ (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
-+ (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
- for (uint y=0; y<height; y++) {
- for (uint x=0; x<info_ptr->width; x++) {
- if (((uint**)jt)[y][x] == trans) {
diff --git a/testing/qt3/utf8-bug-qt3.diff b/testing/qt3/utf8-bug-qt3.diff
deleted file mode 100644
index 43e84a99f..000000000
--- a/testing/qt3/utf8-bug-qt3.diff
+++ /dev/null
@@ -1,101 +0,0 @@
---- src/codecs/qutfcodec.cpp
-+++ src/codecs/qutfcodec.cpp
-@@ -154,6 +154,7 @@
-
- class QUtf8Decoder : public QTextDecoder {
- uint uc;
-+ uint min_uc;
- int need;
- bool headerDone;
- public:
-@@ -167,8 +168,9 @@
- result.setLength( len ); // worst case
- QChar *qch = (QChar *)result.unicode();
- uchar ch;
-+ int error = -1;
- for (int i=0; i<len; i++) {
-- ch = *chars++;
-+ ch = chars[i];
- if (need) {
- if ( (ch&0xc0) == 0x80 ) {
- uc = (uc << 6) | (ch & 0x3f);
-@@ -182,6 +184,8 @@
- *qch++ = QChar(high);
- *qch++ = QChar(low);
- headerDone = TRUE;
-+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+ *qch++ = QChar::replacement;
- } else {
- if (headerDone || QChar(uc) != QChar::byteOrderMark)
- *qch++ = uc;
-@@ -190,6 +194,7 @@
- }
- } else {
- // error
-+ i = error;
- *qch++ = QChar::replacement;
- need = 0;
- }
-@@ -200,12 +205,21 @@
- } else if ((ch & 0xe0) == 0xc0) {
- uc = ch & 0x1f;
- need = 1;
-+ error = i;
-+ min_uc = 0x80;
- } else if ((ch & 0xf0) == 0xe0) {
- uc = ch & 0x0f;
- need = 2;
-+ error = i;
-+ min_uc = 0x800;
- } else if ((ch&0xf8) == 0xf0) {
- uc = ch & 0x07;
- need = 3;
-+ error = i;
-+ min_uc = 0x10000;
-+ } else {
-+ // error
-+ *qch++ = QChar::replacement;
- }
- }
- }
---- src/tools/qstring.cpp
-+++ src/tools/qstring.cpp
-@@ -5805,6 +5805,7 @@
- result.setLength( len ); // worst case
- QChar *qch = (QChar *)result.unicode();
- uint uc = 0;
-+ uint min_uc = 0;
- int need = 0;
- int error = -1;
- uchar ch;
-@@ -5822,6 +5823,12 @@
- unsigned short low = uc%0x400 + 0xdc00;
- *qch++ = QChar(high);
- *qch++ = QChar(low);
-+ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+ // overlong seqence, UTF16 surrogate or BOM
-+ i = error;
-+ qch = addOne(qch, result);
-+ *qch++ = QChar(0xdbff);
-+ *qch++ = QChar(0xde00+((uchar)utf8[i]));
- } else {
- *qch++ = uc;
- }
-@@ -5844,14 +5851,17 @@
- uc = ch & 0x1f;
- need = 1;
- error = i;
-+ min_uc = 0x80;
- } else if ((ch & 0xf0) == 0xe0) {
- uc = ch & 0x0f;
- need = 2;
- error = i;
-+ min_uc = 0x800;
- } else if ((ch&0xf8) == 0xf0) {
- uc = ch & 0x07;
- need = 3;
- error = i;
-+ min_uc = 0x10000;
- } else {
- // Error
- qch = addOne(qch, result);
diff --git a/testing/qtwebkit/PKGBUILD b/testing/qtwebkit/PKGBUILD
deleted file mode 100644
index 80cca8b44..000000000
--- a/testing/qtwebkit/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 145209 2011-12-19 18:03:48Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-
-pkgname=qtwebkit
-pkgver=2.2.0
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://trac.webkit.org/wiki/QtWebKit'
-pkgdesc='An open source web browser engine (Qt port)'
-license=('LGPL2.1' 'GPL3')
-depends=('qt' 'gperf' 'bison' 'phonon' 'gstreamer0.10-base')
-makedepends=('python2' 'mesa' 'chrpath')
-conflicts=('qt<4.8')
-source=("http://get.qt.nokia.com/${pkgname}/QtWebKit-${pkgver}.tar.gz"
- 'python2-path.patch')
-sha1sums=('3582f3a8b593140af004a19479f5ec19693b3df7'
- 'b0ef3d5596171e3900a685df9bcfac3068ad6330')
-
-build() {
- cd "${srcdir}"/QtWebKit-${pkgver}
-
- patch -p1 -i "${srcdir}"/python2-path.patch
-
- cd Tools/Scripts
- ./build-webkit --qt \
- --prefix=/usr \
- --makeargs="${MAKEFLAGS}" \
- --release \
- --3d-canvas
-}
-
-package() {
- cd "${srcdir}"/QtWebKit-${pkgver}
- make INSTALL_ROOT="${pkgdir}" -C WebKitBuild/Release install
-
- # Fix RPATH
- chrpath -r /usr/lib/ "${pkgdir}"/usr/lib/qt/imports/QtWebKit/libqmlwebkitplugin.so
-}
diff --git a/testing/qtwebkit/python2-path.patch b/testing/qtwebkit/python2-path.patch
deleted file mode 100644
index 2e270e6fc..000000000
--- a/testing/qtwebkit/python2-path.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro~ 2011-10-20 22:39:56.044519075 +0000
-+++ QtWebKit-2.2.0/Source/JavaScriptCore/DerivedSources.pro 2011-10-20 22:41:21.302047082 +0000
-@@ -88,5 +88,5 @@
- retgen.output = $$JSC_GENERATED_SOURCES_DIR/RegExpJitTables.h
- retgen.wkScript = $$PWD/create_regex_tables
- retgen.input = retgen.wkScript
--retgen.commands = python $$retgen.wkScript > ${QMAKE_FILE_OUT}
-+retgen.commands = python2 $$retgen.wkScript > ${QMAKE_FILE_OUT}
- addExtraCompiler(retgen)
---- QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri~ 2011-10-20 22:44:23.827225580 +0000
-+++ QtWebKit-2.2.0/Source/WebCore/CodeGenerators.pri 2011-10-20 22:44:38.550707819 +0000
-@@ -640,7 +640,7 @@
- inspectorJSON.output = $${WC_GENERATED_SOURCES_DIR}/Inspector.idl
- inspectorJSON.input = INSPECTOR_JSON
- inspectorJSON.wkScript = $$PWD/inspector/generate-inspector-idl
--inspectorJSON.commands = python $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
-+inspectorJSON.commands = python2 $$inspectorJSON.wkScript -o $${WC_GENERATED_SOURCES_DIR}/Inspector.idl $$PWD/inspector/Inspector.json
- inspectorJSON.depends = $$PWD/inspector/generate-inspector-idl
- inspectorJSON.wkAddOutputToSources = false
- addExtraCompiler(inspectorJSON)
-@@ -723,7 +723,7 @@
- entities.output = $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp
- entities.input = HTML_ENTITIES
- entities.wkScript = $$PWD/html/parser/create-html-entity-table
--entities.commands = python $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
-+entities.commands = python2 $$entities.wkScript -o $${WC_GENERATED_SOURCES_DIR}/HTMLEntityTable.cpp $$HTML_ENTITIES
- entities.clean = ${QMAKE_FILE_OUT}
- entities.depends = $$PWD/html/parser/create-html-entity-table
- addExtraCompiler(entities)
diff --git a/testing/redland/PKGBUILD b/testing/redland/PKGBUILD
deleted file mode 100644
index cbc431c39..000000000
--- a/testing/redland/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 145231 2011-12-19 18:04:25Z andrea $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Francois Charette <francois.archlinux.org>
-
-pkgbase=redland
-epoch=1
-pkgname=('redland' 'redland-storage-mysql' 'redland-storage-postgresql' 'redland-storage-virtuoso' 'redland-storage-sqlite')
-pkgver=1.0.15
-pkgrel=2
-url="http://librdf.org/"
-license=("GPL")
-arch=('i686' 'x86_64')
-makedepends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'db>=5.2' 'postgresql-libs' 'libmysqlclient' 'unixodbc' 'sqlite3')
-options=('!libtool')
-source=(http://download.librdf.org/source/$pkgname-$pkgver.tar.gz{,.asc}
- rpath.diff)
-sha1sums=('e93d6fafaeebdf9f15a1044be6f4a88270f007af'
- '3aeef38a7247ae33db6a0a19511ef4132240164b'
- 'f5db05c925b6bcd6402d5abd75c648b137f069c7')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr \
- --enable-release \
- --disable-static \
- --with-raptor=system \
- --with-rasqal=system \
- --with-sqlite=3
-
- # nuke rpath
- patch -Np0 -i "${srcdir}/rpath.diff"
-
- make
-}
-
-package_redland() {
- pkgdesc="Library that provides a high-level interface to RDF data"
- depends=('rasqal>=0.9.26' 'raptor>=2.0.6' 'libltdl')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}/usr/lib/redland"
-}
-
-package_redland-storage-mysql() {
- pkgdesc="MySQL storage support for Redland"
- depends=('redland' 'libmysqlclient')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- install -dm755 "${pkgdir}/usr/lib/redland"
- install -m755 src/.libs/librdf_storage_mysql.so "${pkgdir}/usr/lib/redland/librdf_storage_mysql.so"
-}
-
-package_redland-storage-postgresql() {
- pkgdesc="PostgreSQL storage support for Redland"
- depends=('redland' 'postgresql-libs')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- install -dm755 "${pkgdir}/usr/lib/redland"
- install -m755 src/.libs/librdf_storage_postgresql.so "${pkgdir}/usr/lib/redland/"
-}
-
-package_redland-storage-virtuoso() {
- pkgdesc="Virtuoso storage support for Redland"
- depends=('redland' 'unixodbc' 'db')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- install -dm755 "${pkgdir}/usr/lib/redland"
- install -m755 src/.libs/librdf_storage_virtuoso.so "${pkgdir}/usr/lib/redland/"
-}
-
-package_redland-storage-sqlite() {
- pkgdesc="SQLite storage support for Redland"
- depends=('redland' 'sqlite3' 'db')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- install -dm755 "${pkgdir}/usr/lib/redland"
- install -m755 src/.libs/librdf_storage_sqlite.so "${pkgdir}/usr/lib/redland/"
-}
diff --git a/testing/redland/rpath.diff b/testing/redland/rpath.diff
deleted file mode 100644
index 831bc80ed..000000000
--- a/testing/redland/rpath.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- libtool 2011-02-20 10:46:47.000000000 +0100
-+++ libtool.new 2011-02-20 10:52:58.285764909 +0100
-@@ -324,7 +324,7 @@
-
- # Flag to hardcode $libdir into a binary during linking.
- # This must work even if $libdir does not exist
--hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
-+hardcode_libdir_flag_spec=" "
-
- # If ld is used when linking, flag to hardcode $libdir into a binary
- # during linking. This must work even if $libdir does not exist.
diff --git a/testing/shadow/LICENSE b/testing/shadow/LICENSE
deleted file mode 100644
index c5ab15a56..000000000
--- a/testing/shadow/LICENSE
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 1990 - 1994, Julianne Frances Haugh
- * Copyright (c) 1996 - 2000, Marek Michałkiewicz
- * Copyright (c) 2001 - 2006, Tomasz KÅ‚oczko
- * Copyright (c) 2007 - 2009, Nicolas François
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. The name of the copyright holders or contributors may not be used to
- * endorse or promote products derived from this software without
- * specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
diff --git a/testing/shadow/PKGBUILD b/testing/shadow/PKGBUILD
deleted file mode 100644
index c7196a385..000000000
--- a/testing/shadow/PKGBUILD
+++ /dev/null
@@ -1,107 +0,0 @@
-# $Id: PKGBUILD 144103 2011-12-04 01:16:49Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=shadow
-pkgver=4.1.4.3
-pkgrel=5
-pkgdesc="Password and account management tool suite with support for shadow files and PAM"
-arch=('i686' 'x86_64')
-url='http://pkg-shadow.alioth.debian.org/'
-license=('BSD')
-groups=('base')
-depends=('bash' 'pam' 'acl')
-backup=(etc/login.defs
- etc/pam.d/{chage,login,passwd,shadow,useradd,usermod,userdel}
- etc/pam.d/{chpasswd,newusers,groupadd,groupdel,groupmod}
- etc/pam.d/{chfn,chgpasswd,groupmems,chsh}
- etc/default/useradd)
-options=('!libtool')
-install=shadow.install
-#http://pkg-shadow.alioth.debian.org/releases/shadow-$pkgver.tar.bz2
-# shadow 4.1.4.3 is just shadow 4.1.4.2 with shadow_CVE-2011-0721.patch applied
-source=(ftp://ftp.archlinux.org/other/shadow/shadow_4.1.4.2+svn3283.orig.tar.gz
- adduser chgpasswd chpasswd defaults.pam login login.defs newusers
- passwd shadow.cron.daily useradd.defaults LICENSE
- xstrdup.patch shadow_CVE-2011-0721.patch shadow-strncpy-usage.patch
- shadow-add-missing-include.patch)
-sha1sums=('8b704b8f07718e329205f23d457c3121c0f3679e'
- '78ec184a499f9708adcfcf0b7a3b22a60bf39f91'
- '4ad0e059406a305c8640ed30d93c2a1f62c2f4ad'
- '12427b1ca92a9b85ca8202239f0d9f50198b818f'
- '0e56fed7fc93572c6bf0d8f3b099166558bb46f1'
- '895aad07c192b288b457e19dd7b8c55841b4ad22'
- 'e5cab2118ecb1e61874cde842d7d04d1003f35cb'
- '12427b1ca92a9b85ca8202239f0d9f50198b818f'
- '611be25d91c3f8f307c7fe2485d5f781e5dee75f'
- '5d83ba7e11c765c951867cbe00b0ae7ff57148fa'
- '9ae93de5987dd0ae428f0cc1a5a5a5cd53583f19'
- '33a6cf1e44a1410e5c9726c89e5de68b78f5f922'
- '6010fffeed1fc6673ad9875492e1193b1a847b53'
- '6bfe6528391eb38d338beacedd620407877b637d'
- '9db9e62ad173f31e1039121c0124cf60826ffd7e'
- '0697a21f7519de30821da7772677035652df4ad2')
-
-build() {
- cd "$srcdir/$pkgname-4.1.4.2+svn3283"
-
- #Ugh, force this to build shared libraries, for god's sake
- sed -i "s/noinst_LTLIBRARIES/lib_LTLIBRARIES/g" lib/Makefile.am
- libtoolize
- autoreconf
- export LDFLAGS="$LDFLAGS -lcrypt"
-
- patch -p1 -i "$srcdir/xstrdup.patch"
- patch -p1 -i "$srcdir/shadow_CVE-2011-0721.patch"
- patch -p1 -i "$srcdir/shadow-strncpy-usage.patch"
- patch -p1 -i "$srcdir/shadow-add-missing-include.patch"
-
- # supress etc/pam.d/*, we provide our own
- sed -i '/^SUBDIRS/s/pam.d//' etc/Makefile.in
-
- ./configure \
- --prefix=/usr --libdir=/lib \
- --mandir=/usr/share/man --sysconfdir=/etc \
- --enable-shared --disable-static \
- --with-libpam --without-selinux
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-4.1.4.2+svn3283"
- make DESTDIR="$pkgdir" install
-
- # license
- install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/shadow/LICENSE"
-
- # interactive useradd
- install -Dm755 "$srcdir/adduser" "$pkgdir/usr/sbin/adduser"
-
- # useradd defaults
- install -Dm644 "$srcdir/useradd.defaults" "$pkgdir/etc/default/useradd"
-
- # cron job
- install -Dm744 "$srcdir/shadow.cron.daily" "$pkgdir/etc/cron.daily/shadow"
-
- # login.defs
- install -Dm644 "$srcdir/login.defs" "$pkgdir/etc/login.defs"
-
- # PAM config - custom
- install -Dm644 "$srcdir/login" "$pkgdir/etc/pam.d/login"
- install -Dm644 "$srcdir/passwd" "$pkgdir/etc/pam.d/passwd"
- install -Dm644 "$srcdir/chgpasswd" "$pkgdir/etc/pam.d/chgpasswd"
- install -Dm644 "$srcdir/chpasswd" "$pkgdir/etc/pam.d/chpasswd"
- install -Dm644 "$srcdir/newusers" "$pkgdir/etc/pam.d/newusers"
- # PAM config - from tarball
- install -Dm644 etc/pam.d/groupmems "$pkgdir/etc/pam.d/groupmems"
-
- # we use the 'useradd' PAM file for other similar utilities
- for file in chage chfn chsh groupadd groupdel groupmod shadow \
- useradd usermod userdel; do
- install -Dm644 "$srcdir/defaults.pam" "$pkgdir/etc/pam.d/$file"
- done
-
- # Remove su - using su from coreutils instead
- rm "$pkgdir/bin/su"
- find "$pkgdir/usr/share/man" -name 'su.1' -delete
-}
diff --git a/testing/shadow/adduser b/testing/shadow/adduser
deleted file mode 100644
index a5d7fd4fa..000000000
--- a/testing/shadow/adduser
+++ /dev/null
@@ -1,399 +0,0 @@
-#!/bin/bash
-#
-# Copyright 1995 Hrvoje Dogan, Croatia.
-# Copyright 2002, 2003, 2004 Stuart Winter, West Midlands, England, UK.
-# Copyright 2004 Slackware Linux, Inc., Concord, CA, USA
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#
-##########################################################################
-# Program: /usr/sbin/adduser
-# Purpose: Interactive front end to /usr/sbin/useradd for Slackware Linux
-# Author : Stuart Winter <stuart@polplex.co.uk>
-# Based on the original Slackware adduser by Hrvoje Dogan
-# with modifications by Patrick Volkerding
-# Version: 1.09
-##########################################################################
-# Usage..: adduser [<new_user_name>]
-##########################################################################
-# History #
-###########
-# v1.09 - 07/06/04
-# * Added standard Slackware script licence to the head of this file.
-# v1.08 - 25/04/04
-# * Disallow user names that begin with a numeric because useradd
-# (from shadow v4.03) does not allow them. <sw>
-# v1.07 - 07/03/03
-# * When supplying a null string for the uid (meaning 'Choose next available'),
-# if there were file names in the range 'a-z' in the pwd then the
-# egrep command considered these files rather than the null string.
-# The egrep expression is now in quotes.
-# Reported & fixed by Vadim O. Ustiansky <sw>
-# v1.06 - 31/03/03
-# * Ask to chown user.group the home directory if it already exists.
-# This helps reduce later confusion when adding users whose home dir
-# already exists (mounted partition for example) and is owned
-# by a user other than the user to which the directory is being
-# assigned as home. Default is not to chown.
-# Brought to my attention by mRgOBLIN. <sw>
-# v1.05 - 04/01/03
-# * Advise & prevent users from creating logins with '.' characters
-# in the user name. <sw>
-# * Made pending account creation info look neater <sw>
-# v1.04 - 09/06/02
-# * Catered for shadow-4.0.3's 'useradd' binary that no longer
-# will let you create a user that has any uppercase chars in it
-# This was reported on the userlocal.org forums
-# by 'xcp' - thanks. <sw,pjv>
-# v1.03 - 20/05/02
-# * Support 'broken' (null lines in) /etc/passwd and
-# /etc/group files <sw>
-# * For recycling UIDs (default still 'off'), we now look in
-# /etc/login.defs for the UID_MIN value and use it
-# If not found then default to 1000 <sw>
-# v1.02 - 10/04/02
-# * Fix user-specified UID bug. <pjv>
-# v1.01 - 23/03/02
-# * Match Slackware indenting style, simplify. <pjv>
-# v1.00 - 22/03/02
-# * Created
-#######################################################################
-
-# Path to files
-pfile=/etc/passwd
-gfile=/etc/group
-sfile=/etc/shells
-
-# Paths to binaries
-useradd=/usr/sbin/useradd
-chfn=/usr/bin/chfn
-passwd=/usr/bin/passwd
-
-# Defaults
-defhome=/home
-defshell=/bin/bash
-defgroup=users
-
-# Determine what the minimum UID is (for UID recycling)
-# (we ignore it if it's not at the beginning of the line (i.e. commented out with #))
-export recycleUIDMIN="$(grep ^UID_MIN /etc/login.defs | awk '{print $2}' 2>/dev/null)"
-# If we couldn't find it, set it to the default of 1000
-if [ -z "$recycleUIDMIN" ]; then
- export recycleUIDMIN=1000 # this is the default from Slackware's /etc/login.defs
-fi
-
-
-# This setting enables the 'recycling' of older unused UIDs.
-# When you userdel a user, it removes it from passwd and shadow but it will
-# never get used again unless you specify it expliticly -- useradd (appears to) just
-# look at the last line in passwd and increment the uid. I like the idea of
-# recycling uids but you may have very good reasons not to (old forgotten
-# confidential files still on the system could then be owned by this new user).
-# We'll set this to no because this is what the original adduser shell script
-# did and it's what users expect.
-recycleuids=no
-
-# Function to read keyboard input.
-# bash1 is broken (even ash will take read -ep!), so we work around
-# it (even though bash1 is no longer supported on Slackware).
-function get_input() {
- local output
- if [ "`echo $BASH_VERSION | cut -b1`" = "1" ]; then
- echo -n "${1} " >&2 # fudge for use with bash v1
- read output
- else # this should work with any other /bin/sh
- read -ep "${1} " output
- fi
- echo $output
-}
-
-# Function to display the account info
-function display () {
- local goose
- goose="$(echo $2 | cut -d ' ' -f 2-)" # lop off the prefixed argument useradd needs
- echo -n "$1 "
- # If it's null then display the 'other' information
- if [ -z "$goose" -a ! -z "$3" ]; then
- echo "$3"
- else
- echo "$goose"
- fi
-}
-
-# Function to check whether groups exist in the /etc/group file
-function check_group () {
- local got_error group
- if [ ! -z "$@" ]; then
- for group in $@ ; do
- local uid_not_named="" uid_not_num=""
- grep -v "$^" $gfile | awk -F: '{print $1}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_named=yes
- grep -v "$^" $gfile | awk -F: '{print $3}' | grep "^${group}$" >/dev/null 2>&1 || uid_not_num=yes
- if [ ! -z "$uid_not_named" -a ! -z "$uid_not_num" ]; then
- echo "- Group '$group' does not exist"
- got_error=yes
- fi
- done
- fi
- # Return exit code of 1 if at least one of the groups didn't exist
- if [ ! -z "$got_error" ]; then
- return 1
- fi
-}
-
-#: Read the login name for the new user :#
-#
-# Remember that most Mail Transfer Agents are case independant, so having
-# 'uSer' and 'user' may cause confusion/things to break. Because of this,
-# useradd from shadow-4.0.3 no longer accepts usernames containing uppercase,
-# and we must reject them, too.
-
-# Set the login variable to the command line param
-echo
-LOGIN="$1"
-needinput=yes
-while [ ! -z $needinput ]; do
- if [ -z "$LOGIN" ]; then
- while [ -z "$LOGIN" ]; do LOGIN="$(get_input "Login name for new user []:")" ; done
- fi
- grep "^${LOGIN}:" $pfile >/dev/null 2>&1 # ensure it's not already used
- if [ $? -eq 0 ]; then
- echo "- User '$LOGIN' already exists; please choose another"
- unset LOGIN
- elif [ ! -z "$( echo $LOGIN | grep "^[0-9]" )" ]; then
- echo "- User names cannot begin with a number; please choose another"
- unset LOGIN
- elif [ ! "$LOGIN" = "`echo $LOGIN | tr A-Z a-z`" ]; then # useradd does not allow uppercase
- echo "- User '$LOGIN' contains illegal characters (uppercase); please choose another"
- unset LOGIN
- elif [ ! -z "$( echo $LOGIN | grep '\.' )" ]; then
- echo "- User '$LOGIN' contains illegal characters (period/dot); please choose another"
- unset LOGIN
- else
- unset needinput
- fi
-done
-
-# Display the user name passed from the shell if it hasn't changed
-if [ "$1" = "$LOGIN" ]; then
- echo "Login name for new user: $LOGIN"
-fi
-
-#: Get the UID for the user & ensure it's not already in use :#
-#
-# Whilst we _can_ allow users with identical UIDs, it's not a 'good thing' because
-# when you change password for the uid, it finds the first match in /etc/passwd
-# which isn't necessarily the correct user
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- _UID="$(get_input "User ID ('UID') [ defaults to next available ]:")"
- grep -v "^$" $pfile | awk -F: '{print $3}' | grep "^${_UID}$" >/dev/null 2>&1
- if [ $? -eq 0 ]; then
- echo "- That UID is already in use; please choose another"
- elif [ ! -z "$(echo $_UID | egrep '[A-Za-z]')" ]; then
- echo "- UIDs are numerics only"
- else
- unset needinput
- fi
-done
-# If we were given a UID, then syntax up the variable to pass to useradd
-if [ ! -z "$_UID" ]; then
- U_ID="-u ${_UID}"
-else
- # Will we be recycling UIDs?
- if [ "$recycleuids" = "yes" ]; then
- U_ID="-u $(awk -F: '{uid[$3]=1} END { for (i=ENVIRON["recycleUIDMIN"];i in uid;i++);print i}' $pfile)"
- fi
-fi
-
-#: Get the initial group for the user & ensure it exists :#
-#
-# We check /etc/group for both the text version and the group ID number
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- GID="$(get_input "Initial group [ ${defgroup} ]:")"
- check_group "$GID"
- if [ $? -gt 0 ]; then
- echo "- Please choose another"
- else
- unset needinput
- fi
-done
-# Syntax the variable ready for useradd
-if [ -z "$GID" ]; then
- GID="-g ${defgroup}"
-else
- GID="-g ${GID}"
-fi
-
-#: Get additional groups for the user :#
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- AGID="$(get_input "Additional groups (comma separated) []:")"
- AGID="$(echo "$AGID" | tr -d ' ' | tr , ' ')" # fix up for parsing
- if [ ! -z "$AGID" ]; then
- check_group "$AGID" # check all groups at once (treated as N # of params)
- if [ $? -gt 0 ]; then
- echo "- Please re-enter the group(s)"
- else
- unset needinput # we found all groups specified
- AGID="-G $(echo "$AGID" | tr ' ' ,)"
- fi
- else
- unset needinput # we don't *have* to have additional groups
- fi
-done
-
-#: Get the new user's home dir :#
-#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- HME="$(get_input "Home directory [ ${defhome}/${LOGIN} ]")"
- if [ -z "$HME" ]; then
- HME="${defhome}/${LOGIN}"
- fi
- # Warn the user if the home dir already exists
- if [ -d "$HME" ]; then
- echo "- Warning: '$HME' already exists !"
- getyn="$(get_input " Do you wish to change the home directory path ? (Y/n) ")"
- if [ "$(echo $getyn | grep -i "n")" ]; then
- unset needinput
- # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME
- getyn="$(get_input " Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")"
- if [ "$(echo $getyn | grep -i "y")" ]; then
- CHOWNHOMEDIR=$HME # set this to the home directory
- fi
- fi
- else
- unset needinput
- fi
-done
-HME="-d ${HME}"
-
-#: Get the new user's shell :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- unset got_error
- SHL="$(get_input "Shell [ ${defshell} ]")"
- if [ -z "$SHL" ]; then
- SHL="${defshell}"
- fi
- # Warn the user if the shell doesn't exist in /etc/shells or as a file
- if [ -z "$(grep "^${SHL}$" $sfile)" ]; then
- echo "- Warning: ${SHL} is not in ${sfile} (potential problem using FTP)"
- got_error=yes
- fi
- if [ ! -f "$SHL" ]; then
- echo "- Warning: ${SHL} does not exist as a file"
- got_error=yes
- fi
- if [ ! -z "$got_error" ]; then
- getyn="$(get_input " Do you wish to change the shell ? (Y/n) ")"
- if [ "$(echo $getyn | grep -i "n")" ]; then
- unset needinput
- fi
- else
- unset needinput
- fi
-done
-SHL="-s ${SHL}"
-
-#: Get the expiry date :#
-echo
-needinput=yes
-while [ ! -z "$needinput" ]; do
- EXP="$(get_input "Expiry date (YYYY-MM-DD) []:")"
- if [ ! -z "$EXP" ]; then
- # Check to see whether the expiry date is in the valid format
- if [ -z "$(echo "$EXP" | grep "^[[:digit:]]\{4\}[-]\?[[:digit:]]\{2\}[-]\?[[:digit:]]\{2\}$")" ]; then
- echo "- That is not a valid expiration date"
- else
- unset needinput
- EXP="-e ${EXP}"
- fi
- else
- unset needinput
- fi
-done
-
-# Display the info about the new impending account
-echo
-echo "New account will be created as follows:"
-echo
-echo "---------------------------------------"
-display "Login name.......: " "$LOGIN"
-display "UID..............: " "$_UID" "[ Next available ]"
-display "Initial group....: " "$GID"
-display "Additional groups: " "$AGID" "[ None ]"
-display "Home directory...: " "$HME"
-display "Shell............: " "$SHL"
-display "Expiry date......: " "$EXP" "[ Never ]"
-echo
-
-echo "This is it... if you want to bail out, hit Control-C. Otherwise, press"
-echo "ENTER to go ahead and make the account."
-read junk
-
-echo
-echo "Creating new account..."
-echo
-echo
-
-# Add the account to the system
-CMD="$useradd "$HME" -m "$EXP" "$U_ID" "$GID" "$AGID" "$SHL" "$LOGIN""
-$CMD
-
-if [ $? -gt 0 ]; then
- echo "- Error running useradd command -- account not created!"
- echo "(cmd: $CMD)"
- exit 1
-fi
-
-# chown the home dir ? We can only do this once the useradd has
-# completed otherwise the user name doesn't exist.
-if [ ! -z "${CHOWNHOMEDIR}" ]; then
- chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}"
-fi
-
-# Set the finger information
-$chfn "$LOGIN"
-if [ $? -gt 0 ]; then
- echo "- Warning: an error occurred while setting finger information"
-fi
-
-# Set a password
-$passwd "$LOGIN"
-if [ $? -gt 0 ]; then
- echo "* WARNING: An error occured while setting the password for"
- echo " this account. Please manually investigate this *"
- exit 1
-fi
-
-echo
-echo
-echo "Account setup complete."
-exit 0
-
diff --git a/testing/shadow/chgpasswd b/testing/shadow/chgpasswd
deleted file mode 100644
index 8f49f5cc8..000000000
--- a/testing/shadow/chgpasswd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-account required pam_permit.so
-password include system-auth
diff --git a/testing/shadow/chpasswd b/testing/shadow/chpasswd
deleted file mode 100644
index 5d447985a..000000000
--- a/testing/shadow/chpasswd
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
-password required pam_unix.so sha512 shadow
diff --git a/testing/shadow/defaults.pam b/testing/shadow/defaults.pam
deleted file mode 100644
index a7bf8a4a5..000000000
--- a/testing/shadow/defaults.pam
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
-password required pam_permit.so
diff --git a/testing/shadow/login b/testing/shadow/login
deleted file mode 100644
index b8555f89c..000000000
--- a/testing/shadow/login
+++ /dev/null
@@ -1,21 +0,0 @@
-#%PAM-1.0
-auth required pam_securetty.so
-auth requisite pam_nologin.so
-auth required pam_unix.so nullok
-auth required pam_tally.so onerr=succeed file=/var/log/faillog
-# use this to lockout accounts for 10 minutes after 3 failed attempts
-#auth required pam_tally.so deny=2 unlock_time=600 onerr=succeed file=/var/log/faillog
-account required pam_access.so
-account required pam_time.so
-account required pam_unix.so
-#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-#password required pam_unix.so sha512 shadow use_authtok
-session required pam_unix.so
-session required pam_env.so
-session required pam_motd.so
-session required pam_limits.so
-session optional pam_mail.so dir=/var/spool/mail standard
-session optional pam_lastlog.so
-session optional pam_loginuid.so
--session optional pam_ck_connector.so nox11
--session optional pam_systemd.so
diff --git a/testing/shadow/login.defs b/testing/shadow/login.defs
deleted file mode 100644
index 2500ee447..000000000
--- a/testing/shadow/login.defs
+++ /dev/null
@@ -1,197 +0,0 @@
-#
-# /etc/login.defs - Configuration control definitions for the login package.
-#
-# Three items must be defined: MAIL_DIR, ENV_SUPATH, and ENV_PATH.
-# If unspecified, some arbitrary (and possibly incorrect) value will
-# be assumed. All other items are optional - if not specified then
-# the described action or option will be inhibited.
-#
-# Comment lines (lines beginning with "#") and blank lines are ignored.
-#
-# Modified for Linux. --marekm
-
-#
-# Delay in seconds before being allowed another attempt after a login failure
-#
-FAIL_DELAY 3
-
-#
-# Enable display of unknown usernames when login failures are recorded.
-#
-LOG_UNKFAIL_ENAB no
-
-#
-# Enable logging of successful logins
-#
-LOG_OK_LOGINS no
-
-#
-# Enable "syslog" logging of su activity - in addition to sulog file logging.
-# SYSLOG_SG_ENAB does the same for newgrp and sg.
-#
-SYSLOG_SU_ENAB yes
-SYSLOG_SG_ENAB yes
-
-#
-# If defined, either full pathname of a file containing device names or
-# a ":" delimited list of device names. Root logins will be allowed only
-# upon these devices.
-#
-CONSOLE /etc/securetty
-#CONSOLE console:tty01:tty02:tty03:tty04
-
-#
-# If defined, all su activity is logged to this file.
-#
-#SULOG_FILE /var/log/sulog
-
-#
-# If defined, file which maps tty line to TERM environment parameter.
-# Each line of the file is in a format something like "vt100 tty01".
-#
-#TTYTYPE_FILE /etc/ttytype
-
-#
-# If defined, the command name to display when running "su -". For
-# example, if this is defined as "su" then a "ps" will display the
-# command is "-su". If not defined, then "ps" would display the
-# name of the shell actually being run, e.g. something like "-sh".
-#
-SU_NAME su
-
-#
-# *REQUIRED*
-# Directory where mailboxes reside, _or_ name of file, relative to the
-# home directory. If you _do_ define both, MAIL_DIR takes precedence.
-# QMAIL_DIR is for Qmail
-#
-#QMAIL_DIR Maildir
-MAIL_DIR /var/spool/mail
-
-#
-# If defined, file which inhibits all the usual chatter during the login
-# sequence. If a full pathname, then hushed mode will be enabled if the
-# user's name or shell are found in the file. If not a full pathname, then
-# hushed mode will be enabled if the file exists in the user's home directory.
-#
-HUSHLOGIN_FILE .hushlogin
-#HUSHLOGIN_FILE /etc/hushlogins
-
-#
-# *REQUIRED* The default PATH settings, for superuser and normal users.
-#
-# (they are minimal, add the rest in the shell startup files)
-ENV_SUPATH PATH=/sbin:/bin:/usr/sbin:/usr/bin
-ENV_PATH PATH=/bin:/usr/bin
-
-#
-# Terminal permissions
-#
-# TTYGROUP Login tty will be assigned this group ownership.
-# TTYPERM Login tty will be set to this permission.
-#
-# If you have a "write" program which is "setgid" to a special group
-# which owns the terminals, define TTYGROUP to the group number and
-# TTYPERM to 0620. Otherwise leave TTYGROUP commented out and assign
-# TTYPERM to either 622 or 600.
-#
-TTYGROUP tty
-TTYPERM 0600
-
-#
-# Login configuration initializations:
-#
-# ERASECHAR Terminal ERASE character ('\010' = backspace).
-# KILLCHAR Terminal KILL character ('\025' = CTRL/U).
-# UMASK Default "umask" value.
-#
-# The ERASECHAR and KILLCHAR are used only on System V machines.
-# The ULIMIT is used only if the system supports it.
-# (now it works with setrlimit too; ulimit is in 512-byte units)
-#
-# Prefix these values with "0" to get octal, "0x" to get hexadecimal.
-#
-ERASECHAR 0177
-KILLCHAR 025
-UMASK 077
-
-#
-# Password aging controls:
-#
-# PASS_MAX_DAYS Maximum number of days a password may be used.
-# PASS_MIN_DAYS Minimum number of days allowed between password changes.
-# PASS_WARN_AGE Number of days warning given before a password expires.
-#
-PASS_MAX_DAYS 99999
-PASS_MIN_DAYS 0
-PASS_WARN_AGE 7
-
-#
-# Min/max values for automatic uid selection in useradd
-#
-UID_MIN 1000
-UID_MAX 60000
-# System accounts
-SYS_UID_MIN 500
-SYS_UID_MAX 999
-
-#
-# Min/max values for automatic gid selection in groupadd
-#
-GID_MIN 1000
-GID_MAX 60000
-# System accounts
-SYS_GID_MIN 500
-SYS_GID_MAX 999
-
-#
-# Max number of login retries if password is bad
-#
-LOGIN_RETRIES 5
-
-#
-# Max time in seconds for login
-#
-LOGIN_TIMEOUT 60
-
-#
-# Which fields may be changed by regular users using chfn - use
-# any combination of letters "frwh" (full name, room number, work
-# phone, home phone). If not defined, no changes are allowed.
-# For backward compatibility, "yes" = "rwh" and "no" = "frwh".
-#
-CHFN_RESTRICT rwh
-
-#
-# List of groups to add to the user's supplementary group set
-# when logging in on the console (as determined by the CONSOLE
-# setting). Default is none.
-#
-# Use with caution - it is possible for users to gain permanent
-# access to these groups, even when not logged in on the console.
-# How to do it is left as an exercise for the reader...
-#
-#CONSOLE_GROUPS floppy:audio:cdrom
-
-#
-# Should login be allowed if we can't cd to the home directory?
-# Default in no.
-#
-DEFAULT_HOME yes
-
-#
-# If defined, this command is run when removing a user.
-# It should remove any at/cron/print jobs etc. owned by
-# the user to be removed (passed as the first argument).
-#
-#USERDEL_CMD /usr/sbin/userdel_local
-
-#
-# Enable setting of the umask group bits to be the same as owner bits
-# (examples: 022 -> 002, 077 -> 007) for non-root users, if the uid is
-# the same as gid, and username is the same as the primary group name.
-#
-# This also enables userdel to remove user groups if no members exist.
-#
-USERGROUPS_ENAB yes
-
diff --git a/testing/shadow/newusers b/testing/shadow/newusers
deleted file mode 100644
index 5d447985a..000000000
--- a/testing/shadow/newusers
+++ /dev/null
@@ -1,6 +0,0 @@
-#%PAM-1.0
-auth sufficient pam_rootok.so
-auth required pam_unix.so
-account required pam_unix.so
-session required pam_unix.so
-password required pam_unix.so sha512 shadow
diff --git a/testing/shadow/passwd b/testing/shadow/passwd
deleted file mode 100644
index ab56da496..000000000
--- a/testing/shadow/passwd
+++ /dev/null
@@ -1,4 +0,0 @@
-#%PAM-1.0
-#password required pam_cracklib.so difok=2 minlen=8 dcredit=2 ocredit=2 retry=3
-#password required pam_unix.so sha512 shadow use_authtok
-password required pam_unix.so sha512 shadow nullok
diff --git a/testing/shadow/shadow-add-missing-include.patch b/testing/shadow/shadow-add-missing-include.patch
deleted file mode 100644
index 5c9e946ef..000000000
--- a/testing/shadow/shadow-add-missing-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur shadow-4.1.4.2+svn3283/libmisc/copydir.c shadow-4.1.4.2+svn3283.new/libmisc/copydir.c
---- shadow-4.1.4.2+svn3283/libmisc/copydir.c 2010-09-05 11:35:26.000000000 -0400
-+++ shadow-4.1.4.2+svn3283.new/libmisc/copydir.c 2011-06-26 01:26:52.000000000 -0400
-@@ -34,6 +34,7 @@
-
- #ident "$Id: copydir.c 3283 2010-09-05 15:34:42Z nekral-guest $"
-
-+#include <stdarg.h>
- #include <assert.h>
- #include <sys/stat.h>
- #include <sys/types.h>
diff --git a/testing/shadow/shadow-strncpy-usage.patch b/testing/shadow/shadow-strncpy-usage.patch
deleted file mode 100644
index 46df74ace..000000000
--- a/testing/shadow/shadow-strncpy-usage.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ur shadow-4.1.4.3.orig/src/login.c shadow-4.1.4.3/src/login.c
---- shadow-4.1.4.3.orig/src/login.c 2011-03-05 22:17:10.032524948 -0800
-+++ shadow-4.1.4.3/src/login.c 2011-03-05 22:17:59.154342059 -0800
-@@ -748,8 +748,9 @@
- sizeof (loginprompt),
- _("%s login: "), hostn);
- } else {
-+ loginprompt[sizeof (loginprompt) - 1] = '\0';
- strncpy (loginprompt, _("login: "),
-- sizeof (loginprompt));
-+ sizeof (loginprompt) - 1);
- }
-
- retcode = pam_set_item (pamh, PAM_USER_PROMPT, loginprompt);
-diff -ur shadow-4.1.4.3.orig/src/usermod.c shadow-4.1.4.3/src/usermod.c
---- shadow-4.1.4.3.orig/src/usermod.c 2011-03-05 22:17:10.029191265 -0800
-+++ shadow-4.1.4.3/src/usermod.c 2011-03-05 22:18:42.665576968 -0800
-@@ -182,7 +182,8 @@
- struct tm *tp;
-
- if ((negativ != NULL) && (date < 0)) {
-- strncpy (buf, negativ, maxsize);
-+ buf[maxsize - 1] = '\0';
-+ strncpy (buf, negativ, maxsize - 1);
- } else {
- time_t t = (time_t) date;
- tp = gmtime (&t);
diff --git a/testing/shadow/shadow.cron.daily b/testing/shadow/shadow.cron.daily
deleted file mode 100755
index 1931a793e..000000000
--- a/testing/shadow/shadow.cron.daily
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Verify integrity of password and group files
-/usr/sbin/pwck -r
-/usr/sbin/grpck -r
-
diff --git a/testing/shadow/shadow.install b/testing/shadow/shadow.install
deleted file mode 100644
index e990bfe39..000000000
--- a/testing/shadow/shadow.install
+++ /dev/null
@@ -1,9 +0,0 @@
-post_upgrade() {
- grpck -r >/dev/null 2>&1
- if [ $? -eq 2 ]; then
- printf '%s\n' \
- "==> Warning: /etc/group or /etc/gshadow are inconsistant." \
- " Run 'grpck' to correct this."
- fi
- return 0
-}
diff --git a/testing/shadow/shadow_CVE-2011-0721.patch b/testing/shadow/shadow_CVE-2011-0721.patch
deleted file mode 100644
index eb9ad80a2..000000000
--- a/testing/shadow/shadow_CVE-2011-0721.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Goal: Input sanitization for chfn and chsh
-
-Fixes: CVE-2011-0721
-
-Status wrt upstream: Already applied upstream (4.1.4.3)
-
---- a/src/chfn.c
-+++ b/src/chfn.c
-@@ -551,14 +551,14 @@
- static void check_fields (void)
- {
- int err;
-- err = valid_field (fullnm, ":,=");
-+ err = valid_field (fullnm, ":,=\n");
- if (err > 0) {
- fprintf (stderr, _("%s: name with non-ASCII characters: '%s'\n"), Prog, fullnm);
- } else if (err < 0) {
- fprintf (stderr, _("%s: invalid name: '%s'\n"), Prog, fullnm);
- fail_exit (E_NOPERM);
- }
-- err = valid_field (roomno, ":,=");
-+ err = valid_field (roomno, ":,=\n");
- if (err > 0) {
- fprintf (stderr, _("%s: room number with non-ASCII characters: '%s'\n"), Prog, roomno);
- } else if (err < 0) {
-@@ -566,17 +566,17 @@
- Prog, roomno);
- fail_exit (E_NOPERM);
- }
-- if (valid_field (workph, ":,=") != 0) {
-+ if (valid_field (workph, ":,=\n") != 0) {
- fprintf (stderr, _("%s: invalid work phone: '%s'\n"),
- Prog, workph);
- fail_exit (E_NOPERM);
- }
-- if (valid_field (homeph, ":,=") != 0) {
-+ if (valid_field (homeph, ":,=\n") != 0) {
- fprintf (stderr, _("%s: invalid home phone: '%s'\n"),
- Prog, homeph);
- fail_exit (E_NOPERM);
- }
-- err = valid_field (slop, ":");
-+ err = valid_field (slop, ":\n");
- if (err > 0) {
- fprintf (stderr, _("%s: '%s' contains non-ASCII characters\n"), Prog, slop);
- } else if (err < 0) {
---- a/src/chsh.
-+++ b/src/chsh.c
-@@ -528,7 +528,7 @@
- * users are restricted to using the shells in /etc/shells.
- * The shell must be executable by the user.
- */
-- if (valid_field (loginsh, ":,=") != 0) {
-+ if (valid_field (loginsh, ":,=\n") != 0) {
- fprintf (stderr, _("%s: Invalid entry: %s\n"), Prog, loginsh);
- fail_exit (1);
- }
diff --git a/testing/shadow/useradd.defaults b/testing/shadow/useradd.defaults
deleted file mode 100644
index b800b1777..000000000
--- a/testing/shadow/useradd.defaults
+++ /dev/null
@@ -1,9 +0,0 @@
-# useradd defaults file for ArchLinux
-# original changes by TomK
-GROUP=100
-HOME=/home
-INACTIVE=-1
-EXPIRE=
-SHELL=/bin/bash
-SKEL=/etc/skel
-CREATE_MAIL_SPOOL=no
diff --git a/testing/shadow/xstrdup.patch b/testing/shadow/xstrdup.patch
deleted file mode 100644
index bce434264..000000000
--- a/testing/shadow/xstrdup.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- shadow-4.1.2.1/libmisc/xmalloc.c 2008-08-30 21:55:44.000000000 -0500
-+++ shadow-4.1.2.1/libmisc/xmalloc.c.new 2008-08-30 21:55:36.000000000 -0500
-@@ -61,5 +61,6 @@
-
- char *xstrdup (const char *str)
- {
-+ if(str == NULL) return NULL;
- return strcpy (xmalloc (strlen (str) + 1), str);
- }
diff --git a/testing/subversion/PKGBUILD b/testing/subversion/PKGBUILD
deleted file mode 100644
index 9d587905d..000000000
--- a/testing/subversion/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-# $Id: PKGBUILD 144461 2011-12-06 07:12:44Z eric $
-# Maintainer: Paul Mattal <paul@archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=subversion
-pkgver=1.7.2
-pkgrel=1
-pkgdesc="A Modern Concurrent Version Control System"
-arch=('i686' 'x86_64')
-license=('APACHE')
-depends=('neon' 'apr-util' 'sqlite3' 'file')
-optdepends=('libgnome-keyring' 'kdeutils-kwallet' 'bash-completion: for svn bash completion' \
- 'python2: for some hook scripts' 'ruby: for some hook scripts')
-makedepends=('krb5' 'apache' 'python2' 'perl' 'swig' 'java-runtime' 'java-environment'
- 'autoconf' 'db' 'e2fsprogs' 'libgnome-keyring' 'kdelibs')
-backup=('etc/xinetd.d/svn' 'etc/conf.d/svnserve')
-url="http://subversion.apache.org/"
-provides=('svn')
-options=('!makeflags' '!libtool')
-source=(http://apache.mirror.rafal.ca/subversion/$pkgname-$pkgver.tar.bz2{,.asc}
- svnserve svn svnserve.conf svnmerge.py
- subversion.rpath.fix.patch)
-sha1sums=('8c0824aeb7f42da1ff4f7cd296877af7f59812bb'
- '66293923ddc1b12a43b0e86f6b6a3c23b70df6ae'
- '64ba3e6ebafc08ac62f59d788f7a825fdce69573'
- '73b36c046c09cec2093354911c89e3ba8056af6c'
- 'ad117bf3b2a838a9a678a93fd8db1a066ad46c41'
- 'd240228e5755495c26e89d7ef47a75fb097dd040'
- '3d1e28408a9abb42af2e531adc0d01ce21acfad6')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- export PYTHON=/usr/bin/python2
-
- patch -p0 -i ../subversion.rpath.fix.patch
- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' tools/hook-scripts/{,mailer/{,tests/}}*.py
-
- ./configure --prefix=/usr --with-apr=/usr --with-apr-util=/usr \
- --with-zlib=/usr --with-neon=/usr --with-apxs \
- --with-sqlite=/usr --with-berkeley-db=:/usr/include/:/usr/lib:db-5.2 \
- --enable-javahl --with-gnome-keyring --with-kwallet
-
- make external-all
- make LT_LDFLAGS="-L$Fdestdir/usr/lib" local-all
- make swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
- swig_pydir_extra=/usr/lib/python2.7/site-packages/svn swig-py swig-pl javahl # swig-rb
-}
-
-#check() {
-# cd "${srcdir}/${pkgname}-${pkgver}"
-# export LANG=C LC_ALL=C
-# make check check-swig-pl check-swig-py check-javahl CLEANUP=yes # check-swig-rb
-#}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- export LD_LIBRARY_PATH="${pkgdir}"/usr/lib:$LD_LIBRARY_PATH
- make DESTDIR="${pkgdir}" INSTALLDIRS=vendor \
- swig_pydir=/usr/lib/python2.7/site-packages/libsvn \
- swig_pydir_extra=/usr/lib/python2.7/site-packages/svn \
- install install-swig-py install-swig-pl install-javahl # install-swig-rb
-
- install -d "${pkgdir}"/usr/share/subversion
- cp -a tools/hook-scripts "${pkgdir}"/usr/share/subversion/
- rm -f "${pkgdir}"/usr/share/subversion/hook-scripts/*.in
-
- rm -f "${pkgdir}"/usr/lib/perl5/vendor_perl/auto/SVN/_Core/.packlist
- rm -rf "${pkgdir}"/usr/lib/perl5/core_perl
-
- install -D -m 755 "${srcdir}"/svnserve "${pkgdir}"/etc/rc.d/svnserve
- install -D -m 644 "${srcdir}"/svn "${pkgdir}"/etc/xinetd.d/svn
- install -D -m 644 "${srcdir}"/svnserve.conf "${pkgdir}"/etc/conf.d/svnserve
- install -m 755 "${srcdir}"/svnmerge.py "${pkgdir}"/usr/bin/svnmerge
-
- # bash completion
- install -Dm 644 tools/client-side/bash_completion \
- "${pkgdir}"/etc/bash_completion.d/subversion
-}
diff --git a/testing/subversion/subversion.rpath.fix.patch b/testing/subversion/subversion.rpath.fix.patch
deleted file mode 100644
index ba6ee9e4e..000000000
--- a/testing/subversion/subversion.rpath.fix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig 2009-02-16 14:10:48.000000000 -0200
-+++ Makefile.in 2009-06-04 00:56:29.000000000 -0300
-@@ -678,6 +678,7 @@
-
- $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL
- cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL
-+ cd $(SWIG_PL_DIR)/native; sed -i 's|LD_RUN_PATH|DIE_RPATH_DIE|g' Makefile{,.{client,delta,fs,ra,repos,wc}}
-
- swig-pl_DEPS = autogen-swig-pl libsvn_swig_perl \
- $(SWIG_PL_DIR)/native/Makefile
diff --git a/testing/subversion/svn b/testing/subversion/svn
deleted file mode 100644
index 8988aaf63..000000000
--- a/testing/subversion/svn
+++ /dev/null
@@ -1,11 +0,0 @@
-service svn
-{
- flags = REUSE
- socket_type = stream
- wait = no
- user = root
- server = /usr/bin/svnserve
- server_args = -i
- log_on_failure += USERID
- disable = yes
-}
diff --git a/testing/subversion/svnmerge.py b/testing/subversion/svnmerge.py
deleted file mode 100644
index d8931648f..000000000
--- a/testing/subversion/svnmerge.py
+++ /dev/null
@@ -1,2370 +0,0 @@
-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
-# Copyright (c) 2005, Giovanni Bajo
-# Copyright (c) 2004-2005, Awarix, Inc.
-# All rights reserved.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-#
-# Author: Archie Cobbs <archie at awarix dot com>
-# Rewritten in Python by: Giovanni Bajo <rasky at develer dot com>
-#
-# Acknowledgments:
-# John Belmonte <john at neggie dot net> - metadata and usability
-# improvements
-# Blair Zajac <blair at orcaware dot com> - random improvements
-# Raman Gupta <rocketraman at fastmail dot fm> - bidirectional and transitive
-# merging support
-# Dustin J. Mitchell <dustin at zmanda dot com> - support for multiple
-# location identifier formats
-#
-# $HeadURL$
-# $LastChangedDate$
-# $LastChangedBy$
-# $LastChangedRevision$
-#
-# Requisites:
-# svnmerge.py has been tested with all SVN major versions since 1.1 (both
-# client and server). It is unknown if it works with previous versions.
-#
-# Differences from svnmerge.sh:
-# - More portable: tested as working in FreeBSD and OS/2.
-# - Add double-verbose mode, which shows every svn command executed (-v -v).
-# - "svnmerge avail" now only shows commits in source, not also commits in
-# other parts of the repository.
-# - Add "svnmerge block" to flag some revisions as blocked, so that
-# they will not show up anymore in the available list. Added also
-# the complementary "svnmerge unblock".
-# - "svnmerge avail" has grown two new options:
-# -B to display a list of the blocked revisions
-# -A to display both the blocked and the available revisions.
-# - Improved generated commit message to make it machine parsable even when
-# merging commits which are themselves merges.
-# - Add --force option to skip working copy check
-# - Add --record-only option to "svnmerge merge" to avoid performing
-# an actual merge, yet record that a merge happened.
-# - Can use a variety of location-identifier formats
-#
-# TODO:
-# - Add "svnmerge avail -R": show logs in reverse order
-#
-# Information for Hackers:
-#
-# Identifiers for branches:
-# A branch is identified in three ways within this source:
-# - as a working copy (variable name usually includes 'dir')
-# - as a fully qualified URL
-# - as a path identifier (an opaque string indicating a particular path
-# in a particular repository; variable name includes 'pathid')
-# A "target" is generally user-specified, and may be a working copy or
-# a URL.
-
-import sys, os, getopt, re, types, tempfile, time, locale
-from bisect import bisect
-from xml.dom import pulldom
-
-NAME = "svnmerge"
-if not hasattr(sys, "version_info") or sys.version_info < (2, 0):
- error("requires Python 2.0 or newer")
-
-# Set up the separator used to separate individual log messages from
-# each revision merged into the target location. Also, create a
-# regular expression that will find this same separator in already
-# committed log messages, so that the separator used for this run of
-# svnmerge.py will have one more LOG_SEPARATOR appended to the longest
-# separator found in all the commits.
-LOG_SEPARATOR = 8 * '.'
-LOG_SEPARATOR_RE = re.compile('^((%s)+)' % re.escape(LOG_SEPARATOR),
- re.MULTILINE)
-
-# Each line of the embedded log messages will be prefixed by LOG_LINE_PREFIX.
-LOG_LINE_PREFIX = 2 * ' '
-
-# Set python to the default locale as per environment settings, same as svn
-# TODO we should really parse config and if log-encoding is specified, set
-# the locale to match that encoding
-locale.setlocale(locale.LC_ALL, '')
-
-# We want the svn output (such as svn info) to be non-localized
-# Using LC_MESSAGES should not affect localized output of svn log, for example
-if os.environ.has_key("LC_ALL"):
- del os.environ["LC_ALL"]
-os.environ["LC_MESSAGES"] = "C"
-
-###############################################################################
-# Support for older Python versions
-###############################################################################
-
-# True/False constants are Python 2.2+
-try:
- True, False
-except NameError:
- True, False = 1, 0
-
-def lstrip(s, ch):
- """Replacement for str.lstrip (support for arbitrary chars to strip was
- added in Python 2.2.2)."""
- i = 0
- try:
- while s[i] == ch:
- i = i+1
- return s[i:]
- except IndexError:
- return ""
-
-def rstrip(s, ch):
- """Replacement for str.rstrip (support for arbitrary chars to strip was
- added in Python 2.2.2)."""
- try:
- if s[-1] != ch:
- return s
- i = -2
- while s[i] == ch:
- i = i-1
- return s[:i+1]
- except IndexError:
- return ""
-
-def strip(s, ch):
- """Replacement for str.strip (support for arbitrary chars to strip was
- added in Python 2.2.2)."""
- return lstrip(rstrip(s, ch), ch)
-
-def rsplit(s, sep, maxsplits=0):
- """Like str.rsplit, which is Python 2.4+ only."""
- L = s.split(sep)
- if not 0 < maxsplits <= len(L):
- return L
- return [sep.join(L[0:-maxsplits])] + L[-maxsplits:]
-
-###############################################################################
-
-def kwextract(s):
- """Extract info from a svn keyword string."""
- try:
- return strip(s, "$").strip().split(": ")[1]
- except IndexError:
- return "<unknown>"
-
-__revision__ = kwextract('$Rev$')
-__date__ = kwextract('$Date$')
-
-# Additional options, not (yet?) mapped to command line flags
-default_opts = {
- "svn": "svn",
- "prop": NAME + "-integrated",
- "block-prop": NAME + "-blocked",
- "commit-verbose": True,
- "verbose": 0,
-}
-logs = {}
-
-def console_width():
- """Get the width of the console screen (if any)."""
- try:
- return int(os.environ["COLUMNS"])
- except (KeyError, ValueError):
- pass
-
- try:
- # Call the Windows API (requires ctypes library)
- from ctypes import windll, create_string_buffer
- h = windll.kernel32.GetStdHandle(-11)
- csbi = create_string_buffer(22)
- res = windll.kernel32.GetConsoleScreenBufferInfo(h, csbi)
- if res:
- import struct
- (bufx, bufy,
- curx, cury, wattr,
- left, top, right, bottom,
- maxx, maxy) = struct.unpack("hhhhHhhhhhh", csbi.raw)
- return right - left + 1
- except ImportError:
- pass
-
- # Parse the output of stty -a
- if os.isatty(1):
- out = os.popen("stty -a").read()
- m = re.search(r"columns (\d+);", out)
- if m:
- return int(m.group(1))
-
- # sensible default
- return 80
-
-def error(s):
- """Subroutine to output an error and bail."""
- print >> sys.stderr, "%s: %s" % (NAME, s)
- sys.exit(1)
-
-def report(s):
- """Subroutine to output progress message, unless in quiet mode."""
- if opts["verbose"]:
- print "%s: %s" % (NAME, s)
-
-def prefix_lines(prefix, lines):
- """Given a string representing one or more lines of text, insert the
- specified prefix at the beginning of each line, and return the result.
- The input must be terminated by a newline."""
- assert lines[-1] == "\n"
- return prefix + lines[:-1].replace("\n", "\n"+prefix) + "\n"
-
-def recode_stdout_to_file(s):
- if locale.getdefaultlocale()[1] is None or not hasattr(sys.stdout, "encoding") \
- or sys.stdout.encoding is None:
- return s
- u = s.decode(sys.stdout.encoding)
- return u.encode(locale.getdefaultlocale()[1])
-
-class LaunchError(Exception):
- """Signal a failure in execution of an external command. Parameters are the
- exit code of the process, the original command line, and the output of the
- command."""
-
-try:
- """Launch a sub-process. Return its output (both stdout and stderr),
- optionally split by lines (if split_lines is True). Raise a LaunchError
- exception if the exit code of the process is non-zero (failure).
-
- This function has two implementations, one based on subprocess (preferred),
- and one based on popen (for compatibility).
- """
- import subprocess
- import shlex
-
- def launch(cmd, split_lines=True):
- # Requiring python 2.4 or higher, on some platforms we get
- # much faster performance from the subprocess module (where python
- # doesn't try to close an exhorbitant number of file descriptors)
- stdout = ""
- stderr = ""
- try:
- if os.name == 'nt':
- p = subprocess.Popen(cmd, stdout=subprocess.PIPE, \
- close_fds=False, stderr=subprocess.PIPE)
- else:
- # Use shlex to break up the parameters intelligently,
- # respecting quotes. shlex can't handle unicode.
- args = shlex.split(cmd.encode('ascii'))
- p = subprocess.Popen(args, stdout=subprocess.PIPE, \
- close_fds=False, stderr=subprocess.PIPE)
- stdoutAndErr = p.communicate()
- stdout = stdoutAndErr[0]
- stderr = stdoutAndErr[1]
- except OSError, inst:
- # Using 1 as failure code; should get actual number somehow? For
- # examples see svnmerge_test.py's TestCase_launch.test_failure and
- # TestCase_launch.test_failurecode.
- raise LaunchError(1, cmd, stdout + " " + stderr + ": " + str(inst))
-
- if p.returncode == 0:
- if split_lines:
- # Setting keepends=True for compatibility with previous logic
- # (where file.readlines() preserves newlines)
- return stdout.splitlines(True)
- else:
- return stdout
- else:
- raise LaunchError(p.returncode, cmd, stdout + stderr)
-except ImportError:
- # support versions of python before 2.4 (slower on some systems)
- def launch(cmd, split_lines=True):
- if os.name not in ['nt', 'os2']:
- import popen2
- p = popen2.Popen4(cmd)
- p.tochild.close()
- if split_lines:
- out = p.fromchild.readlines()
- else:
- out = p.fromchild.read()
- ret = p.wait()
- if ret == 0:
- ret = None
- else:
- ret >>= 8
- else:
- i,k = os.popen4(cmd)
- i.close()
- if split_lines:
- out = k.readlines()
- else:
- out = k.read()
- ret = k.close()
-
- if ret is None:
- return out
- raise LaunchError(ret, cmd, out)
-
-def launchsvn(s, show=False, pretend=False, **kwargs):
- """Launch SVN and grab its output."""
- username = password = configdir = ""
- if opts.get("username", None):
- username = "--username=" + opts["username"]
- if opts.get("password", None):
- password = "--password=" + opts["password"]
- if opts.get("config-dir", None):
- configdir = "--config-dir=" + opts["config-dir"]
- cmd = ' '.join(filter(None, [opts["svn"], "--non-interactive",
- username, password, configdir, s]))
- if show or opts["verbose"] >= 2:
- print cmd
- if pretend:
- return None
- return launch(cmd, **kwargs)
-
-def svn_command(s):
- """Do (or pretend to do) an SVN command."""
- out = launchsvn(s, show=opts["show-changes"] or opts["dry-run"],
- pretend=opts["dry-run"],
- split_lines=False)
- if not opts["dry-run"]:
- print out
-
-def check_dir_clean(dir):
- """Check the current status of dir for local mods."""
- if opts["force"]:
- report('skipping status check because of --force')
- return
- report('checking status of "%s"' % dir)
-
- # Checking with -q does not show unversioned files or external
- # directories. Though it displays a debug message for external
- # directories, after a blank line. So, practically, the first line
- # matters: if it's non-empty there is a modification.
- out = launchsvn("status -q %s" % dir)
- if out and out[0].strip():
- error('"%s" has local modifications; it must be clean' % dir)
-
-class PathIdentifier:
- """Abstraction for a path identifier, so that we can start talking
- about it before we know the form that it takes in the properties (its
- external_form). Objects are referenced in the class variable 'locobjs',
- keyed by all known forms."""
-
- # a map of UUID (or None) to repository root URL.
- repo_hints = {}
-
- # a map from any known string form to the corresponding PathIdentifier
- locobjs = {}
-
- def __init__(self, repo_relative_path, uuid=None, url=None, external_form=None):
- self.repo_relative_path = repo_relative_path
- self.uuid = uuid
- self.url = url
- self.external_form = external_form
-
- def __repr__(self):
- return "<PathIdentifier " + ', '.join('%s=%r' % i for i in self.__dict__.items()) + '>'
-
- def __str__(self):
- """Return a printable string representation"""
- if self.external_form:
- return self.external_form
- if self.url:
- return self.format('url')
- if self.uuid:
- return self.format('uuid')
- return self.format('path')
-
- def from_pathid(pathid_str):
- """convert pathid_str to a PathIdentifier"""
- if not PathIdentifier.locobjs.has_key(pathid_str):
- if is_url(pathid_str):
- # we can determine every form; PathIdentifier.hint knows how to do that
- PathIdentifier.hint(pathid_str)
- elif pathid_str[:7] == 'uuid://':
- mo = re.match('uuid://([^/]*)(.*)', pathid_str)
- if not mo:
- error("Invalid path identifier '%s'" % pathid_str)
- uuid, repo_relative_path = mo.groups()
- pathid = PathIdentifier(repo_relative_path, uuid=uuid)
- # we can cache this by uuid:// pathid and by repo-relative path
- PathIdentifier.locobjs[pathid_str] = PathIdentifier.locobjs[repo_relative_path] = pathid
- elif pathid_str and pathid_str[0] == '/':
- # strip any trailing slashes
- pathid_str = pathid_str.rstrip('/')
- pathid = PathIdentifier(repo_relative_path=pathid_str)
- # we can only cache this by repo-relative path
- PathIdentifier.locobjs[pathid_str] = pathid
- else:
- error("Invalid path identifier '%s'" % pathid_str)
- return PathIdentifier.locobjs[pathid_str]
- from_pathid = staticmethod(from_pathid)
-
- def from_target(target):
- """Convert a target (either a working copy path or an URL) into a
- path identifier."""
- # prime the cache first if we don't know about this target yet
- if not PathIdentifier.locobjs.has_key(target):
- PathIdentifier.hint(target)
-
- try:
- return PathIdentifier.locobjs[target]
- except KeyError:
- error("Could not recognize path identifier '%s'" % target)
- from_target = staticmethod(from_target)
-
- def hint(target):
- """Cache some information about target, as it may be referenced by
- repo-relative path in subversion properties; the cache can help to
- expand such a relative path to a full path identifier."""
- if PathIdentifier.locobjs.has_key(target): return
- if not is_url(target) and not is_wc(target): return
-
- url = target_to_url(target)
-
- root = get_repo_root(url)
- assert root[-1] != "/"
- assert url[:len(root)] == root, "url=%r, root=%r" % (url, root)
- repo_relative_path = url[len(root):]
-
- try:
- uuid = get_svninfo(target)['Repository UUID']
- uuid_pathid = 'uuid://%s%s' % (uuid, repo_relative_path)
- except KeyError:
- uuid = None
- uuid_pathid = None
-
- locobj = PathIdentifier.locobjs.get(url) or \
- (uuid_pathid and PathIdentifier.locobjs.get(uuid_pathid))
- if not locobj:
- locobj = PathIdentifier(repo_relative_path, uuid=uuid, url=url)
-
- PathIdentifier.repo_hints[uuid] = root # (uuid may be None)
-
- PathIdentifier.locobjs[target] = locobj
- PathIdentifier.locobjs[url] = locobj
- if uuid_pathid:
- PathIdentifier.locobjs[uuid_pathid] = locobj
- if not PathIdentifier.locobjs.has_key(repo_relative_path):
- PathIdentifier.locobjs[repo_relative_path] = locobj
- hint = staticmethod(hint)
-
- def format(self, fmt):
- if fmt == 'path':
- return self.repo_relative_path
- elif fmt == 'uuid':
- return "uuid://%s%s" % (self.uuid, self.repo_relative_path)
- elif fmt == 'url':
- return self.url
- else:
- error("Unkonwn path type '%s'" % fmt)
-
- def match_substring(self, str):
- """Test whether str is a substring of any representation of this
- PathIdentifier."""
- if self.repo_relative_path.find(str) >= 0:
- return True
-
- if self.uuid:
- if ("uuid://%s%s" % (self.uuid, self.repo_relative_path)).find(str) >= 0:
- return True
-
- if self.url:
- if (self.url + self.repo_relative_path).find(str) >= 0:
- return True
-
- return False
-
- def get_url(self):
- """Convert a pathid into a URL. If this is not possible, error out."""
- if self.url:
- return self.url
- # if we have a uuid and happen to know the URL for it, use that
- elif self.uuid and PathIdentifier.repo_hints.has_key(self.uuid):
- self.url = PathIdentifier.repo_hints[self.uuid] + self.repo_relative_path
- PathIdentifier.locobjs[self.url] = self
- return self.url
- # if we've only seen one rep, use that (a guess, but an educated one)
- elif not self.uuid and len(PathIdentifier.repo_hints) == 1:
- uuid, root = PathIdentifier.repo_hints.items()[0]
- if uuid:
- self.uuid = uuid
- PathIdentifier.locobjs['uuid://%s%s' % (uuid, self.repo_relative_path)] = self
- self.url = root + self.repo_relative_path
- PathIdentifier.locobjs[self.url] = self
- report("Guessing that '%s' refers to '%s'" % (self, self.url))
- return self.url
- else:
- error("Cannot determine URL for '%s'; " % self +
- "Explicit source argument (-S/--source) required.\n")
-
-class RevisionLog:
- """
- A log of the revisions which affected a given URL between two
- revisions.
- """
-
- def __init__(self, url, begin, end, find_propchanges=False):
- """
- Create a new RevisionLog object, which stores, in self.revs, a list
- of the revisions which affected the specified URL between begin and
- end. If find_propchanges is True, self.propchange_revs will contain a
- list of the revisions which changed properties directly on the
- specified URL. URL must be the URL for a directory in the repository.
- """
- self.url = url
-
- # Setup the log options (--quiet, so we don't show log messages)
- log_opts = '--xml --quiet -r%s:%s "%s"' % (begin, end, url)
- if find_propchanges:
- # The --verbose flag lets us grab merge tracking information
- # by looking at propchanges
- log_opts = "--verbose " + log_opts
-
- # Read the log to look for revision numbers and merge-tracking info
- self.revs = []
- self.propchange_revs = []
- repos_pathid = PathIdentifier.from_target(url)
- for chg in SvnLogParser(launchsvn("log %s" % log_opts,
- split_lines=False)):
- self.revs.append(chg.revision())
- for p in chg.paths():
- if p.action() == 'M' and p.pathid() == repos_pathid.repo_relative_path:
- self.propchange_revs.append(chg.revision())
-
- # Save the range of the log
- self.begin = int(begin)
- if end == "HEAD":
- # If end is not provided, we do not know which is the latest
- # revision in the repository. So we set 'end' to the latest
- # known revision.
- self.end = self.revs[-1]
- else:
- self.end = int(end)
-
- self._merges = None
- self._blocks = None
-
- def merge_metadata(self):
- """
- Return a VersionedProperty object, with a cached view of the merge
- metadata in the range of this log.
- """
-
- # Load merge metadata if necessary
- if not self._merges:
- self._merges = VersionedProperty(self.url, opts["prop"])
- self._merges.load(self)
-
- return self._merges
-
- def block_metadata(self):
- if not self._blocks:
- self._blocks = VersionedProperty(self.url, opts["block-prop"])
- self._blocks.load(self)
-
- return self._blocks
-
-
-class VersionedProperty:
- """
- A read-only, cached view of a versioned property.
-
- self.revs contains a list of the revisions in which the property changes.
- self.values stores the new values at each corresponding revision. If the
- value of the property is unknown, it is set to None.
-
- Initially, we set self.revs to [0] and self.values to [None]. This
- indicates that, as of revision zero, we know nothing about the value of
- the property.
-
- Later, if you run self.load(log), we cache the value of this property over
- the entire range of the log by noting each revision in which the property
- was changed. At the end of the range of the log, we invalidate our cache
- by adding the value "None" to our cache for any revisions which fall out
- of the range of our log.
-
- Once self.revs and self.values are filled, we can find the value of the
- property at any arbitrary revision using a binary search on self.revs.
- Once we find the last revision during which the property was changed,
- we can lookup the associated value in self.values. (If the associated
- value is None, the associated value was not cached and we have to do
- a full propget.)
-
- An example: We know that the 'svnmerge' property was added in r10, and
- changed in r21. We gathered log info up until r40.
-
- revs = [0, 10, 21, 40]
- values = [None, "val1", "val2", None]
-
- What these values say:
- - From r0 to r9, we know nothing about the property.
- - In r10, the property was set to "val1". This property stayed the same
- until r21, when it was changed to "val2".
- - We don't know what happened after r40.
- """
-
- def __init__(self, url, name):
- """View the history of a versioned property at URL with name"""
- self.url = url
- self.name = name
-
- # We know nothing about the value of the property. Setup revs
- # and values to indicate as such.
- self.revs = [0]
- self.values = [None]
-
- # We don't have any revisions cached
- self._initial_value = None
- self._changed_revs = []
- self._changed_values = []
-
- def load(self, log):
- """
- Load the history of property changes from the specified
- RevisionLog object.
- """
-
- # Get the property value before the range of the log
- if log.begin > 1:
- self.revs.append(log.begin-1)
- try:
- self._initial_value = self.raw_get(log.begin-1)
- except LaunchError:
- # The specified URL might not exist before the
- # range of the log. If so, we can safely assume
- # that the property was empty at that time.
- self._initial_value = { }
- self.values.append(self._initial_value)
- else:
- self._initial_value = { }
- self.values[0] = self._initial_value
-
- # Cache the property values in the log range
- old_value = self._initial_value
- for rev in log.propchange_revs:
- new_value = self.raw_get(rev)
- if new_value != old_value:
- self._changed_revs.append(rev)
- self._changed_values.append(new_value)
- self.revs.append(rev)
- self.values.append(new_value)
- old_value = new_value
-
- # Indicate that we know nothing about the value of the property
- # after the range of the log.
- if log.revs:
- self.revs.append(log.end+1)
- self.values.append(None)
-
- def raw_get(self, rev=None):
- """
- Get the property at revision REV. If rev is not specified, get
- the property at revision HEAD.
- """
- return get_revlist_prop(self.url, self.name, rev)
-
- def get(self, rev=None):
- """
- Get the property at revision REV. If rev is not specified, get
- the property at revision HEAD.
- """
-
- if rev is not None:
-
- # Find the index using a binary search
- i = bisect(self.revs, rev) - 1
-
- # Return the value of the property, if it was cached
- if self.values[i] is not None:
- return self.values[i]
-
- # Get the current value of the property
- return self.raw_get(rev)
-
- def changed_revs(self, key=None):
- """
- Get a list of the revisions in which the specified dictionary
- key was changed in this property. If key is not specified,
- return a list of revisions in which any key was changed.
- """
- if key is None:
- return self._changed_revs
- else:
- changed_revs = []
- old_val = self._initial_value
- for rev, val in zip(self._changed_revs, self._changed_values):
- if val.get(key) != old_val.get(key):
- changed_revs.append(rev)
- old_val = val
- return changed_revs
-
- def initialized_revs(self):
- """
- Get a list of the revisions in which keys were added or
- removed in this property.
- """
- initialized_revs = []
- old_len = len(self._initial_value)
- for rev, val in zip(self._changed_revs, self._changed_values):
- if len(val) != old_len:
- initialized_revs.append(rev)
- old_len = len(val)
- return initialized_revs
-
-class RevisionSet:
- """
- A set of revisions, held in dictionary form for easy manipulation. If we
- were to rewrite this script for Python 2.3+, we would subclass this from
- set (or UserSet). As this class does not include branch
- information, it's assumed that one instance will be used per
- branch.
- """
- def __init__(self, parm):
- """Constructs a RevisionSet from a string in property form, or from
- a dictionary whose keys are the revisions. Raises ValueError if the
- input string is invalid."""
-
- self._revs = {}
-
- revision_range_split_re = re.compile('[-:]')
-
- if isinstance(parm, types.DictType):
- self._revs = parm.copy()
- elif isinstance(parm, types.ListType):
- for R in parm:
- self._revs[int(R)] = 1
- else:
- parm = parm.strip()
- if parm:
- for R in parm.split(","):
- rev_or_revs = re.split(revision_range_split_re, R)
- if len(rev_or_revs) == 1:
- self._revs[int(rev_or_revs[0])] = 1
- elif len(rev_or_revs) == 2:
- for rev in range(int(rev_or_revs[0]),
- int(rev_or_revs[1])+1):
- self._revs[rev] = 1
- else:
- raise ValueError, 'Ill formatted revision range: ' + R
-
- def sorted(self):
- revnums = self._revs.keys()
- revnums.sort()
- return revnums
-
- def normalized(self):
- """Returns a normalized version of the revision set, which is an
- ordered list of couples (start,end), with the minimum number of
- intervals."""
- revnums = self.sorted()
- revnums.reverse()
- ret = []
- while revnums:
- s = e = revnums.pop()
- while revnums and revnums[-1] in (e, e+1):
- e = revnums.pop()
- ret.append((s, e))
- return ret
-
- def __str__(self):
- """Convert the revision set to a string, using its normalized form."""
- L = []
- for s,e in self.normalized():
- if s == e:
- L.append(str(s))
- else:
- L.append(str(s) + "-" + str(e))
- return ",".join(L)
-
- def __contains__(self, rev):
- return self._revs.has_key(rev)
-
- def __sub__(self, rs):
- """Compute subtraction as in sets."""
- revs = {}
- for r in self._revs.keys():
- if r not in rs:
- revs[r] = 1
- return RevisionSet(revs)
-
- def __and__(self, rs):
- """Compute intersections as in sets."""
- revs = {}
- for r in self._revs.keys():
- if r in rs:
- revs[r] = 1
- return RevisionSet(revs)
-
- def __nonzero__(self):
- return len(self._revs) != 0
-
- def __len__(self):
- """Return the number of revisions in the set."""
- return len(self._revs)
-
- def __iter__(self):
- return iter(self.sorted())
-
- def __or__(self, rs):
- """Compute set union."""
- revs = self._revs.copy()
- revs.update(rs._revs)
- return RevisionSet(revs)
-
-def merge_props_to_revision_set(merge_props, pathid):
- """A converter which returns a RevisionSet instance containing the
- revisions from PATH as known to BRANCH_PROPS. BRANCH_PROPS is a
- dictionary of pathid -> revision set branch integration information
- (as returned by get_merge_props())."""
- if not merge_props.has_key(pathid):
- error('no integration info available for path "%s"' % pathid)
- return RevisionSet(merge_props[pathid])
-
-def dict_from_revlist_prop(propvalue):
- """Given a property value as a string containing per-source revision
- lists, return a dictionary whose key is a source path identifier
- and whose value is the revisions for that source."""
- prop = {}
-
- # Multiple sources are separated by any whitespace.
- for L in propvalue.split():
- # We use rsplit to play safe and allow colons in pathids.
- pathid_str, revs = rsplit(L.strip(), ":", 1)
-
- pathid = PathIdentifier.from_pathid(pathid_str)
-
- # cache the "external" form we saw
- pathid.external_form = pathid_str
-
- prop[pathid] = revs
- return prop
-
-def get_revlist_prop(url_or_dir, propname, rev=None):
- """Given a repository URL or working copy path and a property
- name, extract the values of the property which store per-source
- revision lists and return a dictionary whose key is a source path
- identifier, and whose value is the revisions for that source."""
-
- # Note that propget does not return an error if the property does
- # not exist, it simply does not output anything. So we do not need
- # to check for LaunchError here.
- args = '--strict "%s" "%s"' % (propname, url_or_dir)
- if rev:
- args = '-r %s %s' % (rev, args)
- out = launchsvn('propget %s' % args, split_lines=False)
-
- return dict_from_revlist_prop(out)
-
-def get_merge_props(dir):
- """Extract the merged revisions."""
- return get_revlist_prop(dir, opts["prop"])
-
-def get_block_props(dir):
- """Extract the blocked revisions."""
- return get_revlist_prop(dir, opts["block-prop"])
-
-def get_blocked_revs(dir, source_pathid):
- p = get_block_props(dir)
- if p.has_key(source_pathid):
- return RevisionSet(p[source_pathid])
- return RevisionSet("")
-
-def format_merge_props(props, sep=" "):
- """Formats the hash PROPS as a string suitable for use as a
- Subversion property value."""
- assert sep in ["\t", "\n", " "] # must be a whitespace
- props = props.items()
- props.sort()
- L = []
- for h, r in props:
- L.append("%s:%s" % (h, r))
- return sep.join(L)
-
-def _run_propset(dir, prop, value):
- """Set the property 'prop' of directory 'dir' to value 'value'. We go
- through a temporary file to not run into command line length limits."""
- try:
- fd, fname = tempfile.mkstemp()
- f = os.fdopen(fd, "wb")
- except AttributeError:
- # Fallback for Python <= 2.3 which does not have mkstemp (mktemp
- # suffers from race conditions. Not that we care...)
- fname = tempfile.mktemp()
- f = open(fname, "wb")
-
- try:
- f.write(value)
- f.close()
- report("property data written to temp file: %s" % value)
- svn_command('propset "%s" -F "%s" "%s"' % (prop, fname, dir))
- finally:
- os.remove(fname)
-
-def set_props(dir, name, props):
- props = format_merge_props(props)
- if props:
- _run_propset(dir, name, props)
- else:
- # Check if NAME exists on DIR before trying to delete it.
- # As of 1.6 propdel no longer supports deleting a
- # non-existent property.
- out = launchsvn('propget "%s" "%s"' % (name, dir))
- if out:
- svn_command('propdel "%s" "%s"' % (name, dir))
-
-def set_merge_props(dir, props):
- set_props(dir, opts["prop"], props)
-
-def set_block_props(dir, props):
- set_props(dir, opts["block-prop"], props)
-
-def set_blocked_revs(dir, source_pathid, revs):
- props = get_block_props(dir)
- if revs:
- props[source_pathid] = str(revs)
- elif props.has_key(source_pathid):
- del props[source_pathid]
- set_block_props(dir, props)
-
-def is_url(url):
- """Check if url looks like a valid url."""
- return re.search(r"^[a-zA-Z][-+\.\w]*://[^\s]+$", url) is not None and url[:4] != 'uuid'
-
-def check_url(url):
- """Similar to is_url, but actually invoke get_svninfo to find out"""
- return get_svninfo(url) != {}
-
-def is_pathid(pathid):
- return isinstance(pathid, PathIdentifier)
-
-def is_wc(dir):
- """Check if a directory is a working copy."""
- return os.path.isdir(os.path.join(dir, ".svn")) or \
- os.path.isdir(os.path.join(dir, "_svn"))
-
-_cache_svninfo = {}
-def get_svninfo(target):
- """Extract the subversion information for a target (through 'svn info').
- This function uses an internal cache to let clients query information
- many times."""
- if _cache_svninfo.has_key(target):
- return _cache_svninfo[target]
- info = {}
- for L in launchsvn('info "%s"' % target):
- L = L.strip()
- if not L:
- continue
- key, value = L.split(": ", 1)
- info[key] = value.strip()
- _cache_svninfo[target] = info
- return info
-
-def target_to_url(target):
- """Convert working copy path or repos URL to a repos URL."""
- if is_wc(target):
- info = get_svninfo(target)
- return info["URL"]
- return target
-
-_cache_reporoot = {}
-def get_repo_root(target):
- """Compute the root repos URL given a working-copy path, or a URL."""
- # Try using "svn info WCDIR". This works only on SVN clients >= 1.3
- if not is_url(target):
- try:
- info = get_svninfo(target)
- root = info["Repository Root"]
- _cache_reporoot[root] = None
- return root
- except KeyError:
- pass
- url = target_to_url(target)
- assert url[-1] != '/'
- else:
- url = target
-
- # Go through the cache of the repository roots. This avoids extra
- # server round-trips if we are asking the root of different URLs
- # in the same repository (the cache in get_svninfo() cannot detect
- # that of course and would issue a remote command).
- assert is_url(url)
- for r in _cache_reporoot:
- if url.startswith(r):
- return r
-
- # Try using "svn info URL". This works only on SVN clients >= 1.2
- try:
- info = get_svninfo(url)
- # info may be {}, in which case we'll see KeyError here
- root = info["Repository Root"]
- _cache_reporoot[root] = None
- return root
- except (KeyError, LaunchError):
- pass
-
- # Constrained to older svn clients, we are stuck with this ugly
- # trial-and-error implementation. It could be made faster with a
- # binary search.
- while url:
- temp = os.path.dirname(url)
- try:
- launchsvn('proplist "%s"' % temp)
- except LaunchError:
- _cache_reporoot[url] = None
- return rstrip(url, "/")
- url = temp
-
- error("svn repos root of %s not found" % target)
-
-class SvnLogParser:
- """
- Parse the "svn log", going through the XML output and using pulldom (which
- would even allow streaming the command output).
- """
- def __init__(self, xml):
- self._events = pulldom.parseString(xml)
- def __getitem__(self, idx):
- for event, node in self._events:
- if event == pulldom.START_ELEMENT and node.tagName == "logentry":
- self._events.expandNode(node)
- return self.SvnLogRevision(node)
- raise IndexError, "Could not find 'logentry' tag in xml"
-
- class SvnLogRevision:
- def __init__(self, xmlnode):
- self.n = xmlnode
- def revision(self):
- return int(self.n.getAttribute("revision"))
- def author(self):
- return self.n.getElementsByTagName("author")[0].firstChild.data
- def paths(self):
- return [self.SvnLogPath(n)
- for n in self.n.getElementsByTagName("path")]
-
- class SvnLogPath:
- def __init__(self, xmlnode):
- self.n = xmlnode
- def action(self):
- return self.n.getAttribute("action")
- def pathid(self):
- return self.n.firstChild.data
- def copyfrom_rev(self):
- try: return self.n.getAttribute("copyfrom-rev")
- except KeyError: return None
- def copyfrom_pathid(self):
- try: return self.n.getAttribute("copyfrom-path")
- except KeyError: return None
-
-def get_copyfrom(target):
- """Get copyfrom info for a given target (it represents the
- repository-relative path from where it was branched). NOTE:
- repos root has no copyfrom info. In this case None is returned.
-
- Returns the:
- - source file or directory from which the copy was made
- - revision from which that source was copied
- - revision in which the copy was committed
- """
- repos_path = PathIdentifier.from_target(target).repo_relative_path
- for chg in SvnLogParser(launchsvn('log -v --xml --stop-on-copy "%s"'
- % target, split_lines=False)):
- for p in chg.paths():
- if p.action() == 'A' and p.pathid() == repos_path:
- # These values will be None if the corresponding elements are
- # not found in the log.
- return p.copyfrom_pathid(), p.copyfrom_rev(), chg.revision()
- return None,None,None
-
-def get_latest_rev(url):
- """Get the latest revision of the repository of which URL is part."""
- try:
- info = get_svninfo(url)
- if not info.has_key("Revision"):
- error("Not a valid URL: %s" % url)
- return info["Revision"]
- except LaunchError:
- # Alternative method for latest revision checking (for svn < 1.2)
- report('checking latest revision of "%s"' % url)
- L = launchsvn('proplist --revprop -r HEAD "%s"' % opts["source-url"])[0]
- rev = re.search("revision (\d+)", L).group(1)
- report('latest revision of "%s" is %s' % (url, rev))
- return rev
-
-def get_created_rev(url):
- """Lookup the revision at which the path identified by the
- provided URL was first created."""
- oldest_rev = -1
- report('determining oldest revision for URL "%s"' % url)
- ### TODO: Refactor this to use a modified RevisionLog class.
- lines = None
- cmd = "log -r1:HEAD --stop-on-copy -q " + url
- try:
- lines = launchsvn(cmd + " --limit=1")
- except LaunchError:
- # Assume that --limit isn't supported by the installed 'svn'.
- lines = launchsvn(cmd)
- if lines and len(lines) > 1:
- i = lines[1].find(" ")
- if i != -1:
- oldest_rev = int(lines[1][1:i])
- if oldest_rev == -1:
- error('unable to determine oldest revision for URL "%s"' % url)
- return oldest_rev
-
-def get_commit_log(url, revnum):
- """Return the log message for a specific integer revision
- number."""
- out = launchsvn("log --incremental -r%d %s" % (revnum, url))
- return recode_stdout_to_file("".join(out[1:]))
-
-def construct_merged_log_message(url, revnums):
- """Return a commit log message containing all the commit messages
- in the specified revisions at the given URL. The separator used
- in this log message is determined by searching for the longest
- svnmerge separator existing in the commit log messages and
- extending it by one more separator. This results in a new commit
- log message that is clearer in describing merges that contain
- other merges. Trailing newlines are removed from the embedded
- log messages."""
- messages = ['']
- longest_sep = ''
- for r in revnums.sorted():
- message = get_commit_log(url, r)
- if message:
- message = re.sub(r'(\r\n|\r|\n)', "\n", message)
- message = rstrip(message, "\n") + "\n"
- messages.append(prefix_lines(LOG_LINE_PREFIX, message))
- for match in LOG_SEPARATOR_RE.findall(message):
- sep = match[1]
- if len(sep) > len(longest_sep):
- longest_sep = sep
-
- longest_sep += LOG_SEPARATOR + "\n"
- messages.append('')
- return longest_sep.join(messages)
-
-def get_default_source(branch_target, branch_props):
- """Return the default source for branch_target (given its branch_props).
- Error out if there is ambiguity."""
- if not branch_props:
- error("no integration info available")
-
- props = branch_props.copy()
- pathid = PathIdentifier.from_target(branch_target)
-
- # To make bidirectional merges easier, find the target's
- # repository local path so it can be removed from the list of
- # possible integration sources.
- if props.has_key(pathid):
- del props[pathid]
-
- if len(props) > 1:
- err_msg = "multiple sources found. "
- err_msg += "Explicit source argument (-S/--source) required.\n"
- err_msg += "The merge sources available are:"
- for prop in props:
- err_msg += "\n " + str(prop)
- error(err_msg)
-
- return props.keys()[0]
-
-def should_find_reflected(branch_dir):
- should_find_reflected = opts["bidirectional"]
-
- # If the source has integration info for the target, set find_reflected
- # even if --bidirectional wasn't specified
- if not should_find_reflected:
- source_props = get_merge_props(opts["source-url"])
- should_find_reflected = source_props.has_key(PathIdentifier.from_target(branch_dir))
-
- return should_find_reflected
-
-def analyze_revs(target_pathid, url, begin=1, end=None,
- find_reflected=False):
- """For the source of the merges in the source URL being merged into
- target_pathid, analyze the revisions in the interval begin-end (which
- defaults to 1-HEAD), to find out which revisions are changes in
- the url, which are changes elsewhere (so-called 'phantom'
- revisions), optionally which are reflected changes (to avoid
- conflicts that can occur when doing bidirectional merging between
- branches), and which revisions initialize merge tracking against other
- branches. Return a tuple of four RevisionSet's:
- (real_revs, phantom_revs, reflected_revs, initialized_revs).
-
- NOTE: To maximize speed, if "end" is not provided, the function is
- not able to find phantom revisions following the last real
- revision in the URL.
- """
-
- begin = str(begin)
- if end is None:
- end = "HEAD"
- else:
- end = str(end)
- if long(begin) > long(end):
- return RevisionSet(""), RevisionSet(""), \
- RevisionSet(""), RevisionSet("")
-
- logs[url] = RevisionLog(url, begin, end, find_reflected)
- revs = RevisionSet(logs[url].revs)
-
- if end == "HEAD":
- # If end is not provided, we do not know which is the latest revision
- # in the repository. So return the phantom revision set only up to
- # the latest known revision.
- end = str(list(revs)[-1])
-
- phantom_revs = RevisionSet("%s-%s" % (begin, end)) - revs
-
- if find_reflected:
- reflected_revs = logs[url].merge_metadata().changed_revs(target_pathid)
- reflected_revs += logs[url].block_metadata().changed_revs(target_pathid)
- else:
- reflected_revs = []
-
- initialized_revs = RevisionSet(logs[url].merge_metadata().initialized_revs())
- reflected_revs = RevisionSet(reflected_revs)
-
- return revs, phantom_revs, reflected_revs, initialized_revs
-
-def analyze_source_revs(branch_target, source_url, **kwargs):
- """For the given branch and source, extract the real and phantom
- source revisions."""
- branch_url = target_to_url(branch_target)
- branch_pathid = PathIdentifier.from_target(branch_target)
-
- # Extract the latest repository revision from the URL of the branch
- # directory (which is already cached at this point).
- end_rev = get_latest_rev(source_url)
-
- # Calculate the base of analysis. If there is a "1-XX" interval in the
- # merged_revs, we do not need to check those.
- base = 1
- r = opts["merged-revs"].normalized()
- if r and r[0][0] == 1:
- base = r[0][1] + 1
-
- # See if the user filtered the revision set. If so, we are not
- # interested in something outside that range.
- if opts["revision"]:
- revs = RevisionSet(opts["revision"]).sorted()
- if base < revs[0]:
- base = revs[0]
- if end_rev > revs[-1]:
- end_rev = revs[-1]
-
- return analyze_revs(branch_pathid, source_url, base, end_rev, **kwargs)
-
-def minimal_merge_intervals(revs, phantom_revs):
- """Produce the smallest number of intervals suitable for merging. revs
- is the RevisionSet which we want to merge, and phantom_revs are phantom
- revisions which can be used to concatenate intervals, thus minimizing the
- number of operations."""
- revnums = revs.normalized()
- ret = []
-
- cur = revnums.pop()
- while revnums:
- next = revnums.pop()
- assert next[1] < cur[0] # otherwise it is not ordered
- assert cur[0] - next[1] > 1 # otherwise it is not normalized
- for i in range(next[1]+1, cur[0]):
- if i not in phantom_revs:
- ret.append(cur)
- cur = next
- break
- else:
- cur = (next[0], cur[1])
-
- ret.append(cur)
- ret.reverse()
- return ret
-
-def display_revisions(revs, display_style, revisions_msg, source_url):
- """Show REVS as dictated by DISPLAY_STYLE, either numerically, in
- log format, or as diffs. When displaying revisions numerically,
- prefix output with REVISIONS_MSG when in verbose mode. Otherwise,
- request logs or diffs using SOURCE_URL."""
- if display_style == "revisions":
- if revs:
- report(revisions_msg)
- print revs
- elif display_style == "logs":
- for start,end in revs.normalized():
- svn_command('log --incremental -v -r %d:%d %s' % \
- (start, end, source_url))
- elif display_style in ("diffs", "summarize"):
- if display_style == 'summarize':
- summarize = '--summarize '
- else:
- summarize = ''
-
- for start, end in revs.normalized():
- print
- if start == end:
- print "%s: changes in revision %d follow" % (NAME, start)
- else:
- print "%s: changes in revisions %d-%d follow" % (NAME,
- start, end)
- print
-
- # Note: the starting revision number to 'svn diff' is
- # NOT inclusive so we have to subtract one from ${START}.
- svn_command("diff -r %d:%d %s %s" % (start - 1, end, summarize,
- source_url))
- else:
- assert False, "unhandled display style: %s" % display_style
-
-def action_init(target_dir, target_props):
- """Initialize for merges."""
- # Check that directory is ready for being modified
- check_dir_clean(target_dir)
-
- target_pathid = PathIdentifier.from_target(target_dir)
- source_pathid = opts['source-pathid']
- if source_pathid == target_pathid:
- error("cannot init integration source path '%s'\nIts path identifier does not "
- "differ from the path identifier of the current directory, '%s'."
- % (source_pathid, target_pathid))
-
- source_url = opts['source-url']
-
- # If the user hasn't specified the revisions to use, see if the
- # "source" is a copy from the current tree and if so, we can use
- # the version data obtained from it.
- revision_range = opts["revision"]
- if not revision_range:
- # If source was originally copied from target, and we are merging
- # changes from source to target (the copy target is the merge source,
- # and the copy source is the merge target), then we want to mark as
- # integrated up to the rev in which the copy was committed which
- # created the merge source:
- cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(source_url)
-
- cf_pathid = None
- if cf_source:
- cf_url = get_repo_root(source_url) + cf_source
- if is_url(cf_url) and check_url(cf_url):
- cf_pathid = PathIdentifier.from_target(cf_url)
-
- if target_pathid == cf_pathid:
- report('the source "%s" was copied from "%s" in rev %s and committed in rev %s' %
- (source_url, target_dir, cf_rev, copy_committed_in_rev))
- revision_range = "1-" + str(copy_committed_in_rev)
-
- if not revision_range:
- # If the reverse is true: copy source is the merge source, and
- # the copy target is the merge target, then we want to mark as
- # integrated up to the specific rev of the merge target from
- # which the merge source was copied. (Longer discussion at:
- # http://subversion.tigris.org/issues/show_bug.cgi?id=2810 )
- cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(target_dir)
-
- cf_pathid = None
- if cf_source:
- cf_url = get_repo_root(target_dir) + cf_source
- if is_url(cf_url) and check_url(cf_url):
- cf_pathid = PathIdentifier.from_target(cf_url)
-
- source_pathid = PathIdentifier.from_target(source_url)
- if source_pathid == cf_pathid:
- report('the target "%s" was copied the source "%s" in rev %s and committed in rev %s' %
- (target_dir, source_url, cf_rev, copy_committed_in_rev))
- revision_range = "1-" + cf_rev
-
- # When neither the merge source nor target is a copy of the other, and
- # the user did not specify a revision range, then choose a default which is
- # the current revision; saying, in effect, "everything has been merged, so
- # mark as integrated up to the latest rev on source url).
- if not revision_range:
- revision_range = "1-" + get_latest_rev(source_url)
-
- revs = RevisionSet(revision_range)
-
- report('marking "%s" as already containing revisions "%s" of "%s"' %
- (target_dir, revs, source_url))
-
- revs = str(revs)
- # If the local svnmerge-integrated property already has an entry
- # for the source-pathid, simply error out.
- if not opts["force"] and target_props.has_key(source_pathid):
- error('Repository-relative path %s has already been initialized at %s\n'
- 'Use --force to re-initialize' % (source_pathid, target_dir))
- # set the pathid's external_form based on the user's options
- source_pathid.external_form = source_pathid.format(opts['location-type'])
-
- revs = str(revs)
- target_props[source_pathid] = revs
-
- # Set property
- set_merge_props(target_dir, target_props)
-
- # Write out commit message if desired
- if opts["commit-file"]:
- f = open(opts["commit-file"], "w")
- print >>f, 'Initialized merge tracking via "%s" with revisions "%s" from ' \
- % (NAME, revs)
- print >>f, '%s' % source_url
- f.close()
- report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_avail(branch_dir, branch_props):
- """Show commits available for merges."""
- source_revs, phantom_revs, reflected_revs, initialized_revs = \
- analyze_source_revs(branch_dir, opts["source-url"],
- find_reflected=
- should_find_reflected(branch_dir))
- report('skipping phantom revisions: %s' % phantom_revs)
- if reflected_revs:
- report('skipping reflected revisions: %s' % reflected_revs)
- report('skipping initialized revisions: %s' % initialized_revs)
-
- blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
- avail_revs = source_revs - opts["merged-revs"] - blocked_revs - \
- reflected_revs - initialized_revs
-
- # Compose the set of revisions to show
- revs = RevisionSet("")
- report_msg = "revisions available to be merged are:"
- if "avail" in opts["avail-showwhat"]:
- revs |= avail_revs
- if "blocked" in opts["avail-showwhat"]:
- revs |= blocked_revs
- report_msg = "revisions blocked are:"
-
- # Limit to revisions specified by -r (if any)
- if opts["revision"]:
- revs = revs & RevisionSet(opts["revision"])
-
- display_revisions(revs, opts["avail-display"],
- report_msg,
- opts["source-url"])
-
-def action_integrated(branch_dir, branch_props):
- """Show change sets already merged. This set of revisions is
- calculated from taking svnmerge-integrated property from the
- branch, and subtracting any revision older than the branch
- creation revision."""
- # Extract the integration info for the branch_dir
- branch_props = get_merge_props(branch_dir)
- revs = merge_props_to_revision_set(branch_props, opts["source-pathid"])
-
- # Lookup the oldest revision on the branch path.
- oldest_src_rev = get_created_rev(opts["source-url"])
-
- # Subtract any revisions which pre-date the branch.
- report("subtracting revisions which pre-date the source URL (%d)" %
- oldest_src_rev)
- revs = revs - RevisionSet(range(1, oldest_src_rev))
-
- # Limit to revisions specified by -r (if any)
- if opts["revision"]:
- revs = revs & RevisionSet(opts["revision"])
-
- display_revisions(revs, opts["integrated-display"],
- "revisions already integrated are:", opts["source-url"])
-
-def action_merge(branch_dir, branch_props):
- """Record merge meta data, and do the actual merge (if not
- requested otherwise via --record-only)."""
- # Check branch directory is ready for being modified
- check_dir_clean(branch_dir)
-
- source_revs, phantom_revs, reflected_revs, initialized_revs = \
- analyze_source_revs(branch_dir, opts["source-url"],
- find_reflected=
- should_find_reflected(branch_dir))
-
- if opts["revision"]:
- revs = RevisionSet(opts["revision"])
- else:
- revs = source_revs
-
- blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
- merged_revs = opts["merged-revs"]
-
- # Show what we're doing
- if opts["verbose"]: # just to avoid useless calculations
- if merged_revs & revs:
- report('"%s" already contains revisions %s' % (branch_dir,
- merged_revs & revs))
- if phantom_revs:
- report('memorizing phantom revision(s): %s' % phantom_revs)
- if reflected_revs:
- report('memorizing reflected revision(s): %s' % reflected_revs)
- if blocked_revs & revs:
- report('skipping blocked revisions(s): %s' % (blocked_revs & revs))
- if initialized_revs:
- report('skipping initialized revision(s): %s' % initialized_revs)
-
- # Compute final merge set.
- revs = revs - merged_revs - blocked_revs - reflected_revs - \
- phantom_revs - initialized_revs
- if not revs:
- report('no revisions to merge, exiting')
- return
-
- # When manually marking revisions as merged, we only update the
- # integration meta data, and don't perform an actual merge.
- record_only = opts["record-only"]
-
- if record_only:
- report('recording merge of revision(s) %s from "%s"' %
- (revs, opts["source-url"]))
- else:
- report('merging in revision(s) %s from "%s"' %
- (revs, opts["source-url"]))
-
- # Do the merge(s). Note: the starting revision number to 'svn merge'
- # is NOT inclusive so we have to subtract one from start.
- # We try to keep the number of merge operations as low as possible,
- # because it is faster and reduces the number of conflicts.
- old_block_props = get_block_props(branch_dir)
- merge_metadata = logs[opts["source-url"]].merge_metadata()
- block_metadata = logs[opts["source-url"]].block_metadata()
- for start,end in minimal_merge_intervals(revs, phantom_revs):
- if not record_only:
- # Preset merge/blocked properties to the source value at
- # the start rev to avoid spurious property conflicts
- set_merge_props(branch_dir, merge_metadata.get(start - 1))
- set_block_props(branch_dir, block_metadata.get(start - 1))
- # Do the merge
- svn_command("merge --force -r %d:%d %s %s" % \
- (start - 1, end, opts["source-url"], branch_dir))
- # TODO: to support graph merging, add logic to merge the property
- # meta-data manually
-
- # Update the set of merged revisions.
- merged_revs = merged_revs | revs | reflected_revs | phantom_revs | initialized_revs
- branch_props[opts["source-pathid"]] = str(merged_revs)
- set_merge_props(branch_dir, branch_props)
- # Reset the blocked revs
- set_block_props(branch_dir, old_block_props)
-
- # Write out commit message if desired
- if opts["commit-file"]:
- f = open(opts["commit-file"], "w")
- if record_only:
- print >>f, 'Recorded merge of revisions %s via %s from ' % \
- (revs, NAME)
- else:
- print >>f, 'Merged revisions %s via %s from ' % \
- (revs, NAME)
- print >>f, '%s' % opts["source-url"]
- if opts["commit-verbose"]:
- print >>f
- print >>f, construct_merged_log_message(opts["source-url"], revs),
-
- f.close()
- report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_block(branch_dir, branch_props):
- """Block revisions."""
- # Check branch directory is ready for being modified
- check_dir_clean(branch_dir)
-
- source_revs, phantom_revs, reflected_revs, initialized_revs = \
- analyze_source_revs(branch_dir, opts["source-url"])
- revs_to_block = source_revs - opts["merged-revs"]
-
- # Limit to revisions specified by -r (if any)
- if opts["revision"]:
- revs_to_block = RevisionSet(opts["revision"]) & revs_to_block
-
- if not revs_to_block:
- error('no available revisions to block')
-
- # Change blocked information
- blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
- blocked_revs = blocked_revs | revs_to_block
- set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs)
-
- # Write out commit message if desired
- if opts["commit-file"]:
- f = open(opts["commit-file"], "w")
- print >>f, 'Blocked revisions %s via %s' % (revs_to_block, NAME)
- if opts["commit-verbose"]:
- print >>f
- print >>f, construct_merged_log_message(opts["source-url"],
- revs_to_block),
-
- f.close()
- report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_unblock(branch_dir, branch_props):
- """Unblock revisions."""
- # Check branch directory is ready for being modified
- check_dir_clean(branch_dir)
-
- blocked_revs = get_blocked_revs(branch_dir, opts["source-pathid"])
- revs_to_unblock = blocked_revs
-
- # Limit to revisions specified by -r (if any)
- if opts["revision"]:
- revs_to_unblock = revs_to_unblock & RevisionSet(opts["revision"])
-
- if not revs_to_unblock:
- error('no available revisions to unblock')
-
- # Change blocked information
- blocked_revs = blocked_revs - revs_to_unblock
- set_blocked_revs(branch_dir, opts["source-pathid"], blocked_revs)
-
- # Write out commit message if desired
- if opts["commit-file"]:
- f = open(opts["commit-file"], "w")
- print >>f, 'Unblocked revisions %s via %s' % (revs_to_unblock, NAME)
- if opts["commit-verbose"]:
- print >>f
- print >>f, construct_merged_log_message(opts["source-url"],
- revs_to_unblock),
- f.close()
- report('wrote commit message to "%s"' % opts["commit-file"])
-
-def action_rollback(branch_dir, branch_props):
- """Rollback previously integrated revisions."""
-
- # Make sure the revision arguments are present
- if not opts["revision"]:
- error("The '-r' option is mandatory for rollback")
-
- # Check branch directory is ready for being modified
- check_dir_clean(branch_dir)
-
- # Extract the integration info for the branch_dir
- branch_props = get_merge_props(branch_dir)
- # Get the list of all revisions already merged into this source-pathid.
- merged_revs = merge_props_to_revision_set(branch_props,
- opts["source-pathid"])
-
- # At which revision was the src created?
- oldest_src_rev = get_created_rev(opts["source-url"])
- src_pre_exist_range = RevisionSet("1-%d" % oldest_src_rev)
-
- # Limit to revisions specified by -r (if any)
- revs = merged_revs & RevisionSet(opts["revision"])
-
- # make sure there's some revision to rollback
- if not revs:
- report("Nothing to rollback in revision range r%s" % opts["revision"])
- return
-
- # If even one specified revision lies outside the lifetime of the
- # merge source, error out.
- if revs & src_pre_exist_range:
- err_str = "Specified revision range falls out of the rollback range.\n"
- err_str += "%s was created at r%d" % (opts["source-pathid"],
- oldest_src_rev)
- error(err_str)
-
- record_only = opts["record-only"]
-
- if record_only:
- report('recording rollback of revision(s) %s from "%s"' %
- (revs, opts["source-url"]))
- else:
- report('rollback of revision(s) %s from "%s"' %
- (revs, opts["source-url"]))
-
- # Do the reverse merge(s). Note: the starting revision number
- # to 'svn merge' is NOT inclusive so we have to subtract one from start.
- # We try to keep the number of merge operations as low as possible,
- # because it is faster and reduces the number of conflicts.
- rollback_intervals = minimal_merge_intervals(revs, [])
- # rollback in the reverse order of merge
- rollback_intervals.reverse()
- for start, end in rollback_intervals:
- if not record_only:
- # Do the merge
- svn_command("merge --force -r %d:%d %s %s" % \
- (end, start - 1, opts["source-url"], branch_dir))
-
- # Write out commit message if desired
- # calculate the phantom revs first
- if opts["commit-file"]:
- f = open(opts["commit-file"], "w")
- if record_only:
- print >>f, 'Recorded rollback of revisions %s via %s from ' % \
- (revs , NAME)
- else:
- print >>f, 'Rolled back revisions %s via %s from ' % \
- (revs , NAME)
- print >>f, '%s' % opts["source-url"]
-
- f.close()
- report('wrote commit message to "%s"' % opts["commit-file"])
-
- # Update the set of merged revisions.
- merged_revs = merged_revs - revs
- branch_props[opts["source-pathid"]] = str(merged_revs)
- set_merge_props(branch_dir, branch_props)
-
-def action_uninit(branch_dir, branch_props):
- """Uninit SOURCE URL."""
- # Check branch directory is ready for being modified
- check_dir_clean(branch_dir)
-
- # If the source-pathid does not have an entry in the svnmerge-integrated
- # property, simply error out.
- if not branch_props.has_key(opts["source-pathid"]):
- error('Repository-relative path "%s" does not contain merge '
- 'tracking information for "%s"' \
- % (opts["source-pathid"], branch_dir))
-
- del branch_props[opts["source-pathid"]]
-
- # Set merge property with the selected source deleted
- set_merge_props(branch_dir, branch_props)
-
- # Set blocked revisions for the selected source to None
- set_blocked_revs(branch_dir, opts["source-pathid"], None)
-
- # Write out commit message if desired
- if opts["commit-file"]:
- f = open(opts["commit-file"], "w")
- print >>f, 'Removed merge tracking for "%s" for ' % NAME
- print >>f, '%s' % opts["source-url"]
- f.close()
- report('wrote commit message to "%s"' % opts["commit-file"])
-
-###############################################################################
-# Command line parsing -- options and commands management
-###############################################################################
-
-class OptBase:
- def __init__(self, *args, **kwargs):
- self.help = kwargs["help"]
- del kwargs["help"]
- self.lflags = []
- self.sflags = []
- for a in args:
- if a.startswith("--"): self.lflags.append(a)
- elif a.startswith("-"): self.sflags.append(a)
- else:
- raise TypeError, "invalid flag name: %s" % a
- if kwargs.has_key("dest"):
- self.dest = kwargs["dest"]
- del kwargs["dest"]
- else:
- if not self.lflags:
- raise TypeError, "cannot deduce dest name without long options"
- self.dest = self.lflags[0][2:]
- if kwargs:
- raise TypeError, "invalid keyword arguments: %r" % kwargs.keys()
- def repr_flags(self):
- f = self.sflags + self.lflags
- r = f[0]
- for fl in f[1:]:
- r += " [%s]" % fl
- return r
-
-class Option(OptBase):
- def __init__(self, *args, **kwargs):
- self.default = kwargs.setdefault("default", 0)
- del kwargs["default"]
- self.value = kwargs.setdefault("value", None)
- del kwargs["value"]
- OptBase.__init__(self, *args, **kwargs)
- def apply(self, state, value):
- assert value == ""
- if self.value is not None:
- state[self.dest] = self.value
- else:
- state[self.dest] += 1
-
-class OptionArg(OptBase):
- def __init__(self, *args, **kwargs):
- self.default = kwargs["default"]
- del kwargs["default"]
- self.metavar = kwargs.setdefault("metavar", None)
- del kwargs["metavar"]
- OptBase.__init__(self, *args, **kwargs)
-
- if self.metavar is None:
- if self.dest is not None:
- self.metavar = self.dest.upper()
- else:
- self.metavar = "arg"
- if self.default:
- self.help += " (default: %s)" % self.default
- def apply(self, state, value):
- assert value is not None
- state[self.dest] = value
- def repr_flags(self):
- r = OptBase.repr_flags(self)
- return r + " " + self.metavar
-
-class CommandOpts:
- class Cmd:
- def __init__(self, *args):
- self.name, self.func, self.usage, self.help, self.opts = args
- def short_help(self):
- return self.help.split(".")[0]
- def __str__(self):
- return self.name
- def __call__(self, *args, **kwargs):
- return self.func(*args, **kwargs)
-
- def __init__(self, global_opts, common_opts, command_table, version=None):
- self.progname = NAME
- self.version = version.replace("%prog", self.progname)
- self.cwidth = console_width() - 2
- self.ctable = command_table.copy()
- self.gopts = global_opts[:]
- self.copts = common_opts[:]
- self._add_builtins()
- for k in self.ctable.keys():
- cmd = self.Cmd(k, *self.ctable[k])
- opts = []
- for o in cmd.opts:
- if isinstance(o, types.StringType) or \
- isinstance(o, types.UnicodeType):
- o = self._find_common(o)
- opts.append(o)
- cmd.opts = opts
- self.ctable[k] = cmd
-
- def _add_builtins(self):
- self.gopts.append(
- Option("-h", "--help", help="show help for this command and exit"))
- if self.version is not None:
- self.gopts.append(
- Option("-V", "--version", help="show version info and exit"))
- self.ctable["help"] = (self._cmd_help,
- "help [COMMAND]",
- "Display help for a specific command. If COMMAND is omitted, "
- "display brief command description.",
- [])
-
- def _cmd_help(self, cmd=None, *args):
- if args:
- self.error("wrong number of arguments", "help")
- if cmd is not None:
- cmd = self._command(cmd)
- self.print_command_help(cmd)
- else:
- self.print_command_list()
-
- def _paragraph(self, text, width=78):
- chunks = re.split("\s+", text.strip())
- chunks.reverse()
- lines = []
- while chunks:
- L = chunks.pop()
- while chunks and len(L) + len(chunks[-1]) + 1 <= width:
- L += " " + chunks.pop()
- lines.append(L)
- return lines
-
- def _paragraphs(self, text, *args, **kwargs):
- pars = text.split("\n\n")
- lines = self._paragraph(pars[0], *args, **kwargs)
- for p in pars[1:]:
- lines.append("")
- lines.extend(self._paragraph(p, *args, **kwargs))
- return lines
-
- def _print_wrapped(self, text, indent=0):
- text = self._paragraphs(text, self.cwidth - indent)
- print text.pop(0)
- for t in text:
- print " " * indent + t
-
- def _find_common(self, fl):
- for o in self.copts:
- if fl in o.lflags+o.sflags:
- return o
- assert False, fl
-
- def _compute_flags(self, opts, check_conflicts=True):
- back = {}
- sfl = ""
- lfl = []
- for o in opts:
- sapp = lapp = ""
- if isinstance(o, OptionArg):
- sapp, lapp = ":", "="
- for s in o.sflags:
- if check_conflicts and back.has_key(s):
- raise RuntimeError, "option conflict: %s" % s
- back[s] = o
- sfl += s[1:] + sapp
- for l in o.lflags:
- if check_conflicts and back.has_key(l):
- raise RuntimeError, "option conflict: %s" % l
- back[l] = o
- lfl.append(l[2:] + lapp)
- return sfl, lfl, back
-
- def _extract_command(self, args):
- """
- Try to extract the command name from the argument list. This is
- non-trivial because we want to allow command-specific options even
- before the command itself.
- """
- opts = self.gopts[:]
- for cmd in self.ctable.values():
- opts.extend(cmd.opts)
- sfl, lfl, _ = self._compute_flags(opts, check_conflicts=False)
-
- lopts,largs = getopt.getopt(args, sfl, lfl)
- if not largs:
- return None
- return self._command(largs[0])
-
- def _fancy_getopt(self, args, opts, state=None):
- if state is None:
- state= {}
- for o in opts:
- if not state.has_key(o.dest):
- state[o.dest] = o.default
-
- sfl, lfl, back = self._compute_flags(opts)
- try:
- lopts,args = getopt.gnu_getopt(args, sfl, lfl)
- except AttributeError:
- # Before Python 2.3, there was no gnu_getopt support.
- # So we can't parse intermixed positional arguments
- # and options.
- lopts,args = getopt.getopt(args, sfl, lfl)
-
- for o,v in lopts:
- back[o].apply(state, v)
- return state, args
-
- def _command(self, cmd):
- if not self.ctable.has_key(cmd):
- self.error("unknown command: '%s'" % cmd)
- return self.ctable[cmd]
-
- def parse(self, args):
- if not args:
- self.print_small_help()
- sys.exit(0)
-
- cmd = None
- try:
- cmd = self._extract_command(args)
- opts = self.gopts[:]
- if cmd:
- opts.extend(cmd.opts)
- args.remove(cmd.name)
- state, args = self._fancy_getopt(args, opts)
- except getopt.GetoptError, e:
- self.error(e, cmd)
-
- # Handle builtins
- if self.version is not None and state["version"]:
- self.print_version()
- sys.exit(0)
- if state["help"]: # special case for --help
- if cmd:
- self.print_command_help(cmd)
- sys.exit(0)
- cmd = self.ctable["help"]
- else:
- if cmd is None:
- self.error("command argument required")
- if str(cmd) == "help":
- cmd(*args)
- sys.exit(0)
- return cmd, args, state
-
- def error(self, s, cmd=None):
- print >>sys.stderr, "%s: %s" % (self.progname, s)
- if cmd is not None:
- self.print_command_help(cmd)
- else:
- self.print_small_help()
- sys.exit(1)
- def print_small_help(self):
- print "Type '%s help' for usage" % self.progname
- def print_usage_line(self):
- print "usage: %s <subcommand> [options...] [args...]\n" % self.progname
- def print_command_list(self):
- print "Available commands (use '%s help COMMAND' for more details):\n" \
- % self.progname
- cmds = self.ctable.keys()
- cmds.sort()
- indent = max(map(len, cmds))
- for c in cmds:
- h = self.ctable[c].short_help()
- print " %-*s " % (indent, c),
- self._print_wrapped(h, indent+6)
- def print_command_help(self, cmd):
- cmd = self.ctable[str(cmd)]
- print 'usage: %s %s\n' % (self.progname, cmd.usage)
- self._print_wrapped(cmd.help)
- def print_opts(opts, self=self):
- if not opts: return
- flags = [o.repr_flags() for o in opts]
- indent = max(map(len, flags))
- for f,o in zip(flags, opts):
- print " %-*s :" % (indent, f),
- self._print_wrapped(o.help, indent+5)
- print '\nCommand options:'
- print_opts(cmd.opts)
- print '\nGlobal options:'
- print_opts(self.gopts)
-
- def print_version(self):
- print self.version
-
-###############################################################################
-# Options and Commands description
-###############################################################################
-
-global_opts = [
- Option("-F", "--force",
- help="force operation even if the working copy is not clean, or "
- "there are pending updates"),
- Option("-n", "--dry-run",
- help="don't actually change anything, just pretend; "
- "implies --show-changes"),
- Option("-s", "--show-changes",
- help="show subversion commands that make changes"),
- Option("-v", "--verbose",
- help="verbose mode: output more information about progress"),
- OptionArg("-u", "--username",
- default=None,
- help="invoke subversion commands with the supplied username"),
- OptionArg("-p", "--password",
- default=None,
- help="invoke subversion commands with the supplied password"),
- OptionArg("-c", "--config-dir", metavar="DIR",
- default=None,
- help="cause subversion commands to consult runtime config directory DIR"),
-]
-
-common_opts = [
- Option("-b", "--bidirectional",
- value=True,
- default=False,
- help="remove reflected and initialized revisions from merge candidates. "
- "Not required but may be specified to speed things up slightly"),
- OptionArg("-f", "--commit-file", metavar="FILE",
- default="svnmerge-commit-message.txt",
- help="set the name of the file where the suggested log message "
- "is written to"),
- Option("-M", "--record-only",
- value=True,
- default=False,
- help="do not perform an actual merge of the changes, yet record "
- "that a merge happened"),
- OptionArg("-r", "--revision",
- metavar="REVLIST",
- default="",
- help="specify a revision list, consisting of revision numbers "
- 'and ranges separated by commas, e.g., "534,537-539,540"'),
- OptionArg("-S", "--source", "--head",
- default=None,
- help="specify a merge source for this branch. It can be either "
- "a working directory path, a full URL, or an unambiguous "
- "substring of one of the locations for which merge tracking was "
- "already initialized. Needed only to disambiguate in case of "
- "multiple merge sources"),
-]
-
-command_table = {
- "init": (action_init,
- "init [OPTION...] [SOURCE]",
- """Initialize merge tracking from SOURCE on the current working
- directory.
-
- If SOURCE is specified, all the revisions in SOURCE are marked as already
- merged; if this is not correct, you can use --revision to specify the
- exact list of already-merged revisions.
-
- If SOURCE is omitted, then it is computed from the "svn cp" history of the
- current working directory (searching back for the branch point); in this
- case, %s assumes that no revision has been integrated yet since
- the branch point (unless you teach it with --revision).""" % NAME,
- [
- "-f", "-r", # import common opts
- OptionArg("-L", "--location-type",
- dest="location-type",
- default="path",
- help="Use this type of location identifier in the new " +
- "Subversion properties; 'uuid', 'url', or 'path' " +
- "(default)"),
- ]),
-
- "avail": (action_avail,
- "avail [OPTION...] [PATH]",
- """Show unmerged revisions available for PATH as a revision list.
- If --revision is given, the revisions shown will be limited to those
- also specified in the option.
-
- When svnmerge is used to bidirectionally merge changes between a
- branch and its source, it is necessary to not merge the same changes
- forth and back: e.g., if you committed a merge of a certain
- revision of the branch into the source, you do not want that commit
- to appear as available to merged into the branch (as the code
- originated in the branch itself!). svnmerge will automatically
- exclude these so-called "reflected" revisions.""",
- [
- Option("-A", "--all",
- dest="avail-showwhat",
- value=["blocked", "avail"],
- default=["avail"],
- help="show both available and blocked revisions (aka ignore "
- "blocked revisions)"),
- "-b",
- Option("-B", "--blocked",
- dest="avail-showwhat",
- value=["blocked"],
- help="show the blocked revision list (see '%s block')" % NAME),
- Option("-d", "--diff",
- dest="avail-display",
- value="diffs",
- default="revisions",
- help="show corresponding diff instead of revision list"),
- Option("--summarize",
- dest="avail-display",
- value="summarize",
- help="show summarized diff instead of revision list"),
- Option("-l", "--log",
- dest="avail-display",
- value="logs",
- help="show corresponding log history instead of revision list"),
- "-r",
- "-S",
- ]),
-
- "integrated": (action_integrated,
- "integrated [OPTION...] [PATH]",
- """Show merged revisions available for PATH as a revision list.
- If --revision is given, the revisions shown will be limited to
- those also specified in the option.""",
- [
- Option("-d", "--diff",
- dest="integrated-display",
- value="diffs",
- default="revisions",
- help="show corresponding diff instead of revision list"),
- Option("-l", "--log",
- dest="integrated-display",
- value="logs",
- help="show corresponding log history instead of revision list"),
- "-r",
- "-S",
- ]),
-
- "rollback": (action_rollback,
- "rollback [OPTION...] [PATH]",
- """Rollback previously merged in revisions from PATH. The
- --revision option is mandatory, and specifies which revisions
- will be rolled back. Only the previously integrated merges
- will be rolled back.
-
- When manually rolling back changes, --record-only can be used to
- instruct %s that a manual rollback of a certain revision
- already happened, so that it can record it and offer that
- revision for merge henceforth.""" % (NAME),
- [
- "-f", "-r", "-S", "-M", # import common opts
- ]),
-
- "merge": (action_merge,
- "merge [OPTION...] [PATH]",
- """Merge in revisions into PATH from its source. If --revision is omitted,
- all the available revisions will be merged. In any case, already merged-in
- revisions will NOT be merged again.
-
- When svnmerge is used to bidirectionally merge changes between a
- branch and its source, it is necessary to not merge the same changes
- forth and back: e.g., if you committed a merge of a certain
- revision of the branch into the source, you do not want that commit
- to appear as available to merged into the branch (as the code
- originated in the branch itself!). svnmerge will automatically
- exclude these so-called "reflected" revisions.
-
- When manually merging changes across branches, --record-only can
- be used to instruct %s that a manual merge of a certain revision
- already happened, so that it can record it and not offer that
- revision for merge anymore. Conversely, when there are revisions
- which should not be merged, use '%s block'.""" % (NAME, NAME),
- [
- "-b", "-f", "-r", "-S", "-M", # import common opts
- ]),
-
- "block": (action_block,
- "block [OPTION...] [PATH]",
- """Block revisions within PATH so that they disappear from the available
- list. This is useful to hide revisions which will not be integrated.
- If --revision is omitted, it defaults to all the available revisions.
-
- Do not use this option to hide revisions that were manually merged
- into the branch. Instead, use '%s merge --record-only', which
- records that a merge happened (as opposed to a merge which should
- not happen).""" % NAME,
- [
- "-f", "-r", "-S", # import common opts
- ]),
-
- "unblock": (action_unblock,
- "unblock [OPTION...] [PATH]",
- """Revert the effect of '%s block'. If --revision is omitted, all the
- blocked revisions are unblocked""" % NAME,
- [
- "-f", "-r", "-S", # import common opts
- ]),
-
- "uninit": (action_uninit,
- "uninit [OPTION...] [PATH]",
- """Remove merge tracking information from PATH. It cleans any kind of merge
- tracking information (including the list of blocked revisions). If there
- are multiple sources, use --source to indicate which source you want to
- forget about.""",
- [
- "-f", "-S", # import common opts
- ]),
-}
-
-
-def main(args):
- global opts
-
- # Initialize default options
- opts = default_opts.copy()
- logs.clear()
-
- optsparser = CommandOpts(global_opts, common_opts, command_table,
- version="%%prog r%s\n modified: %s\n\n"
- "Copyright (C) 2004,2005 Awarix Inc.\n"
- "Copyright (C) 2005, Giovanni Bajo"
- % (__revision__, __date__))
-
- cmd, args, state = optsparser.parse(args)
- opts.update(state)
-
- source = opts.get("source", None)
- branch_dir = "."
-
- if str(cmd) == "init":
- if len(args) == 1:
- source = args[0]
- elif len(args) > 1:
- optsparser.error("wrong number of parameters", cmd)
- elif str(cmd) in command_table.keys():
- if len(args) == 1:
- branch_dir = args[0]
- elif len(args) > 1:
- optsparser.error("wrong number of parameters", cmd)
- else:
- assert False, "command not handled: %s" % cmd
-
- # Validate branch_dir
- if not is_wc(branch_dir):
- if str(cmd) == "avail":
- info = None
- # it should be noted here that svn info does not error exit
- # if an invalid target is specified to it (as is
- # intuitive). so the try, except code is not absolutely
- # necessary. but, I retain it to indicate the intuitive
- # handling.
- try:
- info = get_svninfo(branch_dir)
- except LaunchError:
- pass
- # test that we definitely targeted a subversion directory,
- # mirroring the purpose of the earlier is_wc() call
- if info is None or not info.has_key("Node Kind") or info["Node Kind"] != "directory":
- error('"%s" is neither a valid URL, nor a working directory' % branch_dir)
- else:
- error('"%s" is not a subversion working directory' % branch_dir)
-
- # give out some hints as to potential pathids
- PathIdentifier.hint(branch_dir)
- if source: PathIdentifier.hint(source)
-
- # Extract the integration info for the branch_dir
- branch_props = get_merge_props(branch_dir)
-
- # Calculate source_url and source_path
- report("calculate source path for the branch")
- if not source:
- if str(cmd) == "init":
- cf_source, cf_rev, copy_committed_in_rev = get_copyfrom(branch_dir)
- if not cf_source:
- error('no copyfrom info available. '
- 'Explicit source argument (-S/--source) required.')
- opts["source-url"] = get_repo_root(branch_dir) + cf_source
- opts["source-pathid"] = PathIdentifier.from_target(opts["source-url"])
-
- if not opts["revision"]:
- opts["revision"] = "1-" + cf_rev
- else:
- opts["source-pathid"] = get_default_source(branch_dir, branch_props)
- opts["source-url"] = opts["source-pathid"].get_url()
-
- assert is_pathid(opts["source-pathid"])
- assert is_url(opts["source-url"])
- else:
- # The source was given as a command line argument and is stored in
- # SOURCE. Ensure that the specified source does not end in a /,
- # otherwise it's easy to have the same source path listed more
- # than once in the integrated version properties, with and without
- # trailing /'s.
- source = rstrip(source, "/")
- if not is_wc(source) and not is_url(source):
- # Check if it is a substring of a pathid recorded
- # within the branch properties.
- found = []
- for pathid in branch_props.keys():
- if pathid.match_substring(source):
- found.append(pathid)
- if len(found) == 1:
- # (assumes pathid is a repository-relative-path)
- source_pathid = found[0]
- source = source_pathid.get_url()
- else:
- error('"%s" is neither a valid URL, nor an unambiguous '
- 'substring of a repository path, nor a working directory'
- % source)
- else:
- source_pathid = PathIdentifier.from_target(source)
-
- source_pathid = PathIdentifier.from_target(source)
- if str(cmd) == "init" and \
- source_pathid == PathIdentifier.from_target("."):
- error("cannot init integration source path '%s'\n"
- "Its repository-relative path must differ from the "
- "repository-relative path of the current directory."
- % source_pathid)
- opts["source-pathid"] = source_pathid
- opts["source-url"] = target_to_url(source)
-
- # Sanity check source_url
- assert is_url(opts["source-url"])
- # SVN does not support non-normalized URL (and we should not
- # have created them)
- assert opts["source-url"].find("/..") < 0
-
- report('source is "%s"' % opts["source-url"])
-
- # Get previously merged revisions (except when command is init)
- if str(cmd) != "init":
- opts["merged-revs"] = merge_props_to_revision_set(branch_props,
- opts["source-pathid"])
-
- # Perform the action
- cmd(branch_dir, branch_props)
-
-
-if __name__ == "__main__":
- try:
- main(sys.argv[1:])
- except LaunchError, (ret, cmd, out):
- err_msg = "command execution failed (exit code: %d)\n" % ret
- err_msg += cmd + "\n"
- err_msg += "".join(out)
- error(err_msg)
- except KeyboardInterrupt:
- # Avoid traceback on CTRL+C
- print "aborted by user"
- sys.exit(1)
diff --git a/testing/subversion/svnserve b/testing/subversion/svnserve
deleted file mode 100755
index 670fee742..000000000
--- a/testing/subversion/svnserve
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/svnserve
-
-PID=`pidof -o %PPID /usr/bin/svnserve`
-case "$1" in
- start)
- stat_busy "Starting svnserve"
- if [ -z "$PID" ]; then
- if [ -n "$SVNSERVE_USER" ]; then
- su -s '/bin/sh' $SVNSERVE_USER -c "/usr/bin/svnserve -d $SVNSERVE_ARGS" &
- else
- /usr/bin/svnserve -d $SVNSERVE_ARGS &
- fi
- fi
- if [ ! -z "$PID" -o $? -gt 0 ]; then
- stat_fail
- else
- add_daemon svnserve
- stat_done
- fi
- ;;
- stop)
- stat_busy "Stopping svnserve"
- [ ! -z "$PID" ] && kill $PID &> /dev/null
- if [ $? -gt 0 ]; then
- stat_fail
- else
- rm_daemon svnserve
- stat_done
- fi
- ;;
- restart)
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "usage: $0 {start|stop|restart}"
-esac
diff --git a/testing/subversion/svnserve.conf b/testing/subversion/svnserve.conf
deleted file mode 100644
index 37fb7ea10..000000000
--- a/testing/subversion/svnserve.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Parameters to be passed to svnserve
-#
-#SVNSERVE_ARGS="-r /path/to/some/repos"
-SVNSERVE_ARGS=""
-
-#SVNSERVE_USER="svn"
diff --git a/testing/syslinux/PKGBUILD b/testing/syslinux/PKGBUILD
deleted file mode 100644
index 277bf3bf6..000000000
--- a/testing/syslinux/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-# $Id: PKGBUILD 144912 2011-12-10 00:40:44Z thomas $
-# Maintainer: Thomas Bächler <thomas@archlinux.org>
-# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-
-pkgname=syslinux
-pkgver=4.05
-pkgrel=1
-arch=('i686' 'x86_64')
-pkgdesc="Collection of boot loaders that boot from FAT, ext2/3/4 and btrfs filesystems, from CDs and via PXE"
-url="http://syslinux.zytor.com/"
-license=('GPL2')
-depends=('perl' 'glibc')
-optdepends=('perl-passwd-md5: For md5pass'
- 'perl-digest-sha1: For sha1pass'
- 'mtools: For mkdiskimage and syslinux'
- )
-makedepends=('nasm')
-backup=('boot/syslinux/syslinux.cfg')
-install=syslinux.install
-source=(http://www.kernel.org/pub/linux/utils/boot/syslinux/$pkgname-${pkgver}.tar.bz2
- syslinux-dont-build-dos-windows-targets.patch
- syslinux.cfg
- syslinux-install_update)
-md5sums=('82299242418385da1274c9479a778cb2'
- '1528c376e43f0eaccaa80d8ad1bc13b4'
- '4dc27d8ab3802f8e50f3dda28168ce6d'
- 'b5b4953c0a5a01cd16441402f6321765')
-
-build() {
- # Do not try to build syslinux with our default LDFLAGS, it will fail
- unset LDFLAGS
- cd "$srcdir"/$pkgname-${pkgver}
- # Do not try to build the Windows or DOS installers
- patch -p1 -i "$srcdir"/syslinux-dont-build-dos-windows-targets.patch
- # Fix FHS manpage path
- sed 's|/usr/man|/usr/share/man|g' -i mk/syslinux.mk
- make
-}
-
-package() {
- cd "$srcdir"/$pkgname-${pkgver}
- make INSTALLROOT="$pkgdir" AUXDIR=/usr/lib/syslinux install
-
- # Install the default configuration
- install -D -m644 "$srcdir"/syslinux.cfg "$pkgdir"/boot/syslinux/syslinux.cfg
- # Install the installation and update script
- # This script is maintained at git://gist.github.com/772138.git
- install -D -m755 "$srcdir"/syslinux-install_update "$pkgdir"/usr/sbin/syslinux-install_update
-}
diff --git a/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch b/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch
deleted file mode 100644
index 2b86ab828..000000000
--- a/testing/syslinux/syslinux-dont-build-dos-windows-targets.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur syslinux-4.02.orig//Makefile syslinux-4.02//Makefile
---- syslinux-4.02.orig//Makefile 2010-07-21 21:33:13.000000000 +0200
-+++ syslinux-4.02//Makefile 2010-07-22 11:14:03.325522937 +0200
-@@ -54,7 +54,7 @@
- # files that depend only on the B phase, but may have to be regenerated
- # for "make installer".
- BSUBDIRS = codepage com32 lzo core memdisk modules mbr memdump gpxe sample \
-- diag libinstaller dos win32 win64 dosutil
-+ libinstaller
- ITARGET =
- IOBJECTS = $(ITARGET) \
- utils/gethostip utils/isohybrid utils/mkdiskimage \
diff --git a/testing/syslinux/syslinux-install_update b/testing/syslinux/syslinux-install_update
deleted file mode 100644
index f7cd123e1..000000000
--- a/testing/syslinux/syslinux-install_update
+++ /dev/null
@@ -1,459 +0,0 @@
-#!/bin/bash
-#
-# Sylinux Installer / Updater Scripts
-# Copyright (C) 2011 Matthew Gyurgyik <pyther@pyther.net>
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-#
-#-----------------
-# Exit Codes:
-# 1 - get_boot_device or other function failed
-# 2 - install/update failed
-# 3 - set_active failed
-# 4 - install_mbr failed
-#
-shopt -s nullglob
-
-libpath="/usr/lib/syslinux"
-bootpath="/boot/syslinux"
-extlinux="/sbin/extlinux"
-
-autoupdate_file=/boot/syslinux/SYSLINUX_AUTOUPDATE
-com32_files=(menu.c32 vesamenu.c32 chain.c32 hdt.c32 reboot.c32 poweroff.com)
-pciids_file=/usr/share/hwdata/pci.ids
-
-## Helper functions ##
-# Taken from libui-sh
-# $1 needle
-# $2 set (array) haystack
-check_is_in() {
- local needle="$1" element
- shift
- for element; do
- [[ $element = $needle ]] && return 0
- done
- return 1
-}
-
-# return true when blockdevice is an md raid, otherwise return a unset value
-# get all devices that are part of raid device $1
-device_is_raid() {
- [[ $1 && -f /proc/mdstat ]] || return 1
- local devmajor=$(stat -c %t "$1")
- (( devmajor == 9 ))
-}
-
-mdraid_all_slaves() {
- local slave slaves
- for slave in /sys/class/block/${1##*/}/slaves/*; do
- source "$slave/uevent"
- slaves="$slaves/dev/$DEVNAME "
- unset DEVNAME
- done
- echo $slaves
-}
-
-# Check /sys/block to see if device is partitioned
-# If we have a partitioned block device (sda1) /sys/block/sda1/dev will not exist
-# However, if we have an unpartitioned block device (sda) /sys/block/sda/dev will exist
-dev_is_part() {
- # $1 - blockdevice
- local dev=$1
-
- # If block device uevent file should be found
- # If a partition is passed in path shouldn't exist
- if [[ $dev = *cciss* ]]; then
- [[ -f /sys/block/cciss\!${dev##*/}/dev ]] && return 1
- elif [[ $dev = *ida* ]]; then
- [[ -f /sys/block/ida\!${dev##*/}/dev ]] && return 1
- else
- [[ -f /sys/block/${dev##*/}/dev ]] && return 1
- fi
-
- return 0
-}
-
-# If EFI PART is present in the first 8 bytes then it must be a GPT disk
-device_is_gpt() {
- local partsig=$(dd if="$1" skip=64 bs=8 count=1 2>/dev/null)
- [[ $partsig = "EFI PART" ]]
-}
-
-clear_gpt_attr2() {
- # $1 - Block Device, no partitions
- local disk=$1
-
- # Special Exception for cciss controllers
- if [[ $disk = *cciss* ]]; then
- for part in /dev/cciss/${disk##*/}*p*; do
- local partnum="${part##*[[:alpha:]]}"
- sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null
- done
- # Smart 2 Controllers
- elif [[ $disk = *ida* ]]; then
- for part in /dev/ida/${disk##*/}*p*; do
- local partnum="${part##*[[:alpha:]]}"
- sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null
- done
- else
- for part in /sys/block/${disk##*/}/${disk##*/}*; do
- local partnum="${part##*[[:alpha:]]}"
- sgdisk "$disk" --attributes="$partnum":clear:2 &>/dev/null
- done
- fi
- return 0
-}
-
-usage() {
-cat << EOF
-usage: $0 options
-
-This script will install or upgrade Syslinux
-
-OPTIONS:
- -h Show this message
- -i Install Syslinux
- -u Update Syslinux
- -a Set Boot flag on boot partiton
- -m Install Syslinux MBR
- -s Updates Syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
-
- Arguments Required:
- -c Chroot install (ex: -c /mnt)
-
-Example Usage: syslinux-install_update.sh -i -a -m (install, set boot flag, install mbr)
- syslinux-install_update.sh -u (update)
-EOF
-}
-
-# Trys to find the partition that /boot resides on
-# This will either be on /boot or / (root)
-getBoot() {
- if [[ ! -d "$bootpath" ]]; then
- echo "Could not find $bootpath"
- echo "Is boot mounted? Is Syslinux installed?"
- exit 1
- fi
-
- syslinux_fs=(ext2 ext3 ext4 btrfs vfat)
-
- # Use DATA from findmnt see rc.sysint for more info
- if [[ -f /proc/self/mountinfo ]]; then
- read rootdev rootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/")
- read bootdev bootfs < <(findmnt -run -t noautofs -o SOURCE,FSTYPE "$CHROOT/boot")
- else
- echo "Could not find /proc/self/mountinfo"
- echo "Are you running a kernel greater than 2.6.24?"
- exit 1
- fi
-
- if [[ $bootfs ]]; then
- if ! check_is_in "$bootfs" "${syslinux_fs[@]}"; then
- echo "/boot file system is not supported by Syslinux"
- exit 1
- fi
- boot="boot"
- bootpart="$bootdev"
- elif [[ $rootfs ]]; then
- if ! check_is_in "$rootfs" "${syslinux_fs[@]}"; then
- echo "/ (root) file system is not supported by Syslinux"
- exit 1
- fi
- boot="root"
- bootpart="$rootdev"
- else
- echo "Could not find filesystem on / (root) or /boot."
- exit 1
- fi
-}
-
-# We store the partition table type either gpt or mbr in var ptb
-# In rare cases a user could have one raid disk using mbr and another using gpt
-# In such cases we accept that the output may be incomplete
-
-# Calls get_ptb() for $bootpart or for all device in RAID
-declare -A bootdevs
-get_boot_devices() {
- if device_is_raid "$bootpart"; then
- slaves=$(mdraid_all_slaves "$bootpart")
-
- for slave in ${slaves[@]}; do
- local disk="${slave%%[[:digit:]]*}"
- device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR"
- bootdevs[$slave]="$ptb"
- done
- else
- local disk="${bootpart%%[[:digit:]]*}"
- device_is_gpt "$disk" && local ptb="GPT" || local ptb="MBR"
- bootdevs[$bootpart]="$ptb"
- fi
-}
-
-# Function Assumes the boot partition should be marked as active
-# All other partitions should not have the boot flag set
-set_active() {
- # If any bootdev is a block device without partitions bail
- # we want to set the boot flag on partitioned disk
- for dev in "${!bootdevs[@]}"; do
- dev_is_part $dev || { echo "$dev - is a block device. Aborting set_active!"; return 1; }
- done
-
- # Clear BIOS Bootable Legacy Attribute for GPT drives
- # In rare cases where a RAID device has slaves on the same block device
- # Attribute 2 will be cleared for each partition multiple times
- for dev in "${!bootdevs[@]}"; do
- local ptb="${bootdevs[$dev]}"
- if [[ "$ptb" = GPT ]]; then
- local disk="${dev%%[[:digit:]]*}" #ex: /dev/sda
- clear_gpt_attr2 "$disk"
- fi
- done
-
- # Set the boot flag on bootdevs (generated from get_boot_devices)
- for part in "${!bootdevs[@]}"; do
- local ptb="${bootdevs[$part]}"
- local partnum="${part##*[[:alpha:]]}"
- case "$part" in
- *[[:digit:]]p[[:digit:]]*)
- local disk="${part%%p$partnum}" # get everything before p1
- ;;
- *)
- local disk="${part%%[[:digit:]]*}"
- ;;
- esac
-
- if [[ "$ptb" = MBR ]]; then
- if sfdisk "$disk" -A "$partnum" &>/dev/null; then
- echo "Boot Flag Set - $part"
- else
- echo "FAILED to Set the boot flag on $part"
- exit 3
- fi
- elif [[ "$ptb" = GPT ]]; then
- if sgdisk "$disk" --attributes="$partnum":set:2 &>/dev/null; then
- echo "Attribute Legacy Bios Bootable Set - $part"
- else
- echo "FAILED to set attribute Legacy BIOS Bootable on $part"
- exit 3
- fi
- fi
- done
- return 0
-}
-
-install_mbr() {
- # If any bootdev is a block device without partitions bail
- # we want to install the mbr to a partitioned disk
- for dev in "${!bootdevs[@]}"; do
- dev_is_part "$dev" || { echo "$dev - is a block device. Aborting MBR install"; return 1; }
- done
-
- for part in "${!bootdevs[@]}"; do
- local partnum="${part##*[[:alpha:]]}"
- case "$part" in
- *[[:digit:]]p[[:digit:]]*)
- local disk="${part%%p$partnum}" # get everything before p1
- ;;
- *)
- local disk="${part%%[[:digit:]]*}"
- ;;
- esac
- local ptb="${bootdevs[$part]}"
-
- # We want to install to the root of the block device
- # If the device is a partition - ABORT!
- dev_is_part "$disk" && \
- { echo "ABORT! MBR installation to partition ($disk)!"; exit 4;}
-
- if [[ "$ptb" = MBR ]]; then
- mbrfile="$libpath/mbr.bin"
- elif [[ "$ptb" = GPT ]]; then
- mbrfile="$libpath/gptmbr.bin"
- fi
-
- if dd bs=440 count=1 conv=notrunc if="$mbrfile" of="$disk" &> /dev/null; then
- echo "Installed MBR ($mbrfile) to $disk"
- else
- echo "Error Installing MBR ($mbrfile) to $disk"
- exit 4
- fi
- done
- return 0
-}
-
-_install() {
- # Copy files to /boot
- for file in "${com32_files[@]}"; do
- # Symlink files even if links exist
- if [[ "$boot" = root ]]; then
- ln -s "${libpath#$CHROOT}/$file" "$bootpath/$file" &> /dev/null
- elif [[ "$boot" = boot ]]; then
- cp "$libpath/$file" "$bootpath/$file"
- fi
- done
-
- # Copy / Symlink pci.ids if we copy the com32 module and if pci.ids exists in the FS
- if check_is_in "hdt.c32" "${com32_files[@]}" && [[ -f $pciids_file ]]; then
- if [[ "$boot" = root ]]; then
- ln -s "$pciids_file" "$bootpath/pci.ids" &> /dev/null
- elif [[ "$boot" = boot ]]; then
- cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null
- fi
- fi
-
- if device_is_raid "$bootpart"; then
- echo "Detected RAID on /boot - installing Syslinux with --raid"
- "$extlinux" --install "$bootpath" -r > /dev/null 2>&1
- else
- "$extlinux" --install "$bootpath" > /dev/null 2>&1
- fi
-
- if (( $? )); then
- echo "Syslinux install failed"
- exit 2
- else
- echo "Syslinux install successful"
- fi
-
- touch "$CHROOT/$autoupdate_file"
-}
-
-update() {
- # Update any com and c32 files in /boot
- if [[ "$boot" = boot ]]; then
- for file in "$bootpath"/*.{c32,com}; do
- file=$(basename "$file")
- cp "$libpath/$file" "$bootpath/$file" &> /dev/null
- done
- if [[ -f "$bootpath/pci.ids" ]]; then
- cp "$pciids_file" "$bootpath/pci.ids" &> /dev/null
- fi
- fi
-
- if device_is_raid $bootpart; then
- echo "Detected RAID on /boot - installing Syslinux with --raid"
- "$extlinux" --update "$bootpath" -r &> /dev/null
- else
- "$extlinux" --update "$bootpath" &> /dev/null
- fi
-
- if (($?)); then
- echo "Syslinux update failed"
- exit 2
- else
- echo "Syslinux update successful"
- fi
-}
-
-# Make sure only root can run our script
-if (( $(id -u) != 0 )); then
- echo "This script must be run as root" 1>&2
- exit 1
-fi
-
-if (( $# == 0 )); then
- usage
- exit 1
-fi
-
-while getopts "c:uihmas" opt; do
- case $opt in
- c)
- CHROOT=$(readlink -e "$OPTARG")
- if [[ -z $CHROOT ]]; then
- echo "error: chroot path ``$OPTARG does not exist";
- exit 1
- fi
- ;;
- h)
- usage
- exit 0
- ;;
- i)
- INSTALL="True"
- ;;
- u)
- UPDATE="True"
- ;;
- m)
- MBR="True"
- ;;
- a)
- SET_ACTIVE="True"
- ;;
- s)
- # If AUTOUPDATE_FILE does not exist exit the script
- if [[ -f $autoupdate_file ]]; then
- UPDATE="True"
- else
- exit 0
- fi
- ;;
- *)
- usage
- exit 1
- ;;
- esac
-done
-
-# Display Usage Information if both Install and Update are passed
-if [[ $INSTALL && $UPDATE ]]; then
- usage
- exit 1
-fi
-
-# If a chroot dir is path set variables to reflect chroot
-if [[ "$CHROOT" ]]; then
- libpath="$CHROOT$libpath"
- bootpath="$CHROOT$bootpath"
- extlinux="$CHROOT$extlinux"
-fi
-
-# Exit if no /boot path exists
-if ( f=("$bootpath"/*); (( ! ${#f[@]} )) ); then
- echo "Error: $bootpath is empty!"
- echo "Is /boot mounted?"
- exit 1
-fi
-
-# Get the boot device if any of these options are passed
-if [[ $INSTALL || $UPDATE || $SET_ACTIVE || $MBR ]]; then
- getBoot
-fi
-
-# Install or Update
-if [[ $INSTALL ]]; then
- _install || exit
-elif [[ $UPDATE ]]; then
- update || exit
-fi
-
-
-# SET_ACTIVE and MBR
-if [[ $SET_ACTIVE ]] || [[ $MBR ]]; then
- get_boot_devices
-
- if [[ $SET_ACTIVE ]]; then
- set_active || exit
- fi
-
- if [[ $MBR ]]; then
- install_mbr || exit
- fi
-fi
-
-exit 0
-
-# vim: set et sw=4:
diff --git a/testing/syslinux/syslinux.cfg b/testing/syslinux/syslinux.cfg
deleted file mode 100644
index 02127d21d..000000000
--- a/testing/syslinux/syslinux.cfg
+++ /dev/null
@@ -1,79 +0,0 @@
-# Config file for Syslinux -
-# /boot/syslinux/syslinux.cfg
-#
-# Comboot modules:
-# * menu.c32 - provides a text menu
-# * vesamenu.c32 - provides a graphical menu
-# * chain.c32 - chainload MBRs, partition boot sectors, Windows bootloaders
-# * hdt.c32 - hardware detection tool
-# * reboot.c32 - reboots the system
-# * poweroff.com - shutdown the system
-#
-# To Use: Copy the respective files from /usr/lib/syslinux to /boot/syslinux.
-# If /usr and /boot are on the same file system, symlink the files instead
-# of copying them.
-#
-# If you do not use a menu, a 'boot:' prompt will be shown and the system
-# will boot automatically after 5 seconds.
-#
-# Please review the wiki: https://wiki.archlinux.org/index.php/Syslinux
-# The wiki provides further configuration examples
-
-DEFAULT arch
-PROMPT 0 # Change to 1 if you do not want to use a menu
-TIMEOUT 50
-# You can create syslinux keymaps with the keytab-lilo tool
-#KBDMAP de.ktl
-
-# Menu Configuration
-# Either menu.c32 or vesamenu32.c32 must be copied to /boot/syslinux
-UI menu.c32
-#UI vesamenu.c32
-
-# Refer to http://syslinux.zytor.com/wiki/index.php/Doc/menu
-MENU TITLE Arch Linux
-#MENU BACKGROUND splash.png
-MENU COLOR border 30;44 #40ffffff #a0000000 std
-MENU COLOR title 1;36;44 #9033ccff #a0000000 std
-MENU COLOR sel 7;37;40 #e0ffffff #20ffffff all
-MENU COLOR unsel 37;44 #50ffffff #a0000000 std
-MENU COLOR help 37;40 #c0ffffff #a0000000 std
-MENU COLOR timeout_msg 37;40 #80ffffff #00000000 std
-MENU COLOR timeout 1;37;40 #c0ffffff #00000000 std
-MENU COLOR msg07 37;40 #90ffffff #a0000000 std
-MENU COLOR tabmsg 31;40 #30ffffff #00000000 std
-
-# boot sections follow
-#
-# TIP: If you want a 1024x768 framebuffer, add "vga=773" to your kernel line.
-#
-#-*
-
-LABEL arch
- MENU LABEL Arch Linux
- LINUX ../vmlinuz-linux
- APPEND root=/dev/sda3 ro
- INITRD ../initramfs-linux.img
-
-LABEL archfallback
- MENU LABEL Arch Linux Fallback
- LINUX ../vmlinuz-linux
- APPEND root=/dev/sda3 ro
- INITRD ../initramfs-linux-fallback.img
-
-#LABEL windows
-# MENU LABEL Windows
-# COM32 chain.c32
-# APPEND hd0 1
-
-LABEL hdt
- MENU LABEL HDT (Hardware Detection Tool)
- COM32 hdt.c32
-
-LABEL reboot
- MENU LABEL Reboot
- COM32 reboot.c32
-
-LABEL off
- MENU LABEL Power Off
- COMBOOT poweroff.com
diff --git a/testing/syslinux/syslinux.install b/testing/syslinux/syslinux.install
deleted file mode 100644
index 0dc0ece36..000000000
--- a/testing/syslinux/syslinux.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
- echo "==> If you want to use syslinux as your bootloader"
- echo "==> edit /boot/syslinux/syslinux.cfg and run"
- echo "==> # /usr/sbin/syslinux-install_update -i -a -m"
- echo "==> to install it."
-}
-
-post_upgrade() {
- # auto-update syslinux if /boot/syslinux/SYSLINUX_AUTOUPDATE exists
- /usr/sbin/syslinux-install_update -s
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/texinfo/PKGBUILD b/testing/texinfo/PKGBUILD
deleted file mode 100644
index cc20f22b7..000000000
--- a/testing/texinfo/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 144959 2011-12-12 08:29:38Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=texinfo
-pkgver=4.13a
-pkgrel=7
-pkgdesc="Utilities to work with and produce manuals, ASCII text, and on-line documentation from a single source file"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/texinfo/"
-license=('GPL3')
-groups=('base')
-depends=('ncurses' 'findutils' 'gzip')
-install=texinfo.install
-source=(ftp://ftp.gnu.org/pub/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.sig}
- texinfo-4.13a-data_types.patch)
-md5sums=('71ba711519209b5fb583fed2b3d86fcb'
- 'db2ca82c831684cd7cef181234017c46'
- 'd8574782ff7def1e2dc5c291dbeaec18')
-
-build() {
- cd ${srcdir}/${pkgname}-4.13
- patch -Np1 -i $srcdir/texinfo-4.13a-data_types.patch
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-4.13
- make DESTDIR=${pkgdir} install
-
- # fix this here as it prevents make from trying to rebuild manual pages
- sed -i 's#A-z#A-Za-z#' ${pkgdir}/usr/bin/texi2dvi
-}
diff --git a/testing/texinfo/texinfo-4.13a-data_types.patch b/testing/texinfo/texinfo-4.13a-data_types.patch
deleted file mode 100644
index 2a87c2146..000000000
--- a/testing/texinfo/texinfo-4.13a-data_types.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -up texinfo-4.13/info/window.c_old texinfo-4.13/info/window.c
---- texinfo-4.13/info/window.c_old 2009-08-04 13:46:15.000000000 +0200
-+++ texinfo-4.13/info/window.c 2009-08-04 13:47:29.000000000 +0200
-@@ -1581,7 +1581,7 @@ process_node_text (WINDOW *win, char *st
- const char *carried_over_ptr;
- size_t carried_over_len, carried_over_count;
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-+ size_t cur_len = mb_len (mbi_cur (iter));
- int replen;
- int delim = 0;
- int rc;
-@@ -1754,7 +1754,7 @@ clean_manpage (char *manpage)
- mbi_advance (iter))
- {
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-+ size_t cur_len = mb_len (mbi_cur (iter));
-
- if (cur_len == 1)
- {
-@@ -1852,8 +1852,8 @@ window_scan_line (WINDOW *win, int line,
- mbi_advance (iter))
- {
- const char *cur_ptr = mbi_cur_ptr (iter);
-- int cur_len = mb_len (mbi_cur (iter));
-- int replen;
-+ size_t cur_len = mb_len (mbi_cur (iter));
-+ size_t replen;
-
- if (cur_ptr >= endp)
- break;
diff --git a/testing/texinfo/texinfo.install b/testing/texinfo/texinfo.install
deleted file mode 100644
index f1554e4f4..000000000
--- a/testing/texinfo/texinfo.install
+++ /dev/null
@@ -1,21 +0,0 @@
-infodir=usr/share/info
-filelist=(info.info info-stnd.info texinfo texinfo-1 texinfo-2 texinfo-3)
-
-post_install() {
- # Scan *all* info files on install
- for file in $(find $infodir -type f ! -name dir); do
- install-info $file $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/testing/twisted/PKGBUILD b/testing/twisted/PKGBUILD
deleted file mode 100644
index 84d918a8c..000000000
--- a/testing/twisted/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-# $Id: PKGBUILD 145058 2011-12-15 22:26:04Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=twisted
-pkgver=11.1.0
-pkgrel=1
-pkgdesc="Asynchronous networking framework written in Python."
-arch=('i686' 'x86_64')
-url="http://twistedmatrix.com/"
-license=('MIT')
-depends=('python2' 'pycrypto' 'zope-interface')
-optdepends=('python2-pyopenssl'
- 'python-soappy:for twisted.web.soap')
-install=twisted.install
-source=(http://twistedmatrix.com/Releases/Twisted/${pkgver%.*}/Twisted-$pkgver.tar.bz2)
-md5sums=('972f3497e6e19318c741bf2900ffe31c')
-
-build() {
- cd "$srcdir/Twisted-$pkgver"
- python2 setup.py build
-}
-
-package() {
- cd "$srcdir/Twisted-$pkgver"
- python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
- install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-
- sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
- -i "$pkgdir"/usr/lib/python2.7/site-packages/twisted/trial/test/scripttest.py
- sed -e 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
- -i "$pkgdir"/usr/lib/python2.7/site-packages/twisted/mail/test/pop3testserver.py
-}
diff --git a/testing/twisted/twisted.install b/testing/twisted/twisted.install
deleted file mode 100644
index 8e93ffd3c..000000000
--- a/testing/twisted/twisted.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- python2 -c 'from twisted.plugin import IPlugin, getPlugins; list(getPlugins(IPlugin))' >/dev/null 2>&1 || return 1
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- find /usr/lib/python2.7/site-packages/twisted/plugins -name dropin.cache | xargs -r rm -f
-}
diff --git a/testing/unixodbc/PKGBUILD b/testing/unixodbc/PKGBUILD
deleted file mode 100644
index 8d19b5a7c..000000000
--- a/testing/unixodbc/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 145233 2011-12-19 18:04:27Z andrea $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Contributor: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
-
-pkgname=unixodbc
-pkgver=2.3.1
-pkgrel=1
-pkgdesc="ODBC is an open specification for providing application developers with a predictable API with which to access Data Sources"
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-url="http://www.unixodbc.org/"
-backup=('etc/odbc.ini' 'etc/odbcinst.ini')
-depends=('readline' 'libltdl')
-options=('!libtool')
-source=("http://www.unixodbc.org/unixODBC-$pkgver.tar.gz")
-md5sums=('86788d4006620fa1f171c13d07fdcaab')
-
-build() {
- cd ${srcdir}/unixODBC-${pkgver}
- ./configure --prefix=/usr --sysconfdir=/etc
- make
-}
-
-package() {
- cd ${srcdir}/unixODBC-${pkgver}
- make DESTDIR=${pkgdir} install
-}
diff --git a/testing/valgrind/PKGBUILD b/testing/valgrind/PKGBUILD
deleted file mode 100644
index 216379b31..000000000
--- a/testing/valgrind/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 145691 2011-12-27 10:54:37Z allan $
-# Maintainer: Dan McGee <dan@archlinux.org>
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-pkgname=valgrind
-pkgver=3.7.0
-pkgrel=2
-pkgdesc="A tool to help find memory-management problems in programs"
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://valgrind.org/"
-depends=('glibc>=2.15' 'glibc<2.16' 'perl')
-makedepends=('gdb')
-options=('!emptydirs')
-source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
- valgrind-3.7.0-glibc-2.15.patch)
-md5sums=('a855fda56edf05614f099dca316d1775'
- 'f534b79b358cdced0319b375aafde4d5')
-
-build() {
- cd ${srcdir}/${pkgname}-${pkgver}
-
- patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.15.patch
-
- if [ "${CARCH}" = "x86_64" ]; then
- ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
- else
- ./configure --prefix=/usr --mandir=/usr/share/man
- fi
- make
-}
-
-package() {
- cd ${srcdir}/${pkgname}-${pkgver}
- make DESTDIR=${pkgdir} install
-}
diff --git a/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch b/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch
deleted file mode 100644
index fa400b953..000000000
--- a/testing/valgrind/valgrind-3.7.0-glibc-2.15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naur valgrind-3.7.0-orig/configure valgrind-3.7.0/configure
---- valgrind-3.7.0-orig/configure 2011-11-05 21:24:39.000000000 +1000
-+++ valgrind-3.7.0/configure 2011-12-27 15:43:54.832120449 +1000
-@@ -6402,6 +6402,17 @@
- DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- ;;
-+ 2.15)
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.15 family" >&5
-+$as_echo "2.15 family" >&6; }
-+
-+$as_echo "#define GLIBC_2_15 1" >>confdefs.h
-+
-+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+ ;;
-+
- darwin)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5
- $as_echo "Darwin" >&6; }
-@@ -6422,7 +6433,7 @@
- *)
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported version ${GLIBC_VERSION}" >&5
- $as_echo "unsupported version ${GLIBC_VERSION}" >&6; }
-- as_fn_error "Valgrind requires glibc version 2.2 - 2.14" "$LINENO" 5
-+ as_fn_error "Valgrind requires glibc version 2.2 - 2.15" "$LINENO" 5
- as_fn_error "or Darwin libc" "$LINENO" 5
- ;;
- esac
diff --git a/testing/xulrunner/PKGBUILD b/testing/xulrunner/PKGBUILD
deleted file mode 100644
index 58b80ace8..000000000
--- a/testing/xulrunner/PKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# $Id: PKGBUILD 145256 2011-12-20 11:59:26Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-pkgname=xulrunner
-pkgver=9.0
-pkgrel=1
-pkgdesc="Mozilla Runtime Environment"
-arch=('i686' 'x86_64')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.13.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite3>=3.7.4' 'libnotify' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'wireless_tools' 'yasm' 'mesa')
-url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=(ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//$pkgver/source/firefox-$pkgver.source.tar.bz2
- mozconfig
- mozilla-pkgconfig.patch)
-options=('!emptydirs')
-replaces=('xulrunner-oss')
-md5sums=('d8d0c8c79660752b02d9e9ab69a68f94'
- '8dfb78c5bd0581c8cf4753813132bf0b'
- '27271ce647a83906ef7a24605e840d61')
-
-build() {
- cd "$srcdir/mozilla-release"
- cp "$srcdir/mozconfig" .mozconfig
-
- #fix libdir/sdkdir - fedora
- patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
-
- export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-$pkgver"
- export PYTHON="/usr/bin/python2"
-
- make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
- cd "$srcdir/mozilla-release"
- make -j1 -f client.mk DESTDIR="$pkgdir" install
-
- rm -rf "$pkgdir"/usr/lib/xulrunner-$pkgver/{dictionaries,hyphenation}
- ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-$pkgver/dictionaries"
- ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-$pkgver/hyphenation"
-
- # add xulrunner library path to ld.so.conf
- install -d $pkgdir/etc/ld.so.conf.d
- echo "/usr/lib/xulrunner-$pkgver" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
-
- chmod +x "${pkgdir}/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpt.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/header.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/typelib.py"
- sed -i 's|!/usr/bin/env python|!/usr/bin/env python2|' "$pkgdir/usr/lib/xulrunner-devel-$pkgver/sdk/bin/xpidl.py"
-}
diff --git a/testing/xulrunner/mozconfig b/testing/xulrunner/mozconfig
deleted file mode 100644
index 82a6ae512..000000000
--- a/testing/xulrunner/mozconfig
+++ /dev/null
@@ -1,38 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-startup-notification
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/testing/xulrunner/mozilla-pkgconfig.patch b/testing/xulrunner/mozilla-pkgconfig.patch
deleted file mode 100644
index 037d4aee0..000000000
--- a/testing/xulrunner/mozilla-pkgconfig.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:11:38.100005674 +0000
-+++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in 2011-12-19 22:14:35.095147521 +0000
-@@ -6,5 +6,6 @@
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
-+Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue -ldl
- Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul.pc.in 2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/libxul.pc.in 2011-12-19 22:14:04.375412141 +0000
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- idldir=%idldir%
-
-diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in
---- mozilla-release.orig/xulrunner/installer/Makefile.in 2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/Makefile.in 2011-12-19 22:18:28.743135321 +0000
-@@ -108,6 +108,7 @@
- -e "s|%includedir%|$(includedir)|" \
- -e "s|%idldir%|$(idldir)|" \
- -e "s|%sdkdir%|$(sdkdir)|" \
-+ -e "s|%libdir%|$(installdir)|" \
- -e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- -e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- -e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in
---- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/mozilla-js.pc.in 2011-12-19 22:18:55.569571004 +0000
-@@ -7,4 +7,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
--Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff --git a/~lukeshu/iceweasel-libre-current/PKGBUILD b/~lukeshu/iceweasel-libre-current/PKGBUILD
deleted file mode 100644
index b09d42d90..000000000
--- a/~lukeshu/iceweasel-libre-current/PKGBUILD
+++ /dev/null
@@ -1,124 +0,0 @@
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
-# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
-
-_pkgname=iceweasel
-_pkgver=9.0
-_debver=9.0.1
-_debrel='1~bpo60+1' # bpo=backport (from sid to sqeeze)
-_repo_url=http://mozilla.debian.net/pool/iceweasel-release/i/iceweasel
-
-pkgname=$_pkgname-libre-current
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-
-pkgdesc="A libre version of Debian Iceweasel, the browser based on Mozilla Firefox."
-arch=('i586' 'i686' 'x86_64')
-url="http://www.geticeweasel.org/"
-license=('GPL2' 'MPL' 'LGPL')
-depends=('desktop-file-utils')
-makedepends=('zip' 'pkg-config' 'diffutils' 'python' 'wireless_tools' 'yasm' 'mesa' 'quilt')
-provides=("${_pkgname}")
-conflicts=('firefox' 'icecat' "${_pkgname}")
-replaces=('firefox' 'icecat')
-install=iceweasel.install
-source=("${_repo_url}/iceweasel_${_debver}.orig.tar.bz2"
- "${_repo_url}/iceweasel_${_debver}-${_debrel}.debian.tar.gz"
- mozconfig
- libre.patch
- # Search engines
- arch-linux-wiki.xml
- internet-archive.xml
- jamendo-en.xml
- logless-search.xml
- scroogle-ssl-english.xml
- yacy.xml
- duck-duck-go-ssl.xml
- duck-duck-go-lite.xml
- # Default configuration
- mozilla-firefox-1.0-lang.patch
- xulrunner-copy-stub.patch
- region.properties)
-
-build() {
- msg2 "Applying Debian patches..."
- cd "${srcdir}"
- # This will simulate dpkg-source -x iceweasel_${_debver}-${_debrel}.dsc
- export QUILT_PATCHES=debian/patches
- export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
- export QUILT_DIFF_ARGS='--no-timestamps'
- mv mozilla-release "${_pkgname}-${_debver}"
- mv debian "${_pkgname}-${_debver}"
- cd "${_pkgname}-${_debver}"
- quilt push -a
- find .pc -name .timestamp -delete # why isn't --no-timestamps doing this?
-
- # This will make life more sane
- cd "${srcdir}"
- ln -s "${_pkgname}-${_debver}" "${_pkgname}-${pkgver}"
-
- msg2 "Applying Parabola/ConnochaetOS patches..."
- cd "${srcdir}/${_pkgname}-${pkgver}/"
- patch -p1 -i "${srcdir}/mozilla-firefox-1.0-lang.patch"
- patch -p1 -i "${srcdir}/xulrunner-copy-stub.patch"
- patch -p1 -i "${srcdir}/libre.patch"
-
- cp --remove-destination ${srcdir}/region.properties ./browser/locales/en-US/chrome/browser-region/
-
- msg2 "Starting build..."
-
- cp "${srcdir}/mozconfig" .mozconfig
- #make -j1 -f client.mk build MOZ_MAKE_FLAGS="${MAKEFLAGS}"
- ./configure
-# touch config*
- make MOZ_MAKE_FLAGS="${MAKEFLAGS}"
-
- msg2 "Build complete"
-}
-
-package() {
-
- cd "${srcdir}/${_pkgname}-${pkgver}/"
- #make -j1 -f client.mk DESTDIR="${pkgdir}" install
- make install DESTDIR="${pkgdir}"
-
- msg2 "Finishing..."
-
- install -m755 -d ${pkgdir}/usr/share/applications
- install -m755 -d ${pkgdir}/usr/share/pixmaps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/16x16/apps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/32x32/apps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/64x64/apps
- install -m755 -d ${pkgdir}/usr/share/icons/hicolor/scalable/apps
-
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/iceweasel.desktop ${pkgdir}/usr/share/applications/ || return 1
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default16.png ${pkgdir}/usr/share/icons/hicolor/16x16/apps/iceweasel.png
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default32.png ${pkgdir}/usr/share/icons/hicolor/32x32/apps/iceweasel.png
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/default64.png ${pkgdir}/usr/share/icons/hicolor/64x64/apps/iceweasel.png
- install -m644 ${srcdir}/${_pkgname}-${pkgver}/debian/branding/iceweasel_icon.svg ${pkgdir}/usr/share/icons/hicolor/scalable/apps/iceweasel.svg
-
-
- msg2 "Removing proprietary and anti-privacy search engines"
- rm -f ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/{google,answers,amazondotcom,eBay,yahoo,bing}.xml
- msg2 "And provide better ones..."
- install -m755 -d ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/
- install -m644 ${srcdir}/*.xml ${pkgdir}/usr/lib/${_pkgname}-${_pkgver}/searchplugins/
- rm -rvf ${pkgdir}/usr/lib/iceweasel-devel-${_pkgver}
- rm -rvf ${pkgdir}/usr/include
-
-}
-
-md5sums=('bd656a24d0ba3d4ca7b68aca8081a07d'
- '8846b9cce4ce7a82ec9995510efce867'
- '5e2574eef71ee1437e2f8e7481c67893'
- '9609e77182cc300e3fe9d4b0c7e7efb4'
- '3403175087e584a8c5e840cc62310cd9'
- '462c68585461f8cdc23c93c46f6ee4cf'
- '2d492295c4308f9bba9ece28d8b3af2d'
- '937ac0e5392b060d93bd33e761fbfa51'
- 'cf97082e77e3ef5f1bd74b1db9329965'
- '24528ca3f7f1e1a0ba735231aa3ac1de'
- 'c5f00b6b24222aacd5a749d1f59c4d24'
- 'e1bda0854de7d764f7401c81bb82b5ef'
- 'bd5db57c23c72a02a489592644f18995'
- 'a485a2b5dc544a8a2bd40c985d2e5813'
- 'f1c76e7e244257856a386ca2de69bdf0')
diff --git a/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml b/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml
deleted file mode 100644
index 9e21b92e2..000000000
--- a/~lukeshu/iceweasel-libre-current/arch-linux-wiki.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Arch Linux Wiki</os:ShortName>
-<os:Description>searches on the arch linux wiki</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAG8SURBVDiNjZM/iBNBFMZ/MzvJunfmYFfwtjgbEzk4jhSKoNa2goiNaGXhCaYRDAiHNlprcYuVhaCNWIj4BxSusBJRhNtDRTF6nCkWPUQMJJe4s2PhBhIvE/yaebz3vY/fDIwwxmBTGMX7JwtSNRbmX9g8yrr9V+ccISYAa4CwEey6sbpDCJpFR6rZwJ19fLzyeZRP2pIni3LBU3IbGNVJs/M2nzXAU3K3pySeknTS7OTZZ+v+fwccuvPhqOuIV64Sy56S9LTxm796i6O8W95g3633xcBTDWOYSY35kRl8bYzwHNkqFWX5/rHy97EEgafqEwU54yqBMQRdnYnf2rCps1JHm0tjCeZuvpvaE7hrG+3U/9rq0dPDdK4jWlOuU1k9PfdtJMGmzupvkrbf+NntLz8A7vbnXW1KG530wkiCMIp3Ag1gez57lNSqR/LZbeBU3m8D5aRWTf4luDywDPBwoH6anwb4AtSHrhBGcRk4w7A+DdRv+8SAC9wbCgCuAoW8XgOuAR8HAprAdWAdqADLYRSfABDTSyt7gdfAE+BKUqu+ZIzCKD4ILAKHgXkxvbRyEXie1KrWHzcm6MAfcSib4f24CrwAAAAASUVORK5CYII=</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.xml</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/archlinux_wiki.png</IconUpdateUrl>
-<SearchForm>http://wiki.archlinux.org/index.php/Main_Page</SearchForm>
-<os:Url type="text/html" method="GET" template="http://wiki.archlinux.org/index.php/Special:Search?go=Go&amp;search={searchTerms}">
-</os:Url>
-</SearchPlugin> \ No newline at end of file
diff --git a/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml b/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml
deleted file mode 100644
index 3142d3410..000000000
--- a/~lukeshu/iceweasel-libre-current/duck-duck-go-lite.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Duck Duck Go (Lite)</os:ShortName>
-<os:Description>Search Duck Duck Go (Lite)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/lite/?q={searchTerms}">
-</os:Url>
-</SearchPlugin> \ No newline at end of file
diff --git a/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml b/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml
deleted file mode 100644
index 4fb1391ab..000000000
--- a/~lukeshu/iceweasel-libre-current/duck-duck-go-ssl.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Duck Duck Go (SSL)</os:ShortName>
-<os:Description>Search Duck Duck Go (SSL)</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAANcNAADXDQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJmlk8pf6+v3s/v7+++zr/fcnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAnIOwBJyDscCcg7PZttJ7/7Pfs//////++xO7/S5GA/ycg7P8nIOz2JyDscCcg7AEAAAAAAAAAAAAAAAAnIOwBJyDstScg7P8nIOz/Y8p5/2fHZf9Yv0z/YcF2/1rBUv8nIOz/JyDs/ycg7P8nIOy1JyDsAQAAAAAAAAAAJyDscCcg7P8nIOz/JyDs/4jQoP/p9+n//////05X3v9LkYD/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAJyDsJicg7PYnIOz/JyDs/zUu7f/+/v////////////89N+7/JyDs/yUo7f8nIOz/JyDs/ycg7P8nIOz2JyDsJicg7IAnIOz/JyDs/ycg7P9hXPH////////////t/P//GIr2/wfD+/8Gyfz/DKv5/yM57/8nIOz/JyDs/ycg7H8nIOyzJyDs/ycg7P8nIOz/jov1////////////Otz9/w3G/P8cWfH/JSvt/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDs5icg7P8nIOz/JyDs/7u5+f///////////27l/v8E0v3/BNL9/wTQ/f8Oofn/IT7v/ycg7P8nIOz/JyDs5icg7OYnIOz/JyDs/ycg7P/p6P3/uWsC////////////5fr//6Po/f8Thfb/DKv5/w6f+f8nIOz/JyDs/ycg7OYnIOyzJyDs/ycg7P8nIOz/9/b+/////////////////7lrAv/V1Pv/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOyzJyDsgCcg7P8nIOz/JyDs/8/N+///////////////////////iIX1/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDsfycg7CYnIOz2JyDs/ycg7P9FP+7/q6n4/+7u/f/n5v3/fXn0/yoj7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7CYAAAAAJyDscCcg7P8nIOz/wsD6/+no/f/Y1/z/eHTz/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7HAAAAAAAAAAACcg7AEnIOy1JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs/ycg7LUnIOwBAAAAAAAAAAAAAAAAJyDsAScg7HAnIOz2JyDs/ycg7P8nIOz/JyDs/ycg7P8nIOz/JyDs9icg7HAnIOwBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJyDsJicg7IAnIOyzJyDs5icg7OYnIOyzJyDsgCcg7CYAAAAAAAAAAAAAAAAAAAAA+B8AAPAPAADAAwAAwAMAAIABAAAAAQAAAAAAAAAAAAAAAAAAAAAAAAABAACAAQAAwAMAAMADAADwDwAA+B8AAA==</os:Image>
-<os:Url type="text/html" method="GET" template="https://duckduckgo.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin> \ No newline at end of file
diff --git a/~lukeshu/iceweasel-libre-current/iceweasel.install b/~lukeshu/iceweasel-libre-current/iceweasel.install
deleted file mode 100644
index 376600ec2..000000000
--- a/~lukeshu/iceweasel-libre-current/iceweasel.install
+++ /dev/null
@@ -1,21 +0,0 @@
-#[ "${ICDIR}" = "" ] && ICECATDIR="/usr/lib/icecat"
-post_install () {
- echo -e "\n >>> Please, source /etc/profile or logout and re-login to your desktop session"
- echo -e " >>> If you installed some locale in the past or some stuff in libdir, please remove old /usr/lib/iceweasel* directories"
- update-desktop-database -q
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- update-desktop-database -q
-}
-
-#op=$1
-#shift
-
-#$op $*
diff --git a/~lukeshu/iceweasel-libre-current/internet-archive.xml b/~lukeshu/iceweasel-libre-current/internet-archive.xml
deleted file mode 100644
index 1556a2d8c..000000000
--- a/~lukeshu/iceweasel-libre-current/internet-archive.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Internet Archive</os:ShortName>
-<os:Description>Search www.archive.org</os:Description>
-<os:InputEncoding>ISO-8859-1</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,R0lGODlhEAAQAPf0ABQAABMTERQTEhcXFxUYFRscGCwWEzYQDSAkHiAhICEiISQkIiUmJScnJSkpKSsrKi8vLDcvKjM0LzE1Mjc3NjU6Nj44NTw9OT0+Pj4/PD9CQUYdF00lJEE0KkQ9N0Y9NFItLFUvL1wzLFc/PV01MGE8PWU/OWk5NGo7OkBAP0RFREVJRURJRkVLR0ZIRkdJSUZLSEhMS0pPTFZOSllDQlZXVWFJRWVKQWRLRGtPRG9KSWxQRWxRRmhQTHJCQnFDRHVEQHZFQHpLS3hKTHlNSn5PSn5PTXxOUHRWTXBeU29jXXtgWHxjXn1mZIBQS4BQUIJZUoBZWIVeXYhfW4ZsX41jXYlrXoxuX4RuYoppYotza5NlZ5Zua5J4bpt5ZpaDeaKBb42MiY6MiY6NiY+QjJGIhZGKhZiLgp+IgJGRjJOSjZKSj5SWjpSTkJWVkJWUkpaUkZaVkquLgKmMgayPgK6Sh6mWj6ycj7GQgbKSgLWSgrqXi7maj7Sck7Smn72ilK+so6ytqbanobKppLysoLytor6uprqxqr2wqr+zrL23tMOklsCroMKvpcWqoMSsocStocSupcS1qce2rMa6r8m1rsO8ssa4sM65sty5q9C6sc3DttbEvdbKv9nFt9rHvODAsuDIuuHLvufKvurNvNDLwtDPy9nLwN3Oxt3Xz+TMwODQxuPTxuXRxefRxuHWzO3Ux+/WxunXy+vWyO3XzujYyuzYy+7bz+HZ0eHZ1eLc0uXc0+bc2Ore0u7c0O/f0vHf1eTg2+/h1O/h1u/j2u/m2vDh0/Hg1vDi1fHi1fPh1fPh1/bg1vLq3fXr3/ng1vjl2fnk2fTr5fTs4vHu6Pfw5vb07vnz5vvy5/zy5vry6Pv06vj17/7y6v/17fz47/757v/57v/38Pr58/358f358//68P778v/68/z89v/99f/+9f//9P7+9///9/z8+f//+P//+/7+/v///v///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAAAAAAALAAAAAAQABAAAAj+ALeUoDHjAosYKlKsaAHjhYsMgYaAAGABggwNDgbUqMAAgwIKa47oMBChwIQHAQRIQEAgQYMFYX6EGFEmDZk2ceCoYePmjZgxpnxEaSKPntGjR+fRi/dESo9y3MYFy8ULl65Sit6loyaEgw14qQANQuTn0pkPHsxYa2eEC5Nu0ywlMmSn0Z0OSg6RW4fiAA512nahqoQGkqckgqShO+ekypJw2F6titTlTywsnLxtY3diww135k59cjRnESkqmMR9YwdEBI9imwoxqiMHTx4rmohVAxdExI5Wkgg94rNHj5crWr5QulYESo5bxmqJGgUqExg6fSZ1akaEBBJXvlgfybI1C1YoVbSA9XI2xUSWZ9B+IROWTFk0ZsuODcsWEAA7</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.src</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/update.php/id0/archive.gif</IconUpdateUrl>
-<SearchForm>http://www.archive.org/</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.archive.org/search.php?sourceid=Mozilla-search&amp;query={searchTerms}&amp;sort=-%2Fadditional%2Fitem%2Fdownloads">
-</os:Url>
-</SearchPlugin> \ No newline at end of file
diff --git a/~lukeshu/iceweasel-libre-current/jamendo-en.xml b/~lukeshu/iceweasel-libre-current/jamendo-en.xml
deleted file mode 100644
index 91d6df6e4..000000000
--- a/~lukeshu/iceweasel-libre-current/jamendo-en.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Jamendo (en)</os:ShortName>
-<os:Description>Search Jamendo.com English site for downloadable Creative Commons music</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABh0RVh0U29mdHdhcmUAUGFpbnQuTkVUIHYzLjMxN4N3hgAAAqZJREFUOE9tk21IU2EUx+9S+tAXbZt6J4GRkEFQEQsKsb7W1ySCoK+9iCK9WKvMlZmKI8jqgw0JS52ZpQ4D7RV6IUmIqVGjgl6md0uf3dmcq3nvdv+dezfvNHvgD889z/n/zrn33MfApZfhpSMnu2hN5sGMFVzzori+jUk4nplhuMUfCISXnQc6+VJ21+INdluQFP+PFuKWjz9u8/sWAwz+Tn4nmVjabIF4vwChviKIvesh9hSkoDpEzS3RIGS20kN4wRxyb0b0fRNk0YNEVCD5ILMRREcvaLBkZxro11SXxcpNd1ladPPAVkjCYygJCSH/DEJCCIqiQF1KYh6xry6CbNAhVLyK09u+l0+VGylTRiKeQG9dP5xlTvi8E2lIPIbIyDH9daj4eArAQ21dDr7TqsWlONpPtMO23Yb6/Q3wvvVqcXVJ/mcQHxTqEI51WcBceZh5WILE3IQO6KjqgG3HGVRYK1G15zRGX49pncjiGEL9W8jDQ/VyrI02bXn0xYsRj/iWA7ZVoqy4HE+6nyYBzAOxe5PmUb0cc+aC3cyFeGcjpMBIGnCSOqBXqN1bhzcDw5AlWTub/zYE1lqgeVQvx67ngDWTruVi7pUdoAnE5QT66t1wnXNB+OKnCaQmIc1hdvAQ5ZuTHvJyP6+YW5iDAg4TxBtFiH3ogSL9gegPIxKK0lTUGSpQ5iP4PdyM4FWqTrnkkScd5iZOuGy2sjpzmF2iICnYtBaRIRukz4OIB8YhCx6CujHrLgerp++VyhNqTU76Dw3a3+irNu6atpuCJGg6n0WJ+WCNhWAN68BqeS22cD5ZbWq9uHvVyiX3Qag2lU7ZTV4dYjdiuiYldZ+CU17P88NZq/93W7lPp4xZlFiRhqQ6IvP3s8ZHUzWmIy+OZi8x/wVGO4LYiOwxygAAAABJRU5ErkJggg==</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.xml</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/jamendo.ico</IconUpdateUrl>
-<SearchForm>http://www.jamendo.com/en</SearchForm>
-<os:Url type="text/html" method="GET" template="http://www.jamendo.com/en/search/all/{searchTerms}">
-</os:Url>
-</SearchPlugin> \ No newline at end of file
diff --git a/~lukeshu/iceweasel-libre-current/libre.patch b/~lukeshu/iceweasel-libre-current/libre.patch
deleted file mode 100644
index e29e22a67..000000000
--- a/~lukeshu/iceweasel-libre-current/libre.patch
+++ /dev/null
@@ -1,391 +0,0 @@
-diff -urN iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js
---- iceweasel-9.0-orig/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0/.pc/iceweasel-branding/Determine-which-phishing-shavar-to-use-depending-on-.patch/browser/app/profile/firefox.js 2011-12-21 12:55:22.404066176 +0000
-@@ -57,10 +57,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
- pref("extensions.autoDisableScopes", 15);
-
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -200,7 +200,7 @@
- pref("extensions.update.interval", 86400); // Check for updates to Extensions and
- // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
-+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
- pref("extensions.dss.enabled", false); // Dynamic Skin Switching
- pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
- // restart.
-@@ -235,7 +235,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page", 1);
--pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage", "about:blank");
-
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -325,7 +325,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
-
- // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -564,7 +564,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
-
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js
---- iceweasel-9.0-orig/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/.pc/prefs/Remove-general.useragent.locale-prefs-from-firefox-..patch/browser/app/profile/firefox.js 2011-12-21 12:55:28.116066178 +0000
-@@ -57,10 +57,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
- pref("extensions.autoDisableScopes", 15);
-
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -200,7 +200,7 @@
- pref("extensions.update.interval", 86400); // Check for updates to Extensions and
- // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
-+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
- pref("extensions.dss.enabled", false); // Dynamic Skin Switching
- pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
- // restart.
-@@ -235,7 +235,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page", 1);
--pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage", "about:blank");
-
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -325,7 +325,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
-
- // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -564,7 +564,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
-
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js
---- iceweasel-9.0-orig/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/.pc/prefs/Set-DPI-to-system-settings.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:35.104062780 +0000
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
- // The first character after a period must be alphabetic.
-
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js
---- iceweasel-9.0-orig/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-16 20:29:37.000000000 +0000
-+++ iceweasel-9.0/.pc/prefs/Set-javascript.options.showInConsole.patch/modules/libpref/src/init/all.js 2011-12-21 10:10:43.184062783 +0000
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
- // The first character after a period must be alphabetic.
-
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0-orig/browser/app/profile/firefox.js iceweasel-9.0/browser/app/profile/firefox.js
---- iceweasel-9.0-orig/browser/app/profile/firefox.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/browser/app/profile/firefox.js 2011-12-21 12:54:53.816066166 +0000
-@@ -57,10 +57,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/guid:%IDS%?src=firefox&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/firefox/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/firefox/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%?src=firefox");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/firefox/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-
- // Blocklist preferences
- pref("extensions.blocklist.enabled", true);
-@@ -80,7 +80,7 @@
- pref("extensions.autoDisableScopes", 15);
-
- // Dictionary download preference
--pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
-+pref("browser.dictionaries.download.url", "");
-
- // The minimum delay in seconds for the timer to fire.
- // default=2 minutes
-@@ -200,7 +200,7 @@
- pref("extensions.update.interval", 86400); // Check for updates to Extensions and
- // Themes every day
- // Non-symmetric (not shared by extensions) extension-specific [update] preferences
--pref("extensions.getMoreThemesURL", "https://addons.mozilla.org/%LOCALE%/firefox/getpersonas");
-+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html#themes");
- pref("extensions.dss.enabled", false); // Dynamic Skin Switching
- pref("extensions.dss.switchPending", false); // Non-dynamic switch pending after next
- // restart.
-@@ -234,7 +234,7 @@
- // 0 = blank, 1 = home (browser.startup.homepage), 2 = last visited page, 3 = resume previous browser session
- // The behavior of option 3 is detailed at: http://wiki.mozilla.org/Session_Restore
- pref("browser.startup.page", 1);
--pref("browser.startup.homepage", "chrome://branding/locale/browserconfig.properties");
-+pref("browser.startup.homepage", "about:blank");
-
- // This url, if changed, MUST continue to point to an https url. Pulling arbitrary content to inject into
- // this page over http opens us up to a man-in-the-middle attack that we'd rather not face. If you are a downstream
-@@ -324,7 +324,7 @@
- pref("browser.download.manager.resumeOnWakeDelay", 10000);
-
- // search engines URL
--pref("browser.search.searchEnginesURL", "https://addons.mozilla.org/%LOCALE%/firefox/search-engines/");
-+pref("browser.search.searchEnginesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-
- // pointer to the default engine name
- pref("browser.search.defaultenginename", "chrome://browser-region/locale/region.properties");
-@@ -563,7 +563,7 @@
- pref("accessibility.typeaheadfind.flashBar", 1);
-
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-+pref("pfs.datasource.url", "http://gnuzilla.gnu.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%&appRelease=%APP_RELEASE%");
-
- // by default we show an infobar message when pages require plugins the user has not installed, or are outdated
- pref("plugins.hide_infobar_for_missing_plugin", false);
-diff -urN iceweasel-9.0-orig/browser/base/content/syncSetup.js iceweasel-9.0/browser/base/content/syncSetup.js
---- iceweasel-9.0-orig/browser/base/content/syncSetup.js 2011-12-16 20:29:12.000000000 +0000
-+++ iceweasel-9.0/browser/base/content/syncSetup.js 2011-12-21 10:05:15.888062669 +0000
-@@ -59,7 +59,7 @@
- // Broader than we'd like, but after this changed from api-secure.recaptcha.net
- // we had no choice. At least we only do this for the duration of setup.
- // See discussion in Bugs 508112 and 653307.
--const RECAPTCHA_DOMAIN = "https://www.google.com";
-+const RECAPTCHA_DOMAIN = "https://www.duckduckgo.com";
-
- Cu.import("resource://services-sync/main.js");
- Cu.import("resource://gre/modules/XPCOMUtils.jsm");
-diff -urN iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties
---- iceweasel-9.0-orig/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0/browser/locales/en-US/chrome/browser-region/region.properties 2011-12-21 09:55:31.032062468 +0000
-@@ -1,8 +1,8 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
-
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
-+browser.search.order.1=DuckDuckGo
- browser.search.order.2=Yahoo
- browser.search.order.3=Bing
-
-@@ -17,7 +17,7 @@
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=http://duckduck.go.com/?q={searchTerms}
-
- # increment this number when anything gets changed in the list below. This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-diff -urN iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in
---- iceweasel-9.0-orig/browser/locales/generic/profile/bookmarks.html.in 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0/browser/locales/generic/profile/bookmarks.html.in 2011-12-21 10:24:32.872063067 +0000
-@@ -11,14 +11,12 @@
- <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
- <DD>@bookmarks_toolbarfolder_description@
- <DL><p>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
-- <DT><A HREF="http://fxfeeds.mozilla.com/@AB_CD@/firefox/livebookmarks/" FEEDURL="http://fxfeeds.mozilla.com/@AB_CD@/firefox/headlines.xml" ID="rdf:#$HvPhC3">@latest_headlines@</A>
-+ <DT><A HREF="http://www.connochaetos.org/">ConnochaetOS</a>
- </DL><p>
- <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
- <DL><p>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
-- <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
-+ <DT><A HREF="http://www.fsf.org/">Free Software Foundation</A>
-+ <DT><A HREF="http://libreplanet.org/">LibrePlanet</A>
-+ <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</a>
- </DL><p>
- </DL><p>
-diff -urN iceweasel-9.0-orig/build/pgo/blueprint/elements.html iceweasel-9.0/build/pgo/blueprint/elements.html
---- iceweasel-9.0-orig/build/pgo/blueprint/elements.html 2011-12-16 20:29:13.000000000 +0000
-+++ iceweasel-9.0/build/pgo/blueprint/elements.html 2011-12-21 10:04:42.988062659 +0000
-@@ -143,7 +143,7 @@
- </p>
- <p>
- <a>&lt;a&gt; anchor</a><br>
-- <a href="http://www.google.com">&lt;a&gt; a + href</a>
-+ <a href="http://www.duckduckgo.com">&lt;a&gt; a + href</a>
- </p>
- <p>
- <abbr title="extended abbr text should show when mouse over">&lt;abbr&gt; abbr - extended text when mouseover.</abbr><br>
-diff -urN iceweasel-9.0-orig/dom/ipc/test.xul iceweasel-9.0/dom/ipc/test.xul
---- iceweasel-9.0-orig/dom/ipc/test.xul 2011-12-16 20:29:17.000000000 +0000
-+++ iceweasel-9.0/dom/ipc/test.xul 2011-12-21 10:03:33.224062635 +0000
-@@ -301,6 +301,6 @@
- oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
- </toolbar>
-
-- <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+ <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="page" remote="true"/>
- <label id="messageLog" value="" crop="center"/>
- </window>
-diff -urN iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul iceweasel-9.0/layout/ipc/test-ipcbrowser.xul
---- iceweasel-9.0-orig/layout/ipc/test-ipcbrowser.xul 2011-12-16 20:29:28.000000000 +0000
-+++ iceweasel-9.0/layout/ipc/test-ipcbrowser.xul 2011-12-21 10:03:06.408062626 +0000
-@@ -69,6 +69,6 @@
- label="setViewportScale"/>
- </toolbar>
-
-- <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+ <browser type="content" src="http://www.duckduckgo.com/" flex="1" id="content"
- remote="true"/>
- </window>
-diff -urN iceweasel-9.0-orig/mobile/app/mobile.js iceweasel-9.0/mobile/app/mobile.js
---- iceweasel-9.0-orig/mobile/app/mobile.js 2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0/mobile/app/mobile.js 2011-12-21 10:04:04.976062646 +0000
-@@ -217,12 +217,13 @@
- /* preferences for the Get Add-ons pane */
- pref("extensions.getAddons.cache.enabled", true);
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/recommended/");
--pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/list/featured/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/mobile/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%");
--pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/mobile/");
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/mobile/api/%API_VERSION%/search/guid:%IDS%?src=mobile&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
-+
-+pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.recommended.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.browseAddons", "http://www.gnu.org/s/gnuzilla/addons.html");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/s/gnuzilla/addons.html");
-
- /* preference for the locale picker */
- pref("extensions.getLocales.get.url", "");
-@@ -239,7 +240,7 @@
- pref("privacy.popups.showBrowserMessage", true);
-
- pref("keyword.enabled", true);
--pref("keyword.URL", "http://www.google.com/m?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
-
- pref("accessibility.typeaheadfind", false);
- pref("accessibility.typeaheadfind.timeout", 5000);
-diff -urN iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties iceweasel-9.0/mobile/locales/en-US/chrome/region.properties
---- iceweasel-9.0-orig/mobile/locales/en-US/chrome/region.properties 2011-12-16 20:29:36.000000000 +0000
-+++ iceweasel-9.0/mobile/locales/en-US/chrome/region.properties 2011-12-21 09:54:17.560062443 +0000
-@@ -1,8 +1,8 @@
- # Default search engine
--browser.search.defaultenginename=Google
-+browser.search.defaultenginename=DuckDuckGo
-
- # Search engine order (order displayed in the search bar dropdown)s
--browser.search.order.1=Google
-+browser.search.order.1=DuckDuckGo
-
- # This is the default set of web based feed handlers shown in the reader
- # selection UI
-@@ -12,7 +12,7 @@
- browser.contentHandlers.types.1.uri=http://fusion.google.com/add?feedurl=%s
-
- # Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
-+keyword.URL=http://duckduckgo.com/?q=
-
- # increment this number when anything gets changed in the list below. This will
- # cause Firefox to re-read these prefs and inject any new handlers into the
-diff -urN iceweasel-9.0-orig/modules/libpref/src/init/all.js iceweasel-9.0/modules/libpref/src/init/all.js
---- iceweasel-9.0-orig/modules/libpref/src/init/all.js 2011-12-21 09:07:20.000000000 +0000
-+++ iceweasel-9.0/modules/libpref/src/init/all.js 2011-12-21 10:09:17.136062754 +0000
-@@ -47,7 +47,7 @@
- // SYNTAX HINTS: dashes are delimiters. Use underscores instead.
- // The first character after a period must be alphabetic.
-
--pref("keyword.URL", "http://www.google.com/search?ie=UTF-8&oe=utf-8&q=");
-+pref("keyword.URL", "http://duckduckgo.com/?q=");
- pref("keyword.enabled", false);
- pref("general.useragent.locale", "chrome://global/locale/intl.properties");
- pref("general.useragent.compatMode.firefox", false);
-diff -urN iceweasel-9.0-orig/toolkit/locales/en-US/chrome/global-region/region.properties iceweasel-9.0/toolkit/locales/en-US/chrome/global-region/region.properties
---- iceweasel-9.0-orig/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-16 20:29:43.000000000 +0000
-+++ iceweasel-9.0/toolkit/locales/en-US/chrome/global-region/region.properties 2011-12-21 12:51:31.188066096 +0000
-@@ -4,10 +4,10 @@
- pluginStartupMessage=Starting Plugin for type
-
- # plug-ins URLs
--more_plugins_label=mozilla.org
--more_plugins_url=https://pfs.mozilla.org/plugins/
--pluginupdates_label=mozilla.com/plugincheck
--pluginupdates_url=http://www.mozilla.com/plugincheck/
--plugindoc_label=plugindoc.mozdev.org
--plugindoc_url=http://plugindoc.mozdev.org/
-+more_plugins_label=gnuzilla.gnu.org
-+more_plugins_url=http://www.gnu.org/s/gnuzilla/addons.html
-+pluginupdates_label=gnuzilla.gnu.org
-+pluginupdates_url=http://www.gnu.org/s/gnuzilla/addons.html
-+plugindoc_label=gnuzilla.gnu.org
-+plugindoc_url=http://www.gnu.org/s/gnuzilla/addons.html
-
diff --git a/~lukeshu/iceweasel-libre-current/logless-search.xml b/~lukeshu/iceweasel-libre-current/logless-search.xml
deleted file mode 100644
index 1538d1ef0..000000000
--- a/~lukeshu/iceweasel-libre-current/logless-search.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Logless Search</os:ShortName>
-<os:Description>Use logless.com to search the Internet in privacy, with no search logs.</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAAAAEAGABoAwAAFgAAACgAAAAQAAAAIAAAAAEAGAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABKo4NSnYdKl4FmtZ52uKdKb2cjQDwQKzoSMS1Ka2lzqJRlt51VmI5MgnVHk4BpoJRPoohMiXZUo4xctJteoZAmT00jPUEYLzoRSToxVVdhhYJ/saCXgnS1cWKykH+KoptfjoBDempaoo5dtZdViXw9TFsuOkghMjoYVVIvTlded36Vm5Lol4X5lIPQlImft62IhnpTfXGMtqxquaJSkYU5Qlk6OFE+SFwzV3dLVW1teoNvo5SPppSNoJR4mJZ7uqhyj3xbg3iGuK1btZxQm4pHSmFHOV48RWhFOWpbRXFgd4BSq5JHqJJQrplprp95uqdVj3xTi3xZsptauphfqZRLRWA/LFozMVhGGEhYOmdUgIJIqo5EqJBPr5ZbspxuuqU7fWNakXpjqY9kvJxhuZ5RYGUvMEgvFSchID9ZM1JMbG1HrpZGpo1QnYZaoJJXpZI0dFqKk3m+mISen4ieln2BPTJuGxeIGhNrFRKHEQ2VLiOCa1xsnIhaf39tlJN6rKVFc1+bmH/vloDshW7oZE+wLR+7MBvHMButJRK9MibhUzzkVj7eXUTBa2yOkYuMuaMtQDS1iHP0gWrpel3dZUnIZEnbWT3aPyXkX0T/k3v0WkD6alH3clv4c1bweGDloIdlSD/ZeWXWdl/sdlvvc1jpe2Pvc1fqUzrudl38hG33aE38dVv8j3f5lXz/inLro42JZluAY13YcGDxgGb1hWj3f2f+iWv0cFT8sZH8kXj7fGP6fGH2e2D/mH/oqY7Vr5pIV1WiY1fYeWbMgHPklXnuj3T9jGr9mXj8nH/7jnT7lHv8knb6kHD/j3S/uZujw7NeXGSWXFSNbGbDi4e6p5HZnYb6kXP6nYP7l4D4qI/irpjaq5D/o4r3o4jZtJu0u7FRRlNpTFyEXWaygnmsrKGprp7SqpXno5X1rJf1wazLuqTQr5rqrKDXuKXbtaDGt6w7ITVQLUaEdHqwu7KpvLOArJ+VpZ+3oqCoqp/App7YnpDimIy2qJ20r6S1r6WhuasAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA</os:Image>
-<os:Url type="text/html" method="GET" template="http://www.logless.com/?q={searchTerms}">
-</os:Url>
-</SearchPlugin>
diff --git a/~lukeshu/iceweasel-libre-current/mozconfig b/~lukeshu/iceweasel-libre-current/mozconfig
deleted file mode 100644
index 8344f6967..000000000
--- a/~lukeshu/iceweasel-libre-current/mozconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-#ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-pthreads
-ac_add_options --enable-optimize
-ac_add_options --enable-default-toolkit=cairo-gtk2
-ac_add_options --enable-strip
-ac_add_options --enable-pango
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-svg
-ac_add_options --enable-canvas
-ac_add_options --enable-libxul
-ac_add_options --disable-crashreporter
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-tests
-ac_add_options --disable-debug
-ac_add_options --disable-xprint
-ac_add_options --disable-installer
-ac_add_options --disable-libnotify
-ac_add_options --disable-pedantic
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-mochitest
-ac_add_options --disable-updater
-ac_add_options --with-default-mozilla-five-home=/usr/lib/iceweasel
-
-ac_add_options --with-branding=debian/branding
-ac_add_options --build=i586-pc-linux-gnu
-ac_add_options --host=i586-pc-linux-gnu
-
-export BUILD_OFFICIAL=1
-export MOZILLA_OFFICIAL=1
-export USE_SHORT_LIBNAME=1
-mk_add_options BUILD_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
-mk_add_options USE_SHORT_LIBNAME=1
diff --git a/~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch b/~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch
deleted file mode 100644
index f0f7325a5..000000000
--- a/~lukeshu/iceweasel-libre-current/mozilla-firefox-1.0-lang.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- mozilla/browser/app/profile/firefox.js.lang 2005-01-13 15:32:03.509282726 +0100
-+++ mozilla/browser/app/profile/firefox.js 2005-01-13 15:33:40.220914789 +0100
-@@ -253,6 +253,9 @@
- pref("font.language.group", "chrome://global/locale/intl.properties");
- pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
-
-+// Use LANG environment variable to choose locale
-+pref("intl.locale.matchOS", true);
-+
- // 0=lines, 1=pages, 2=history , 3=text size
- pref("mousewheel.withcontrolkey.action",3);
- pref("mousewheel.withshiftkey.action",2);
diff --git a/~lukeshu/iceweasel-libre-current/region.properties b/~lukeshu/iceweasel-libre-current/region.properties
deleted file mode 100644
index 2e980987e..000000000
--- a/~lukeshu/iceweasel-libre-current/region.properties
+++ /dev/null
@@ -1,23 +0,0 @@
-# Default search engine
-browser.search.defaultenginename=Duck Duck Go (SSL)
-
-# Search engine order (order displayed in the search bar dropdown)s
-browser.search.order.1=Duck Duck Go (SSL)
-browser.search.order.2=Duck Duck Go (Lite)
-
-
-# Keyword URL (for location bar searches)
-keyword.URL=https://duckduckgo.com/?q=
-
-# URL for site-specific search engines
-# TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
-# to be searched and the user's search query. Place them in the appropriate location
-# for your locale's URL but do not translate them.
-browser.search.siteSearchURL=https://duckduckgo.com/?q=site%3A{moz:domain}+{searchTerms}
-
-# increment this number when anything gets changed in the list below. This will
-# cause Firefox to re-read these prefs and inject any new handlers into the
-# profile database. Note that "new" is defined as "has a different URL"; this
-# means that it's not possible to update the name of existing handler, so
-# don't make any spelling errors here.
-#gecko.handlerService.defaultHandlersVersion=3
diff --git a/~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml b/~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml
deleted file mode 100644
index f817dce40..000000000
--- a/~lukeshu/iceweasel-libre-current/scroogle-ssl-english.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>Scroogle SSL English</os:ShortName>
-<os:Description>Scroogle SSL English</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon;base64,AAABAAEAEBAQAAAAAAAoAQAAFgAAACgAAAAQAAAAIAAAAAEABAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAwMDAAICAgAAAAP8AAP8AAAD//wD/AAAA/wD/AP//AAD///8AAACZmZmZAAAAmZmZmZmZAAmZqqqqqpmQCZmQAAAAqZCZqQAAAAAKmZmgAAAAAAqZmaAACaoACpmZoACZAAAKmZmgAKkAAAqZmaAACpmaqpmZoAAAAAAKmZmqAAAAAAqZCZqgAAAJmZAJmaqqqqqZkACZmZmZmZkAAACZmZmZAADwDzgFwAPgA4ABAHyAAQAAAAAAAAAAAAAAAAAAAAAAAAAA4AMAAOADAAAAfAAAAHyAAeADgAHgA8ADAADwDwAA</os:Image>
-<UpdateInterval>7</UpdateInterval>
-<UpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.xml</UpdateUrl>
-<IconUpdateUrl>http://mycroft.mozdev.org/updateos.php/id0/scroogle_ssl_en_post.ico</IconUpdateUrl>
-<SearchForm>https://ssl.scroogle.org/scrapen8.html</SearchForm>
-<os:Url type="text/html" method="GET" template="https://ssl.scroogle.org/cgi-bin/nbbwssl.cgi">
- <os:Param name="Gw" value="{searchTerms}"/>
- <os:Param name="l" value="en"/>
-</os:Url>
-</SearchPlugin> \ No newline at end of file
diff --git a/~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch b/~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch
deleted file mode 100644
index e3b8e9376..000000000
--- a/~lukeshu/iceweasel-libre-current/xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- iceweasel-9.0.1/browser/app/Makefile.in~ 2011-12-25 16:19:29.000000000 -0500
-+++ iceweasel-9.0.1/browser/app/Makefile.in 2011-12-25 16:19:55.000000000 -0500
-@@ -257,7 +257,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
-- cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+ cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/iceweasel$(BIN_SUFFIX)
- endif
- endif
-
diff --git a/~lukeshu/iceweasel-libre-current/yacy.xml b/~lukeshu/iceweasel-libre-current/yacy.xml
deleted file mode 100644
index 61201ad20..000000000
--- a/~lukeshu/iceweasel-libre-current/yacy.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<SearchPlugin xmlns="http://www.mozilla.org/2006/browser/search/" xmlns:os="http://a9.com/-/spec/opensearch/1.1/">
-<os:ShortName>YaCy</os:ShortName>
-<os:Description>YaCy is an open-source GPL-licensed software that can be used for stand-alone search engine installations or as a client for a multi-user P2P-based web indexing cluster. This is the access to peer 'kupferhammer-keller'.</os:Description>
-<os:InputEncoding>UTF-8</os:InputEncoding>
-<os:Image width="16" height="16">data:image/x-icon,%00%00%01%00%01%00%10%10%00%00%01%00%18%00h%2B%00%00%16%00%00%00(%00%00%00%10%00%00%00%20%00%00%00%01%00%18%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%CE%BD%7B%DE%CE%9C%8CkRkJ1kJ1kJ1kJ1kJ1sR9%C6%B5%9C%E7%DE%BD%E7%DE%BD%E7%DE%C6%E7%DE%C6%EF%EF%CE%DE%DE%AD%DE%CE%9C%BD%ADs%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%A5%8CJ%8CkB%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%DE%CE%A5%EF%EF%CE%DE%CE%9C%BD%ADkkJ)%D6%C6%8C%F7%F7%E7%F7%F7%E7%F7%F7%E7%F7%F7%E7%CE%BD%84%8Ck9%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%DE%CE%9C%EF%EF%CE%DE%CE%9C%C6%B5kkJ)%BD%ADk%EF%EF%CE%EF%EF%CE%EF%EF%CE%F7%F7%E7%DE%CE%A5%7BZ)%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%CE%C6%8C%E7%DE%C6%DE%CE%9C%C6%B5ksR9%A5%8CJ%DE%DE%AD%E7%DE%BD%EF%EF%CE%F7%F7%E7%E7%DE%C6%7BZ)%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%84%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%94%7BB%94%7BB%EF%EF%CE%F7%F7%E7%F7%F7%E7%F7%F7%E7%EF%EF%CE%8Ck9%A5%8CZ%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%84%E7%DE%BD%CE%C6%8C%C6%ADk%A5%8CZ%7BZ)%E7%DE%BD%F7%F7%E7%EF%EF%CE%EF%EF%DE%EF%EF%DE%A5%8CZ%8CkB%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%E7%DE%BD%CE%BD%84%B8%A7d%BD%ADZkJ)%DE%DE%AD%F7%F7%E7%DE%DE%AD%EF%EF%CE%EF%EF%DE%BD%ADkkJ)%CE%BD%7B%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%D6%B5%CE%BD%7B%BD%ADZ%BD%ACikJ)%DE%CE%9C%F7%F7%E7%E7%DE%BD%EF%EF%CE%F7%F7%E7%CE%BD%7BZ1%18%BD%ADk%CE%BD%7B%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%7BZ)%C6%AD%7B%F7%F7%E7%E7%DE%BD%E7%DE%BD%F7%F7%E7%DE%CE%9CkJ)sR9%A5%8CZ%CE%BD%7B%CE%BD%7B%DE%DE%AD%CE%BD%7B%BD%ADZ%BD%ADZ%8Ck9%AD%9CZ%F7%F7%E7%EF%EF%CE%DE%CE%9C%F7%F7%E7%E7%DE%BD%BD%ADZ%9C%8CJZ1%18%A5%8CZ%CE%BD%7B%DE%DE%AD%C6%B5k%B5%A5J%BD%ADZ%94%7B9%9C%8CJ%F7%F7%E7%EF%EF%DE%CE%BD%84%F7%F7%E7%F7%EF%E7%EF%EF%CE%DE%CE%9C%9C%8CJkJ)%BD%ADk%DE%CE%A5%BD%ADk%AD%9CJ%B5%A5J%9C%8CJ%8Ck9%DE%CE%9C%DE%D6%9C%C6%B5Z%DE%CE%9C%F7%EF%DE%FF%FF%FF%EF%EF%DE%BD%ADZZ1!%BD%ADk%DE%CE%A5%BD%ADZ%AD%9CJ%AD%9CJ%AD%9CJsJ)kR)kR)kJ)%9C%8CJ%DE%CE%9C%F7%EF%DE%DE%DE%AD%94%7B9c9!%BD%ADk%DE%CE%A5%B5%9CR%AD%9CJ%AD%9CJ%AD%9CJ%AD%9CJ%B5%9CJ%B5%9CR%94%7BBc9%18%8Ck9%A5%8CJ%8Cs9Z1!%9C%8CR%CE%BD%84%DE%CE%9C%94%849%B5%9CR%BD%ADZ%BD%ADk%C6%B5k%CE%BD%7B%CE%BD%7B%CE%BD%7B%BD%ADskJ1R)%18kJ1%C6%AD%84%DE%CE%9C%DE%CE%9C%CE%BD%7B%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00%00</os:Image>
-<os:Url type="text/html" method="GET" template="http://yacy.dyndns.org:8000/yacysearch.html?query={searchTerms}">
-</os:Url><os:Url type="application/rss+xml" method="GET" template="http://yacy.dyndns.org:8000/yacysearch.rss?query={searchTerms}&amp;maximumRecords=10&amp;verify=false">
-</os:Url>
-</SearchPlugin>
diff --git a/~lukeshu/openni-unstable/openni.install b/~lukeshu/openni-unstable/openni.install
deleted file mode 100644
index 8470f4512..000000000
--- a/~lukeshu/openni-unstable/openni.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
- MODULES="libnimMockNodes.so libnimCodecs.so libnimRecorder.so"
- for module in $MODULES
- do
- /usr/bin/niReg /usr/lib/$module
- done
-}
-
-pre_remove() {
- rm /var/lib/ni/modules.xml
-}