Compare commits
29 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2339b43b29 | ||
|
|
f1855b2a67 | ||
|
|
9046b962f4 | ||
|
|
7250555dd6 | ||
|
|
779f759206 | ||
|
|
f9c973f428 | ||
|
|
4298c91a0e | ||
|
|
f4802e4ca0 | ||
|
|
c914614ffb | ||
|
|
346ca394b3 | ||
|
|
63d42a384e | ||
|
|
68c8c2a60b | ||
|
|
fd604fcd06 | ||
|
|
8b9f0c8b4f | ||
| b3d05d02b2 | |||
|
|
37babaeb49 | ||
|
|
c0fb6af47b | ||
|
|
fdf9372d5b | ||
|
|
f92a46f088 | ||
|
|
9c621b7971 | ||
|
|
2553ff01e6 | ||
|
|
518027f06f | ||
|
|
86ce76574c | ||
|
|
c8a84c5eea | ||
|
|
f8369e4a29 | ||
|
|
fe9da8b90f | ||
|
|
9744c058aa | ||
|
|
06a54b2ef8 | ||
|
|
580ffa776f |
15 changed files with 1 additions and 8920 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -1 +0,0 @@
|
|||
yadex-1.7.0.tar.gz
|
||||
2825
Yadex_170_ALL.diff
2825
Yadex_170_ALL.diff
File diff suppressed because it is too large
Load diff
1223
Yadex_170_Hexen.diff
1223
Yadex_170_Hexen.diff
File diff suppressed because it is too large
Load diff
1
dead.package
Normal file
1
dead.package
Normal file
|
|
@ -0,0 +1 @@
|
|||
Dead upstream, FTBFS. Use to it's successor, Eureka
|
||||
1
sources
1
sources
|
|
@ -1 +0,0 @@
|
|||
d341abe066525394082edfd520af86ae yadex-1.7.0.tar.gz
|
||||
|
|
@ -1,161 +0,0 @@
|
|||
diff -Naur yadex-1.7.0/GNUmakefile yadex-1.7.0.new/GNUmakefile
|
||||
--- yadex-1.7.0/GNUmakefile 2006-03-16 20:33:36.000000000 -0800
|
||||
+++ yadex-1.7.0.new/GNUmakefile 2006-03-16 18:37:50.000000000 -0800
|
||||
@@ -53,6 +53,7 @@
|
||||
|
||||
# Which OS ?
|
||||
OS := $(shell uname -s | tr A-Z a-z)
|
||||
+ARCH := $(shell uname -i | tr A-Z a-z)
|
||||
|
||||
# Where your X11 libraries and headers reside.
|
||||
# Current rule:
|
||||
@@ -67,7 +68,11 @@
|
||||
X11LIBDIR = /usr/openwin/lib
|
||||
X11INCLUDEDIR = /usr/openwin/include
|
||||
else
|
||||
- X11LIBDIR = /usr/X11R6/lib
|
||||
+ ifeq ($(findstring $(ARCH), x86_64), $(ARCH))
|
||||
+ X11LIBDIR = /usr/X11R6/lib64
|
||||
+ else
|
||||
+ X11LIBDIR = /usr/X11R6/lib
|
||||
+ endif
|
||||
X11INCLUDEDIR = /usr/X11R6/include
|
||||
endif
|
||||
endif
|
||||
diff -Naur yadex-1.7.0/src/levels.cc yadex-1.7.0.new/src/levels.cc
|
||||
--- yadex-1.7.0/src/levels.cc 2003-03-28 04:37:32.000000000 -0800
|
||||
+++ yadex-1.7.0.new/src/levels.cc 2006-03-16 20:38:01.000000000 -0800
|
||||
@@ -1387,7 +1387,7 @@
|
||||
}
|
||||
NumWTexture = (int) val + 1;
|
||||
/* read in the offsets for texture1 names */
|
||||
- offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) NumWTexture * (sizeof(i32)));
|
||||
wf->read_i32 (offsets + 1, NumWTexture - 1);
|
||||
if (wf->error ())
|
||||
{
|
||||
@@ -1445,7 +1445,7 @@
|
||||
}
|
||||
NumWTexture = (int) val + 1;
|
||||
/* read in the offsets for texture1 names */
|
||||
- offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) NumWTexture * sizeof(i32));
|
||||
wf->read_i32 (offsets + 1, NumWTexture - 1);
|
||||
{
|
||||
// FIXME
|
||||
@@ -1489,7 +1489,7 @@
|
||||
// FIXME
|
||||
}
|
||||
/* read in the offsets for texture2 names */
|
||||
- offsets = (i32 *) GetMemory ((long) val * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) val * sizeof(i32));
|
||||
wf->read_i32 (offsets, val);
|
||||
if (wf->error ())
|
||||
{
|
||||
diff -Naur yadex-1.7.0/src/pic2img.cc yadex-1.7.0.new/src/pic2img.cc
|
||||
--- yadex-1.7.0/src/pic2img.cc 2003-03-28 04:37:32.000000000 -0800
|
||||
+++ yadex-1.7.0.new/src/pic2img.cc 2006-03-16 20:30:40.000000000 -0800
|
||||
@@ -192,7 +192,7 @@
|
||||
|
||||
ColumnData = (u8 *) GetMemory (TEX_COLUMNBUFFERSIZE);
|
||||
/* FIXME DOS and pic_width_ > 16000 */
|
||||
-NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * 4);
|
||||
+NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * (sizeof(i32)));
|
||||
|
||||
if (long_offsets)
|
||||
dir->wadfile->read_i32 (NeededOffsets, pic_width_);
|
||||
diff -Naur yadex-1.7.0/src/r_images.cc yadex-1.7.0.new/src/r_images.cc
|
||||
--- yadex-1.7.0/src/r_images.cc 2006-03-16 20:33:12.000000000 -0800
|
||||
+++ yadex-1.7.0.new/src/r_images.cc 2006-03-16 20:39:17.000000000 -0800
|
||||
@@ -182,7 +182,7 @@
|
||||
dir->wadfile->seek (dir->dir.start);
|
||||
dir->wadfile->read_i32 (&numtex);
|
||||
/* read in the offsets for texture1 names and info. */
|
||||
- offsets = (i32 *) GetMemory ((long) numtex * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
|
||||
dir->wadfile->read_i32 (offsets, numtex);
|
||||
for (n = 0; n < numtex && !texofs; n++)
|
||||
{
|
||||
@@ -205,7 +205,7 @@
|
||||
dir->wadfile->seek (dir->dir.start);
|
||||
dir->wadfile->read_i32 (&numtex);
|
||||
/* read in the offsets for texture1 names and info. */
|
||||
- offsets = (i32 *) GetMemory ((long) numtex * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
|
||||
dir->wadfile->read_i32 (offsets, numtex);
|
||||
for (n = 0; n < numtex && !texofs; n++)
|
||||
{
|
||||
@@ -225,7 +225,7 @@
|
||||
dir->wadfile->seek (dir->dir.start);
|
||||
dir->wadfile->read_i32 (&numtex);
|
||||
/* read in the offsets for texture2 names */
|
||||
- offsets = (i32 *) GetMemory ((long) numtex * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
|
||||
dir->wadfile->read_i32 (offsets, numtex);
|
||||
for (n = 0; n < numtex && !texofs; n++)
|
||||
{
|
||||
diff -Naur yadex-1.7.0/src/textures.cc yadex-1.7.0.new/src/textures.cc
|
||||
--- yadex-1.7.0/src/textures.cc 2003-04-24 13:50:36.000000000 -0700
|
||||
+++ yadex-1.7.0.new/src/textures.cc 2006-03-16 20:38:44.000000000 -0800
|
||||
@@ -177,7 +177,7 @@
|
||||
goto textures_done;
|
||||
}
|
||||
// Read in the offsets for texture1 names and info
|
||||
- offsets = (i32 *) GetMemory ((long) numtex * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
|
||||
wf->read_i32 (offsets, numtex);
|
||||
if (wf->error ())
|
||||
{
|
||||
@@ -233,7 +233,7 @@
|
||||
goto texture1_done;
|
||||
}
|
||||
// Read in the offsets for texture1 names and info
|
||||
- offsets = (i32 *) GetMemory ((long) numtex * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
|
||||
wf->read_i32 (offsets, numtex);
|
||||
if (wf->error ())
|
||||
{
|
||||
@@ -286,7 +286,7 @@
|
||||
goto texture2_done;
|
||||
}
|
||||
// Read in the offsets for TEXTURE2 names
|
||||
- offsets = (i32 *) GetMemory ((long) numtex * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
|
||||
wf->read_i32 (offsets, numtex);
|
||||
if (wf->error ())
|
||||
{
|
||||
@@ -514,7 +514,7 @@
|
||||
dir->wadfile->seek (dir->dir.start);
|
||||
dir->wadfile->read_i32 (&numtex);
|
||||
// Read in the offsets for texture1 names and info
|
||||
- offsets = (i32 *) GetMemory ((long) numtex * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
|
||||
dir->wadfile->read_i32 (offsets, numtex);
|
||||
for (n = 0; n < numtex && !texofs; n++)
|
||||
{
|
||||
@@ -534,7 +534,7 @@
|
||||
dir->wadfile->seek (dir->dir.start);
|
||||
dir->wadfile->read_i32 (&numtex);
|
||||
// Read in the offsets for texture2 names
|
||||
- offsets = (i32 *) GetMemory ((long) numtex * 4);
|
||||
+ offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
|
||||
dir->wadfile->read_i32 (offsets);
|
||||
for (n = 0; n < numtex && !texofs; n++)
|
||||
{
|
||||
diff -Naur yadex-1.7.0/src/yadex.h yadex-1.7.0.new/src/yadex.h
|
||||
--- yadex-1.7.0/src/yadex.h 2006-03-16 20:33:12.000000000 -0800
|
||||
+++ yadex-1.7.0.new/src/yadex.h 2006-03-16 20:29:15.000000000 -0800
|
||||
@@ -98,11 +98,11 @@
|
||||
#define F_I16_D "hd"
|
||||
#define F_I16_H "hX"
|
||||
|
||||
-typedef unsigned long u32;
|
||||
+typedef unsigned int u32;
|
||||
#define F_U32_D "lu"
|
||||
#define F_U32_H "lX"
|
||||
|
||||
-typedef signed long i32;
|
||||
+typedef signed int i32;
|
||||
#define F_I32_D "ld"
|
||||
#define F_I32_H "lX"
|
||||
|
||||
|
|
@ -1,55 +0,0 @@
|
|||
diff -Naur yadex-1.7.0/configure yadex-1.7.0.new/configure
|
||||
--- yadex-1.7.0/configure 2006-03-16 18:49:20.000000000 -0800
|
||||
+++ yadex-1.7.0.new/configure 2006-03-16 16:36:21.000000000 -0800
|
||||
@@ -408,16 +408,16 @@
|
||||
ETCDIR=/etc/$APPNAME/%v
|
||||
ETCDIRNV=/etc/$APPNAME
|
||||
MANDIR=/usr/share/man
|
||||
- SHAREDIR=/usr/share/games/$APPNAME/%v
|
||||
- SHAREDIRNV=/usr/share/games/$APPNAME
|
||||
+ SHAREDIR=/usr/share/$APPNAME/%v
|
||||
+ SHAREDIRNV=/usr/share/$APPNAME
|
||||
elif expr "$PREFIX" : '//*usr//*local/*$' >/dev/null
|
||||
then
|
||||
BINDIR=/usr/local/bin # FHS-ly correct is /usr/local/games
|
||||
ETCDIR=/etc/$APPNAME/%v
|
||||
ETCDIRNV=/etc/$APPNAME
|
||||
MANDIR=/usr/local/man
|
||||
- SHAREDIR=/usr/local/share/games/$APPNAME/%v
|
||||
- SHAREDIRNV=/usr/local/share/games/$APPNAME
|
||||
+ SHAREDIR=/usr/local/share/$APPNAME/%v
|
||||
+ SHAREDIRNV=/usr/local/share/$APPNAME
|
||||
elif expr "$PREFIX" : '//*opt/*$' >/dev/null
|
||||
then
|
||||
echo '/opt ? Surely you mean /opt/something, Mr. Feynman !' 1>&2
|
||||
diff -Naur yadex-1.7.0/yadex.cfg yadex-1.7.0.new/yadex.cfg
|
||||
--- yadex-1.7.0/yadex.cfg 2006-03-16 18:49:20.000000000 -0800
|
||||
+++ yadex-1.7.0.new/yadex.cfg 2006-03-16 18:49:43.000000000 -0800
|
||||
@@ -20,16 +20,17 @@
|
||||
# 9 doompr Doom press release pre-beta (/pub/idgames/historic/doomprbt.zip)
|
||||
# 10 strife10 Strife 1.0 (demo or commercial)
|
||||
|
||||
- iwad1 = /usr/local/share/games/doom/doom.wad
|
||||
- iwad2 = /usr/local/share/games/doom2/doom2.wad
|
||||
- iwad3 = /usr/local/share/games/heretic/heretic.wad
|
||||
- iwad4 = /usr/local/share/games/hexen/hexen.wad
|
||||
- iwad5 = /usr/local/share/games/strife/strife1.wad
|
||||
- iwad6 = /usr/local/share/games/doom02/doom.wad
|
||||
- iwad7 = /usr/local/share/games/doom04/doom.wad
|
||||
- iwad8 = /usr/local/share/games/doom05/doom.wad
|
||||
- iwad9 = /usr/local/share/games/doompr/doompres.wad
|
||||
- iwad10 = /usr/local/share/games/strife10/strife1.wad
|
||||
+ iwad1 = /usr/share/doom/doom.wad
|
||||
+# iwad2 = /usr/share/doom/doom2.wad
|
||||
+ iwad2 = /usr/share/doom/freedoom.wad
|
||||
+ iwad3 = /usr/share/doom/heretic.wad
|
||||
+ iwad4 = /usr/share/doom/hexen.wad
|
||||
+ iwad5 = /usr/share/doom/strife1.wad
|
||||
+ iwad6 = /usr/share/doom/doom.wad
|
||||
+ iwad7 = /usr/share/doom/doom.wad
|
||||
+ iwad8 = /usr/share/doom/doom.wad
|
||||
+ iwad9 = /usr/share/doom/doompres.wad
|
||||
+ iwad10 = /usr/share/doom/strife1.wad
|
||||
|
||||
# Name of the patch wads you want to load. None by default.
|
||||
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
diff -Naur yadex-1.7.0/GNUmakefile yadex-1.7.0.new/GNUmakefile
|
||||
--- yadex-1.7.0/GNUmakefile 2006-03-16 16:08:10.000000000 -0800
|
||||
+++ yadex-1.7.0.new/GNUmakefile 2006-03-16 16:11:32.000000000 -0800
|
||||
@@ -392,19 +392,19 @@
|
||||
|
||||
.PHONY: install
|
||||
install: $(OBJDIR)/install
|
||||
- @scripts/mkinstalldirs $(BINDIR)
|
||||
- @scripts/mkinstalldirs $(ETCDIR)
|
||||
- @scripts/mkinstalldirs $(MANDIR)
|
||||
- @scripts/mkinstalldirs $(MANDIR)/man6
|
||||
- @scripts/mkinstalldirs $(SHAREDIR)
|
||||
- $(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex-$(VERSION)
|
||||
- rm -f $(BINDIR)/yadex
|
||||
- ln -s yadex-$(VERSION) $(BINDIR)/yadex
|
||||
- $(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex-$(VERSION).6
|
||||
- rm -f $(MANDIR)/man6/yadex.6
|
||||
- ln -s yadex-$(VERSION).6 $(MANDIR)/man6/yadex.6
|
||||
- $(OBJDIR)/install -m 644 -d $(SHAREDIR) $(YGD)
|
||||
- $(OBJDIR)/install -m 644 -d $(ETCDIR) yadex.cfg
|
||||
+ @scripts/mkinstalldirs $(DESTDIR)$(BINDIR)
|
||||
+ @scripts/mkinstalldirs $(DESTDIR)$(ETCDIR)
|
||||
+ @scripts/mkinstalldirs $(DESTDIR)$(MANDIR)
|
||||
+ @scripts/mkinstalldirs $(DESTDIR)$(MANDIR)/man6
|
||||
+ @scripts/mkinstalldirs $(DESTDIR)$(SHAREDIR)
|
||||
+ $(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(DESTDIR)$(BINDIR)/yadex-$(VERSION)
|
||||
+ rm -f $(DESTDIR)$(BINDIR)/yadex
|
||||
+ ln -s yadex-$(VERSION) $(DESTDIR)$(BINDIR)/yadex
|
||||
+ $(OBJDIR)/install -m 644 doc/yadex.6 $(DESTDIR)$(MANDIR)/man6/yadex-$(VERSION).6
|
||||
+ rm -f $(DESTDIR)$(MANDIR)/man6/yadex.6
|
||||
+ ln -s yadex-$(VERSION).6 $(DESTDIR)$(MANDIR)/man6/yadex.6
|
||||
+ $(OBJDIR)/install -m 644 -d $(DESTDIR)$(SHAREDIR) $(YGD)
|
||||
+ $(OBJDIR)/install -m 644 -d $(DESTDIR)$(ETCDIR) yadex.cfg
|
||||
@echo "---------------------------------------------------------------"
|
||||
@echo " Yadex is now installed."
|
||||
@echo
|
||||
|
|
@ -1,69 +0,0 @@
|
|||
--- yadex-1.7.0/src/wadlist.cc~ 2006-03-17 11:53:10.000000000 +0100
|
||||
+++ yadex-1.7.0/src/wadlist.cc 2006-03-17 11:57:06.000000000 +0100
|
||||
@@ -52,6 +52,7 @@
|
||||
|
||||
Wad_list_priv::Wad_list_priv ()
|
||||
{
|
||||
+ iter = list.begin ();
|
||||
rewound = true;
|
||||
}
|
||||
|
||||
@@ -80,6 +81,7 @@
|
||||
*/
|
||||
void Wad_list::rewind () const
|
||||
{
|
||||
+ priv->iter = priv->list.begin ();
|
||||
priv->rewound = true;
|
||||
}
|
||||
|
||||
@@ -98,10 +100,7 @@
|
||||
bool Wad_list::get (Wad_file *& wf)
|
||||
{
|
||||
if (priv->rewound)
|
||||
- {
|
||||
- priv->iter = priv->list.begin ();
|
||||
priv->rewound = false;
|
||||
- }
|
||||
else
|
||||
++priv->iter;
|
||||
|
||||
@@ -119,10 +118,7 @@
|
||||
bool Wad_list::get (const Wad_file *& wf) const
|
||||
{
|
||||
if (priv->rewound)
|
||||
- {
|
||||
- priv->iter = priv->list.begin ();
|
||||
priv->rewound = false;
|
||||
- }
|
||||
else
|
||||
++priv->iter;
|
||||
|
||||
@@ -157,26 +153,12 @@
|
||||
*/
|
||||
void Wad_list::del ()
|
||||
{
|
||||
- list_t::iterator i;
|
||||
-
|
||||
- if (priv->rewound)
|
||||
- {
|
||||
- i = priv->list.begin ();
|
||||
- }
|
||||
- else
|
||||
- {
|
||||
- i = priv->iter;
|
||||
- }
|
||||
- if (i == priv->list.end ())
|
||||
+ if (priv->iter == priv->list.end ())
|
||||
{
|
||||
nf_bug ("Wad_list::del: attempt to delete last item");
|
||||
return;
|
||||
}
|
||||
- priv->iter = priv->list.erase (i);
|
||||
+ priv->iter = priv->list.erase (priv->iter);
|
||||
if (priv->iter == priv->list.begin ())
|
||||
- {
|
||||
- priv->iter = 0; // Catch bugs
|
||||
priv->rewound = true;
|
||||
- }
|
||||
}
|
||||
-
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,22 +0,0 @@
|
|||
--- src/objects.cc~ 2003-03-28 06:37:32.000000000 -0600
|
||||
+++ src/objects.cc 2010-05-06 11:42:36.824661556 -0500
|
||||
@@ -543,7 +543,7 @@
|
||||
SideDefs[last].yoff = 0;
|
||||
strcpy (SideDefs[last].tex1, "-");
|
||||
strcpy (SideDefs[last].tex2, "-");
|
||||
- strcpy (SideDefs[last].tex3, default_middle_texture);
|
||||
+ strncpy (SideDefs[last].tex3, default_middle_texture, sizeof(SideDefs[last].tex3));
|
||||
SideDefs[last].sector = NumSectors - 1;
|
||||
}
|
||||
MadeMapChanges = 1;
|
||||
--- src/editobj.cc~ 2003-04-24 15:32:39.000000000 -0500
|
||||
+++ src/editobj.cc 2010-05-07 16:36:49.825412601 -0500
|
||||
@@ -937,7 +937,7 @@
|
||||
struct SideDef *s = SideDefs + l->sidedef1;
|
||||
strcpy (s->tex1, "-");
|
||||
strcpy (s->tex2, "-");
|
||||
- strcpy (s->tex3, default_middle_texture);
|
||||
+ strncpy (s->tex3, default_middle_texture, sizeof(s->tex3));
|
||||
}
|
||||
/* Don't delete the 2nd sidedef, it could be used
|
||||
by another linedef. And if it isn't, the next
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -ru yadex-1.7.0.orig/src/gfx.cc yadex-1.7.0/src/gfx.cc
|
||||
--- yadex-1.7.0.orig/src/gfx.cc 2009-02-28 12:44:44.000000000 +0000
|
||||
+++ yadex-1.7.0/src/gfx.cc 2009-02-28 12:45:10.000000000 +0000
|
||||
@@ -310,7 +310,7 @@
|
||||
win_vis_id = vis_info->visualid;
|
||||
#if defined _cplusplus || defined __cplusplus
|
||||
win_vis_class = vis_info->c_class;
|
||||
-#elif
|
||||
+#else
|
||||
win_vis_class = vis_info->class;
|
||||
#endif
|
||||
win_ncolours = vis_info->colormap_size;
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
[Desktop Entry]
|
||||
Encoding=UTF-8
|
||||
Name=Yadex
|
||||
GenericName=Doom level editor
|
||||
Comment=Doom level editor
|
||||
Exec=yadex -i2 /usr/share/doom/freedoom.wad
|
||||
Icon=yadex.png
|
||||
Terminal=true
|
||||
Type=Application
|
||||
Categories=Graphics;GUIDesigner;
|
||||
Version=1.0
|
||||
BIN
yadex.png
BIN
yadex.png
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
211
yadex.spec
211
yadex.spec
|
|
@ -1,211 +0,0 @@
|
|||
Name: yadex
|
||||
Version: 1.7.0
|
||||
Release: 30%{?dist}
|
||||
Summary: Doom level editor
|
||||
Group: Amusements/Graphics
|
||||
License: GPLv2+
|
||||
|
||||
URL: http://www.teaser.fr/~amajorel/yadex
|
||||
|
||||
Source0: http://www.teaser.fr/~amajorel/yadex/yadex-1.7.0.tar.gz
|
||||
Source1: yadex.desktop
|
||||
Source2: yadex.png
|
||||
|
||||
Patch0: http://glbsp.sourceforge.net/yadex/Yadex_170_ALL.diff
|
||||
Patch1: http://glbsp.sourceforge.net/yadex/Yadex_170_Hexen.diff
|
||||
Patch2: yadex-1.7.0-64bit.patch
|
||||
Patch3: yadex-1.7.0-destdir.patch
|
||||
Patch4: yadex-1.7.0-datadir.patch
|
||||
Patch5: yadex-1.7.0-gcc41.patch
|
||||
Patch6: yadex-1.7.0.bareelif.patch
|
||||
Patch7: yadex-1.7.0-obj-overflow.patch
|
||||
# The following patch is a difference between
|
||||
# the Mr.Meval's huge patch (called "allpatches")
|
||||
# attached to Bug 830628 and the upstream version
|
||||
# 1.7.0 with local Fedora patches #0-7.
|
||||
# It finally introduces changes contained
|
||||
# in the omitted HEXEN patch #1 and other fixes
|
||||
Patch8: yadex-1.7.0-mrmeval-differential-patch.patch
|
||||
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: libX11-devel
|
||||
BuildRequires: boost-devel
|
||||
# Yadex needs an iwad to run. freedoom provides a free iwad that we can use.
|
||||
Requires: freedoom xorg-x11-fonts-ISO8859-1-75dpi
|
||||
|
||||
%description
|
||||
Yadex is a Doom level (wad) editor for Unix systems running X, including Linux.
|
||||
It supports Doom alpha, Doom beta, Doom, Ultimate Doom, Final Doom, Doom II,
|
||||
Heretic and also, in a more or less limited way, Hexen and Strife.
|
||||
|
||||
Yadex is descended from DEU 5.21. Therefore, as you might expect, it's a rather
|
||||
low-level editor that requires you to take care of a lot of detail but on the
|
||||
flip side allows you to control very precisely what you are doing. In addition,
|
||||
it has many advanced functions that DEU didn't have, to make certain
|
||||
tedious tasks easy.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
# Removing bundled boost
|
||||
rm -rf boost
|
||||
|
||||
%patch0 -p1
|
||||
# Omitted. Patch fails to apply. Used for Hexen maps only. Needs investigation.
|
||||
#%%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -p1
|
||||
%patch7 -p0
|
||||
%patch8 -p1
|
||||
|
||||
|
||||
%build
|
||||
|
||||
# Don't use %%configure because this is not an autotools-generated
|
||||
# configure script and will choke on some of the default configure switches.
|
||||
./configure --prefix=%{_prefix}
|
||||
|
||||
# Disabling optimizations (#830628 - crash workaround)
|
||||
CXXFLAGS_NOOPT=`echo "%{optflags}" | sed "s/-O2//g"`
|
||||
make CXXFLAGS="$CXXFLAGS_NOOPT" %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
make install DESTDIR="%{buildroot}"
|
||||
|
||||
# Remove the duplicate man pages
|
||||
rm -f %{buildroot}%{_mandir}/man6/%{name}*
|
||||
iconv --from=ISO-8859-1 --to=UTF-8 docsrc/%{name}.6 > docsrc/%{name}.6.new
|
||||
install -p -m644 docsrc/%{name}.6.new %{buildroot}/%{_mandir}/man6/
|
||||
|
||||
# .desktop file integration
|
||||
desktop-file-install \
|
||||
--dir %{buildroot}%{_datadir}/applications \
|
||||
%{SOURCE1}
|
||||
mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
|
||||
install -p -m 644 %{SOURCE2} %{buildroot}/%{_datadir}/icons/hicolor/48x48/apps/
|
||||
|
||||
|
||||
%post
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
fi
|
||||
|
||||
|
||||
%postun
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
fi
|
||||
|
||||
|
||||
%files
|
||||
%{_bindir}/%{name}
|
||||
%{_bindir}/%{name}-%{version}
|
||||
%dir %{_sysconfdir}/%{name}
|
||||
%dir %{_sysconfdir}/%{name}/%{version}
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/%{version}/%{name}.cfg
|
||||
%{_datadir}/%{name}
|
||||
%{_mandir}/man6/*
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
%{_datadir}/icons/hicolor/48x48/apps/yadex.png
|
||||
%doc COPYING COPYING.LIB doc/*.html docsrc/*.png
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-30
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-29
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Fri May 23 2014 Petr Machata <pmachata@redhat.com> - 1.7.0-28
|
||||
- Rebuild for boost 1.55.0
|
||||
|
||||
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Tue Jul 30 2013 Petr Machata <pmachata@redhat.com> - 1.7.0-26
|
||||
- Rebuild for boost 1.54.0
|
||||
|
||||
* Sun Feb 10 2013 Parag Nemade <paragn AT fedoraproject DOT org> - 1.7.0-25
|
||||
- Remove vendor tag from desktop file as per https://fedorahosted.org/fesco/ticket/1077
|
||||
|
||||
* Fri Jan 18 2013 Jaromir Capik <jcapik@redhat.com> - 1.7.0-24
|
||||
- Removing bundled boost
|
||||
|
||||
* Fri Jan 11 2013 Jaromir Capik <jcapik@redhat.com> - 1.7.0-23
|
||||
- Fixing keyboard shortcuts for adding and deleting objects
|
||||
- ... by altering the Mr'Meval's patch (#830628)
|
||||
|
||||
* Thu Jan 10 2013 Jaromir Capik <jcapik@redhat.com> - 1.7.0-22
|
||||
- Disabling optimizations (#830628 - crash workaround)
|
||||
|
||||
* Thu Jan 10 2013 Jaromir Capik <jcapik@redhat.com> - 1.7.0-21
|
||||
- Introducing changes from Mr.Meval's "allpatches" patch (e.g HEXEN patch)
|
||||
|
||||
* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-20
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-19
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Wed Sep 29 2010 Jon Ciesla <limb@jcomserv.net> - 1.7.0-17
|
||||
- Requires xorg-x11-fonts-ISO8859-1-75dpi, BZ 620251.
|
||||
|
||||
* Fri May 07 2010 Jon Ciesla <limb@jcomserv.net> - 1.7.0-16
|
||||
- Addition to object overflow patch.
|
||||
|
||||
* Thu May 06 2010 Jon Ciesla <limb@jcomserv.net> - 1.7.0-15
|
||||
- Re-patch for buffer overflow crash.
|
||||
|
||||
* Thu May 06 2010 Jon Ciesla <limb@jcomserv.net> - 1.7.0-14
|
||||
- Patch for buffer overflow crash.
|
||||
|
||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Sat Feb 28 2009 Caolán McNamara - 1.7.0-12
|
||||
- fix bare #elif
|
||||
|
||||
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Fri Feb 8 2008 Wart <wart at kobold.org> 1.7.0-10
|
||||
- Rebuild for gcc 4.3
|
||||
|
||||
* Fri Sep 7 2007 Wart <wart at kobold.org> 1.7.0-9
|
||||
- No longer BuildRequires: gawk due to buildroot changes
|
||||
|
||||
* Tue Aug 21 2007 Wart <wart at kobold.org> 1.7.0-8
|
||||
- License tag clarification
|
||||
- Add BuildRequires: gawk due to changes in the buildroot
|
||||
|
||||
* Sat Aug 11 2007 Wart <wart at kobold.org> 1.7.0-7
|
||||
- Clean up .desktop file version and categories
|
||||
|
||||
* Tue Oct 17 2006 Wart <wart at kobold.org> 1.7.0-6
|
||||
- Own an extra directory
|
||||
|
||||
* Sun Aug 27 2006 Wart <wart at kobold.org> 1.7.0-5
|
||||
- Rebuild for FC-6
|
||||
|
||||
* Mon Apr 10 2006 Wart <wart at kobold.org> 1.7.0-4
|
||||
- Update for modular x.org
|
||||
|
||||
* Fri Mar 17 2006 Wart <wart at kobold.org> 1.7.0-3
|
||||
- Added patch for gcc 4.1
|
||||
|
||||
* Thu Mar 16 2006 Wart <wart at kobold.org> 1.7.0-2
|
||||
- Added .desktop file
|
||||
|
||||
* Thu Mar 16 2006 Wart <wart at kobold.org> 1.7.0-1
|
||||
- Initial submission to Fedora Extras
|
||||
Loading…
Add table
Add a link
Reference in a new issue