Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Restore more modules to moonbase, fixes Chromium build #12

Closed
wants to merge 7 commits into from

2 participants

@zmcgrew
Collaborator

No description provided.

@sofar
Owner

this contains a HUUUGE merge change, which is way too much. The 6 separate commits are fine, but you need to rebase before sending a pull request. As is, the merge commit is too big to accept.

@sofar sofar closed this
@zmcgrew
Collaborator

I'm not a git expert, and don't understand what I should do. Googling git rebase isn't proving terribly helpful.

@sofar
Owner

yeah, we need to document this somehow. do you at least see that in github your request shows a huuuuge merge commit?

zmcgrew@a1d0ede

@sofar
Owner

I did a manual pull/merge and that fixed it up, so, your changes are in at least.

@zmcgrew
Collaborator

Thanks sofar.

I tried to use git rebase, but I seem to just have made it worse if you look at my commit log. =(

At least it's fixed now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jul 12, 2012
  1. chromium: fix build problem with linker

    Zachary McGrew authored
  2. emacs-bzr: Add back to moonbase

    Zachary McGrew authored
  3. bzrtools: add back to moonbase, version bump to 2.5

    Zachary McGrew authored
  4. nethack: add back to moonbase

    Zachary McGrew authored
  5. libflashsupport-git: add back to moonbase

    Zachary McGrew authored
  6. paprefs/pavucontrol: add back to moonbase

    Zachary McGrew authored
  7. Merge remote-tracking branch 'upstream/master'

    Zachary McGrew authored
This page is out of date. Refresh to see the latest.
View
8 audio/paprefs/DEPENDS
@@ -0,0 +1,8 @@
+depends libglademm
+depends pulseaudio
+depends gconfmm
+
+optional_depends "lynx" \
+ "--enable-lynx" \
+ "--disable-lynx" \
+ "for documenation generation"
View
19 audio/paprefs/DETAILS
@@ -0,0 +1,19 @@
+ MODULE=paprefs
+ VERSION=0.9.10
+ SOURCE=$MODULE-$VERSION.tar.gz
+ SOURCE_URL=http://0pointer.de/lennart/projects/paprefs/
+ SOURCE_VFY=sha1:5ee6d2e1383048d43f9af239d2930d8edb7e8b72
+ WEB_SITE=http://0pointer.de/lennart/projects/paprefs/
+ ENTERED=20071207
+ UPDATED=20111005
+ SHORT="Configuration dialog for the PulseAudio sound server"
+ MAINTAINER=jannis@lunar-linux.org
+
+cat << EOF
+PulseAudio Preferences (paprefs) is a simple GTK based configuration
+dialog for the PulseAudio sound server.
+
+Please note that this program can only configure local servers, and
+requires that a special module module-gconf is loaded in the sound
+server. (Since PulseAudio 0.9.5 this modules is loaded by default.)
+EOF
View
6 devel/bzrtools/BUILD
@@ -0,0 +1,6 @@
+(
+
+ prepare_install &&
+ ./setup.py install
+
+) > $C_FIFO 2>&1
View
1  devel/bzrtools/DEPENDS
@@ -0,0 +1 @@
+depends bzr
View
16 devel/bzrtools/DETAILS
@@ -0,0 +1,16 @@
+ MODULE=bzrtools
+ VERSION=2.5
+ SOURCE=$MODULE-$VERSION.tar.gz
+ SOURCE_URL=https://launchpad.net/bzrtools/stable/$VERSION/+download
+ SOURCE_VFY=sha1:3adcfc3419989611fb839c5e49f6f4fa725508e1
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE
+ WEB_SITE=http://bazaar-vcs.org/BzrTools
+ ENTERED=20051018
+ UPDATED=20120711
+ MAINTAINER=tchan@lunar-linux.org
+ SHORT="A collection of plugins for bzr"
+
+cat << EOF
+Adds several useful plugins to bzr, namely:
+ push, annotate, baz2bzr, shelve, unshelve, clean-tree, graph-ancestry
+EOF
View
60 games/nethack/BUILD
@@ -0,0 +1,60 @@
+(
+
+ cp include/config.h include/config.h.orig
+ cat include/config.h.orig \
+ | sed -e 's:/\* #define X11_GRAPHICS \*/:#define X11_GRAPHICS:' \
+ -e 's:/\* #define USE_XPM \*/:#define USE_XPM:' \
+ -e 's:^#define COMPRESS .*$:#define COMPRESS "/bin/gzip":' \
+ -e 's:^#define COMPRESS_EXTENSION.*$:#define COMPRESS_EXTENSION ".gz":' \
+ -e 's:/\* #define DLB \*/:#define DLB:' \
+ -e 's:/\* #define AUTOPICKUP_EXTENSIONS \*/:#define AUTOPICKUP_EXTENSIONS:' \
+ > include/config.h
+ # cp include/config.h* /tmp
+
+ cp include/unixconf.h include/unixconf.h.orig
+ cat include/unixconf.h.orig \
+ | sed -e 's:/\* #define LINUX \*/:#define LINUX:' \
+ -e 's:/\* #define TIMED_DELAY \*/:#define TIMED_DELAY:' \
+ > include/unixconf.h
+ # cp include/unixconf.h* /tmp
+
+ cp sys/unix/Makefile.src sys/unix/Makefile.src.orig
+ cat sys/unix/Makefile.src.orig \
+ | sed -e 's:^# CC = gcc *$:CC = gcc:' \
+ -e 's:^# LFLAGS = -L/usr/X11R6/lib:LFLAGS = -L/usr/X11R6/lib:' \
+ -e 's:^WINSRC = $(WINTTYSRC):WINSRC = $(WINTTYSRC) $(WINX11SRC):' \
+ -e 's:^WINOBJ = $(WINTTYOBJ):WINOBJ = $(WINTTYOBJ) $(WINX11OBJ):' \
+ -e 's:^WINTTYLIB = -ltermlib:WINTTYLIB = -lncurses:' \
+ -e 's:^WINX11LIB = -lXaw -lXmu -lXext -lXt -lX11:WINX11LIB = -lXaw -lXmu -lXext -lXt -lXpm -lX11:' \
+ -e 's:^WINLIB = $(WINTTYLIB):WINLIB = $(WINTTYLIB) $(WINX11LIB):' \
+ > sys/unix/Makefile.src
+ # cp sys/unix/Makefile.src* /tmp
+
+ cp sys/unix/Makefile.utl sys/unix/Makefile.utl.orig
+ cat sys/unix/Makefile.utl.orig \
+ | sed -e 's:^# CC = gcc *$:CC = gcc:' \
+ -e 's:^# LFLAGS = -L/usr/X11R6/lib:LFLAGS = -L/usr/X11R6/lib:' \
+ -e 's:^YACC *= yacc:YACC = bison -y:' \
+ -e 's:^LEX *= lex:LEX = flex:' \
+ > sys/unix/Makefile.utl
+ # cp sys/unix/Makefile.utl* /tmp
+
+ cp sys/unix/Makefile.top sys/unix/Makefile.top.orig
+ cat sys/unix/Makefile.top.orig \
+ | sed -e 's:^GAMEGRP *= bin:GAMEGRP = games:' \
+ -e 's:^GAMEPERM = 04755:GAMEPERM = 02755:' \
+ -e 's:^FILEPERM = 0644:FILEPERM = 0664:' \
+ -e 's:^DIRPERM = 0755:DIRPERM = 0775:' \
+ -e 's:^VARDATND =.*$:VARDATND = x11tiles NetHack.ad pet_mark.xbm rip.xpm:' \
+ > sys/unix/Makefile.top
+ # cp sys/unix/Makefile.top* /tmp
+
+ sh sys/unix/setup.sh
+ make all
+
+ prepare_install
+ make install
+ chmod 0775 /usr/games/lib/nethackdir
+
+) > $C_FIFO 2>&1
+
View
1  games/nethack/CONFLICTS
@@ -0,0 +1 @@
+conflicts falconseye
View
23 games/nethack/DETAILS
@@ -0,0 +1,23 @@
+ MODULE=nethack
+ VERSION=3.4.3
+ SOURCE=$MODULE-343-src.tgz
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION/
+ SOURCE_URL[0]=$SFORGE_URL/$MODULE/
+ SOURCE_VFY=21479c95990eefe7650df582426457f9
+ WEB_SITE=http://www.nethack.org
+ ENTERED=20070526
+ UPDATED=20070526
+ SHORT="single player dungeon exploration game"
+
+cat << EOF
+NetHack is a single player dungeon exploration game that runs on a
+wide variety of computer systems, with a variety of graphical and text
+interfaces all using the same game engine. Unlike many other Dungeons &
+Dragons-inspired games, the emphasis in NetHack is on discovering the
+detail of the dungeon and not simply killing everything in sight - in
+fact, killing everything in sight is a good way to die quickly. Each game
+presents a different landscape - the random number generator provides
+an essentially unlimited number of variations of the dungeon and its
+denizens to be discovered by the player in one of a number of characters:
+you can pick your race, your role, and your gender.
+EOF
View
3  web/chromium/BUILD
@@ -46,7 +46,8 @@ EOF
OPTS+=" -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 \
-Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_zlib=1 -Dproprietary_codecs=1 -Dwerror= -Ddisable_sse2=1 \
-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome -Duse_system_zlib=1 \
- -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1"
+ -Dfastbuild=1 -Dlinux_strip_binary=1 -Dlinux_use_seccomp_sandbox=1 \
+ -Dlinux_use_gold_binary=0 -Dlinux_use_gold_flags=0"
# set the target arch here
if [ "`arch`" == "x86_64" ]; then
View
13 zbeta/emacs-bzr/BUILD
@@ -0,0 +1,13 @@
+(
+ #combreloc linker options fscks up things here
+ LDFLAGS=`echo ${LDFLAGS} | sed "s/-z combreloc//"`
+
+ # Fix so installwatcher doesn't trigger on _ALL_ info-files
+ sedit '/\-chmod \-R.*$(DESTDIR)${infodir}/ s;$(DESTDIR)${infodir};;' Makefile.in &&
+ default_cvs_config &&
+ default_config &&
+ make bootstrap &&
+ prepare_install &&
+ make install
+
+) > $C_FIFO 2>&1
View
2  zbeta/emacs-bzr/CONFLICTS
@@ -0,0 +1,2 @@
+conflicts emacs
+conflicts emacs-cvs
View
15 zbeta/emacs-bzr/DEPENDS
@@ -0,0 +1,15 @@
+depends texinfo
+
+optional_depends "giflib" "--with-gif" "" "for gif support if you use faces"
+optional_depends "tiff" "--with-tiff" "" "for tiff support if you use faces"
+optional_depends "libpng" "--with-png" "" "for png support if you use faces"
+optional_depends "librsvg" "--with-rsvg" "" "for svg support"
+optional_depends "%X" "--with-x --with-xpm" "" "for xpm support if you use faces"
+optional_depends "gtk+-2" "--with-x-toolkit=gtk" "" "for a GTK2 user interface"
+optional_depends "libXft" "--enable-font-backend --with-xft" "" "for pretty font support"
+optional_depends "%JPEG" "--with-jpeg" "" "for jpeg support if you use faces"
+optional_depends "tiff" "--with-tiff" "" "for tiff support if you use faces"
+optional_depends "libpng" "--with-png" "" "for png support if you use faces"
+optional_depends "librsvg" "--with-rsvg" "" "for svg support"
+optional_depends "gtk+-2" "--with-x-toolkit=gtk" "" "for a GTK2 user interface"
+optional_depends "libXft" "--enable-font-backend --with-xft" "" "for pretty font support"
View
15 zbeta/emacs-bzr/DETAILS
@@ -0,0 +1,15 @@
+ MODULE=emacs-bzr
+ VERSION=bzr
+ SOURCE=$MODULE.tar.bz2
+ SOURCE_URL=bzr://bzr.savannah.gnu.org/emacs/trunk
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${MODULE}
+ WEB_SITE=http://www.gnu.org/software/emacs
+ ENTERED=20111013
+ UPDATED=`date -u +%Y%m01`
+ SHORT="full-featured programmer's editor and more."
+
+cat << EOF
+Emacs is the extensible, customizable, self-documenting real-time
+display editor.
+EOF
+
View
8 zbeta/libflashsupport-git/BUILD
@@ -0,0 +1,8 @@
+(
+
+ sedit "s:#define V4L1://#define V4L1:g" flashsupport.c &&
+ ./bootstrap.sh &&
+
+ default_build
+
+) > $C_FIFO 2>&1
View
1  zbeta/libflashsupport-git/DEPENDS
@@ -0,0 +1 @@
+depends pulseaudio
View
10 zbeta/libflashsupport-git/DETAILS
@@ -0,0 +1,10 @@
+ MODULE=libflashsupport-git
+ VERSION=beta
+ SOURCE=$MODULE-$VERSION.tar.bz2
+ SOURCE_URL=git+http://git.0pointer.de/repos/libflashsupport.git
+ WEB_SITE=http://www.pulseaudio.org
+ ENTERED=20080629
+ UPDATED=20080629
+ SHORT=""
+cat << EOF
+EOF
Something went wrong with that request. Please try again.