Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:pisilinux/main

Browse Source
This commit is contained in:
Ertuğrul Erata
2018-05-10 17:43:43 +03:00
parent 6aff8cb849 cc7947065c
commit a61bf9dfd1
29 changed files with 166478 additions and 165027 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/font/fontconfig/files/fontconfig-const-name-in-range.patch
+60
View File
@@ -0,0 +1,60 @@
From 198358dd8ff858c9e36531a7406ccb2246ae77b7 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Mon, 12 Mar 2018 11:49:58 +0900
Subject: [PATCH] Allow the constant names in the range
https://bugs.freedesktop.org/show_bug.cgi?id=105415
---
src/fcname.c | 34 +++++++++++++++++++++++++++++-----
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/src/fcname.c b/src/fcname.c
index 79e413e..15fb659 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -330,13 +330,37 @@ FcNameConvert (FcType type, FcChar8 *string)
case FcTypeRange:
if (sscanf ((char *) string, "[%lg %lg]", &b, &e) != 2)
{
- v.u.d = strtod ((char *) string, &p);
- if (p != NULL && p[0] != 0)
+ char *sc, *ec;
+ size_t len = strlen ((const char *) string);
+ int si, ei;
+
+ sc = malloc (len);
+ ec = malloc (len);
+ if (sc && ec && sscanf ((char *) string, "[%s %[^]]]", sc, ec) == 2)
{
- v.type = FcTypeVoid;
- break;
+ if (FcNameConstant ((const FcChar8 *) sc, &si) &&
+ FcNameConstant ((const FcChar8 *) ec, &ei))
+ v.u.r = FcRangeCreateDouble (si, ei);
+ else
+ goto bail1;
+ }
+ else
+ {
+ bail1:
+ v.type = FcTypeDouble;
+ if (FcNameConstant (string, &si))
+ {
+ v.u.d = (double) si;
+ } else {
+ v.u.d = strtod ((char *) string, &p);
+ if (p != NULL && p[0] != 0)
+ v.type = FcTypeVoid;
+ }
}
- v.type = FcTypeDouble;
+ if (sc)
+ free (sc);
+ if (ec)
+ free (ec);
}
else
v.u.r = FcRangeCreateDouble (b, e);
--
2.14.3
desktop/font/fontconfig/files/fontconfig-implicit-object-for-const-name.patch
+31
View File
@@ -0,0 +1,31 @@
From 4699406a68321179b14fae7412f828e2f37a7033 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 14 Mar 2018 18:31:30 +0900
Subject: [PATCH 2/5] Add the value of the constant name to the implicit object
in the pattern
For objects which has been changed the object type to FcTypeRange.
https://bugs.freedesktop.org/show_bug.cgi?id=105415
---
src/fcname.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/fcname.c b/src/fcname.c
index 15fb659..c9320ae 100644
--- a/src/fcname.c
+++ b/src/fcname.c
@@ -490,6 +490,10 @@ FcNameParse (const FcChar8 *name)
if (!FcPatternAddBool (pat, c->object, c->value))
goto bail2;
break;
+ case FcTypeRange:
+ if (!FcPatternAddInteger (pat, c->object, c->value))
+ goto bail2;
+ break;
default:
break;
}
--
2.14.3
desktop/font/fontconfig/files/fontconfig-locale.patch
+274
View File
@@ -0,0 +1,274 @@
From 923b5be626a6e03fbaeee0b5cd6d0246c2f8f36f Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Wed, 14 Mar 2018 12:35:05 +0900
Subject: [PATCH 1/5] Do not override locale if already set by app
https://bugs.freedesktop.org/show_bug.cgi?id=105492
---
src/fccfg.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/fccfg.c b/src/fccfg.c
index eb0b76d..e311f17 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -45,11 +45,16 @@ retry_locale:
is_locale_initialized = (intptr_t) fc_atomic_ptr_get (&static_is_locale_initialized);
if (!is_locale_initialized)
{
+ char *loc;
+
is_locale_initialized = FcTrue;
if (!fc_atomic_ptr_cmpexch (&static_is_locale_initialized, NULL,
(void *)(intptr_t) is_locale_initialized))
goto retry_locale;
- setlocale (LC_ALL, "");
+
+ loc = setlocale (LC_ALL, NULL);
+ if (!loc || strcmp (loc, "C") == 0)
+ setlocale (LC_ALL, "");
}
retry_config:
config = fc_atomic_ptr_get (&_fcConfig);
--
2.14.3
From 98eaef69af1350e459bf9c175476d3b772968874 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 15 Mar 2018 12:17:52 +0900
Subject: [PATCH 4/5] Leave the locale setting to applications
https://bugs.freedesktop.org/show_bug.cgi?id=105492
---
fc-conflist/fc-conflist.c | 2 ++
src/fccfg.c | 22 ++--------------------
2 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/fc-conflist/fc-conflist.c b/fc-conflist/fc-conflist.c
index d02273b..5c40a0f 100644
--- a/fc-conflist/fc-conflist.c
+++ b/fc-conflist/fc-conflist.c
@@ -38,6 +38,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -102,6 +103,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "Vh", longopts, NULL)) != -1)
#else
diff --git a/src/fccfg.c b/src/fccfg.c
index e311f17..e35c451 100644
--- a/src/fccfg.c
+++ b/src/fccfg.c
@@ -26,7 +26,6 @@
#include "fcint.h"
#include <dirent.h>
-#include <locale.h>
#include <sys/types.h>
#if defined (_WIN32) && !defined (R_OK)
@@ -39,24 +38,7 @@ static FcConfig *
FcConfigEnsure (void)
{
FcConfig *config;
- FcBool is_locale_initialized;
- static void *static_is_locale_initialized;
-retry_locale:
- is_locale_initialized = (intptr_t) fc_atomic_ptr_get (&static_is_locale_initialized);
- if (!is_locale_initialized)
- {
- char *loc;
-
- is_locale_initialized = FcTrue;
- if (!fc_atomic_ptr_cmpexch (&static_is_locale_initialized, NULL,
- (void *)(intptr_t) is_locale_initialized))
- goto retry_locale;
-
- loc = setlocale (LC_ALL, NULL);
- if (!loc || strcmp (loc, "C") == 0)
- setlocale (LC_ALL, "");
- }
-retry_config:
+retry:
config = fc_atomic_ptr_get (&_fcConfig);
if (!config)
{
@@ -64,7 +46,7 @@ retry_config:
if (!fc_atomic_ptr_cmpexch (&_fcConfig, NULL, config)) {
FcConfigDestroy (config);
- goto retry_config;
+ goto retry;
}
}
return config;
--
2.14.3
From 2938e4d72da40f6bb0d22086c519a9852a820f40 Mon Sep 17 00:00:00 2001
From: Akira TAGOH <akira@tagoh.org>
Date: Thu, 15 Mar 2018 12:54:02 +0900
Subject: [PATCH 5/5] call setlocale
---
fc-cache/fc-cache.c | 2 ++
fc-cat/fc-cat.c | 2 ++
fc-list/fc-list.c | 2 ++
fc-match/fc-match.c | 2 ++
fc-pattern/fc-pattern.c | 2 ++
fc-query/fc-query.c | 2 ++
fc-scan/fc-scan.c | 2 ++
7 files changed, 14 insertions(+)
diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
index dc93c19..87e3020 100644
--- a/fc-cache/fc-cache.c
+++ b/fc-cache/fc-cache.c
@@ -41,6 +41,7 @@
#include <fcntl.h>
#include <dirent.h>
#include <string.h>
+#include <locale.h>
#if defined (_WIN32)
#define STRICT
@@ -302,6 +303,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "Efrsy:Vvh", longopts, NULL)) != -1)
#else
diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
index dfe30d7..69611bc 100644
--- a/fc-cat/fc-cat.c
+++ b/fc-cat/fc-cat.c
@@ -40,6 +40,7 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <errno.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -271,6 +272,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "Vvrh", longopts, NULL)) != -1)
#else
diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
index 5cded50..2039acd 100644
--- a/fc-list/fc-list.c
+++ b/fc-list/fc-list.c
@@ -27,6 +27,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
#else
@@ -117,6 +118,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "vbf:qVh", longopts, NULL)) != -1)
#else
diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
index 7902707..dee6147 100644
--- a/fc-match/fc-match.c
+++ b/fc-match/fc-match.c
@@ -36,6 +36,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -121,6 +122,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "asvbf:Vh", longopts, NULL)) != -1)
#else
diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c
index f63761c..7989b81 100644
--- a/fc-pattern/fc-pattern.c
+++ b/fc-pattern/fc-pattern.c
@@ -36,6 +36,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -111,6 +112,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "cdf:Vh", longopts, NULL)) != -1)
#else
diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
index 9da090d..fbffb84 100644
--- a/fc-query/fc-query.c
+++ b/fc-query/fc-query.c
@@ -39,6 +39,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -115,6 +116,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "i:bf:Vh", longopts, NULL)) != -1)
#else
diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c
index edb967c..9302ac5 100644
--- a/fc-scan/fc-scan.c
+++ b/fc-scan/fc-scan.c
@@ -39,6 +39,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
+#include <locale.h>
#ifdef ENABLE_NLS
#include <libintl.h>
@@ -110,6 +111,7 @@ main (int argc, char **argv)
#if HAVE_GETOPT_LONG || HAVE_GETOPT
int c;
+ setlocale (LC_ALL, "");
#if HAVE_GETOPT_LONG
while ((c = getopt_long (argc, argv, "bf:Vh", longopts, NULL)) != -1)
#else
--
2.14.3
desktop/font/fontconfig/pspec.xml
+4 -1
View File
@@ -30,6 +30,9 @@
<Patch level="1">fontconfig-2.8.0-sleep-less.patch</Patch>
<!-- remove deprecated user conf dir -->
<Patch level="0">deprecated-user-conf.patch</Patch>
<Patch level="1">fontconfig-const-name-in-range.patch</Patch>
<Patch level="1">fontconfig-implicit-object-for-const-name.patch</Patch>
<Patch level="1">fontconfig-locale.patch</Patch>
</Patches>
</Source>
@@ -95,7 +98,7 @@
<History>
<Update release="6">
<Date>2018-05-07</Date>
<Date>2018-05-10</Date>
<Version>2.13.0</Version>
<Comment>Version Bump</Comment>
<Name>Pisi Linux Community</Name>
game/puzzle/gmult/actions.py
+21
View File
@@ -0,0 +1,21 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
shelltools.system("./configure --prefix=/usr LDFLAGS=-lm")
def build():
autotools.make()
def install():
autotools.rawInstall("DESTDIR=%s" % get.installDIR())
pisitools.dodoc("NEWS", "THANKS", "COPYING", "README", "AUTHORS")
game/puzzle/gmult/pspec.xml
+75
View File
@@ -0,0 +1,75 @@
<?xml version="1.0" encoding="utf-8" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>gmult</Name>
<Homepage>http://mterry.name/gmult/</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv3</License>
<Icon>gmult</Icon>
<IsA>app:gui</IsA>
<Summary>Multiplication Puzzle</Summary>
<Description>Multiplication Puzzle is a simple GTK+ 2 game that emulates the multiplication game found in Emacs. Basically, a multiplication problem is shown with all digits replaced by letters. Your job is to guess which letter represents which number.</Description>
<Archive sha1sum="d73c588077f564a458f7595cdd62c9b69408f369" type="tarbz2">https://launchpad.net/gmult/trunk/8.0/+download/gmult-8.0.tar.bz2</Archive>
<BuildDependencies>
<Dependency>atk-devel</Dependency>
<Dependency>gtk3-devel</Dependency>
<Dependency>pango-devel</Dependency>
<Dependency>glib2-devel</Dependency>
<Dependency>gdk-pixbuf-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>gmult</Name>
<RuntimeDependencies>
<Dependency>atk</Dependency>
<Dependency>gtk3</Dependency>
<Dependency>cairo</Dependency>
<Dependency>pango</Dependency>
<Dependency>glib2</Dependency>
<Dependency>gdk-pixbuf</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="doc">/usr/share/doc/gmult</Path>
<Path fileType="data">/usr/share/icons</Path>
<Path fileType="localedata">/usr/share/locale</Path>
</Files>
</Package>
<History>
<Update release="4">
<Date>2018-05-11</Date>
<Version>8.0</Version>
<Comment>rebuild and testing</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2014-02-23</Date>
<Version>8.0</Version>
<Comment>rebuild</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-04-27</Date>
<Version>8.0</Version>
<Comment>V.bump</Comment>
<Name>Osman Erkan</Name>
<Email>osman.erkan@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2010-04-28</Date>
<Version>7.3</Version>
<Comment>First release</Comment>
<Name>Doruk Fişek</Name>
<Email>dfisek@fisek.com.tr</Email>
</Update>
</History>
</PISI>
game/puzzle/gmult/translations.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>gmult</Name>
<Summary xml:lang="tr">Çarpma Bulmacası</Summary>
<Description xml:lang="tr">Çarpma Bulmacası, Emacs'teki çarpma oyununun benzeri basit bir GTK+ 2 oyunudur. Tüm basamakların harflerle değiştirildiği bir çarpma problemi gösteriliyor. Sizin işiniz de, hangi harfe hangi rakamın karşılık geldiğini tahmin etmek.</Description>
</Source>
</PISI>
game/puzzle/hex-a-hop/actions.py
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import get
def setup():
autotools.configure()
def build():
autotools.make()
def install():
autotools.rawInstall('DESTDIR="%s"' % get.installDIR())
pisitools.dodoc("AUTHORS", "COPYING", "ChangeLog")
game/puzzle/hex-a-hop/files/hex-a-hop.desktop
+13
View File
@@ -0,0 +1,13 @@
[Desktop Entry]
Type=Application
Version=1.0
Encoding=UTF-8
Name=Hex-a-hop
Name[tr]=Hex-a-hop
GenericName=Hexagonal Puzzle
GenericName[tr]=Altıgen Zeka Oyunu
Icon=hex-a-hop
Exec=hex-a-hop
Terminal=false
StartupNotify=false
Categories=Application;Game;LogicGame;
game/puzzle/hex-a-hop/files/hex-a-hop.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

game/puzzle/hex-a-hop/pspec.xml
+68
View File
@@ -0,0 +1,68 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>hex-a-hop</Name>
<Homepage>http://hexahop.sourceforge.net/downloads.html</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>as-is</License>
<Icon>hex-a-hop</Icon>
<IsA>app:gui</IsA>
<Summary>Hexagonal puzzle game</Summary>
<Description>Hex-a-hop is a puzzle game based on hexagonal tiles. There is no time limit and no real-time elements. The objective is simply to destroy all the green hexagonal tiles on each of the 100 levels. As you progress through the game, more types of tiles are introduced, which make things more difficult and interesting.</Description>
<Archive sha1sum="5e1994caaa4974ba87bb5676aed1e44c81dec85d" type="targz">mirrors://sourceforge/hexahop/hex-a-hop/1.1.0/hex-a-hop-1.1.0.tar.gz</Archive>
<BuildDependencies>
<Dependency>libsdl-devel</Dependency>
<Dependency>sdl-mixer-devel</Dependency>
<Dependency>sdl-ttf-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>hex-a-hop</Name>
<RuntimeDependencies>
<Dependency>libgcc</Dependency>
<Dependency>libsdl</Dependency>
<Dependency>sdl-mixer</Dependency>
<Dependency>sdl-ttf</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/hex-a-hop</Path>
<Path fileType="data">/usr/share/pixmaps</Path>
<Path fileType="doc">/usr/share/doc/hex-a-hop</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/hex-a-hop.desktop">hex-a-hop.desktop</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/pixmaps/hex-a-hop.png">hex-a-hop.png</AdditionalFile>
</AdditionalFiles>
</Package>
<History>
<Update release="3">
<Date>2018-05-11</Date>
<Version>1.1.0</Version>
<Comment>Rebuild and testing</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2014-02-17</Date>
<Version>1.1.0</Version>
<Comment>Rebuild</Comment>
<Name>Kamil Atlı</Name>
<Email>suvarice@gmail.com</Email>
</Update>
<Update release="1">
<Date>2011-01-11</Date>
<Version>1.1.0</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
game/puzzle/hex-a-hop/translations.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>hex-a-hop</Name>
<Summary xml:lang="tr">Altıgenler içeren bulmaca oyunu</Summary>
<Description xml:lang="tr">Hex-a-hop altıgen döşemeler üzerinde oynanan bir bulmaca oyunudur. Zaman sınırı ve gerçek zamanlı öğe yoktur. Amaç 100 bölümün her birindeki yeşil döşemeleri yoketmektir. Oyunda ilerledikçe yeni döşeme türleri çıkar ve işler daha zor ve ilginç hale gelir.</Description>
</Source>
</PISI>
game/puzzle/lmarbles/actions.py
+23
View File
@@ -0,0 +1,23 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
def setup():
autotools.configure("--localstatedir=/usr/share/lmarbles")
def build():
autotools.make()
def install():
autotools.rawInstall('DESTDIR="%s"' % get.installDIR())
pisitools.removeDir("/usr/share/icons")
pisitools.dodoc("AUTHORS", "ChangeLog", "README", "TODO")
game/puzzle/lmarbles/files/lmarbles.desktop
+13
View File
@@ -0,0 +1,13 @@
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=LMarbles
GenericName=Atomix Clone
GenericName[tr]=Atomix Oyunu
Comment=SDL Atomix Clone
Comment[tr]=Atomix Oyunu
Icon=lmarbles
TryExec=lmarbles
Exec=lmarbles
Terminal=false
Categories=Qt;KDE;Game;BlocksGame;
game/puzzle/lmarbles/files/lmarbles.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 839 B

game/puzzle/lmarbles/pspec.xml
+66
View File
@@ -0,0 +1,66 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>lmarbles</Name>
<Homepage>http://lgames.sourceforge.net/index.php?project=LMarbles</Homepage>
<Packager>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>GPLv2</License>
<Icon>lmarbles</Icon>
<IsA>app:gui</IsA>
<Summary>Marble puzzle game</Summary>
<Description>Puzzle game inspired by Atomix and written using the SDL library.</Description>
<Archive sha1sum="58db2447276bdf480e03964d729513f022f7790b" type="targz">mirrors://sourceforge/lgames/lmarbles-1.0.8.tar.gz</Archive>
<BuildDependencies>
<Dependency>libsdl-devel</Dependency>
<Dependency>sdl-mixer-devel</Dependency>
</BuildDependencies>
</Source>
<Package>
<Name>lmarbles</Name>
<RuntimeDependencies>
<Dependency>libsdl</Dependency>
<Dependency>sdl-mixer</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
<Path fileType="data">/usr/share/applications</Path>
<Path fileType="data">/usr/share/lmarbles</Path>
<Path fileType="data">/usr/share/pixmaps</Path>
<Path fileType="man">/usr/share/man</Path>
<Path fileType="doc">/usr/share/doc/lmarbles</Path>
</Files>
<AdditionalFiles>
<AdditionalFile owner="root" permission="0644" target="/usr/share/applications/lmarbles.desktop">lmarbles.desktop</AdditionalFile>
<AdditionalFile owner="root" permission="0644" target="/usr/share/pixmaps/lmarbles.png">lmarbles.png</AdditionalFile>
</AdditionalFiles>
</Package>
<History>
<Update release="3">
<Date>2018-05-11</Date>
<Version>1.0.8</Version>
<Comment>Rebuild and testing.</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2014-03-09</Date>
<Version>1.0.8</Version>
<Comment>Rebuild.</Comment>
<Name>Kamil Atlı</Name>
<Email>suvarice@gmail.com</Email>
</Update>
<Update release="1">
<Date>2010-01-17</Date>
<Version>1.0.8</Version>
<Comment>First release</Comment>
<Name>Doruk Fişek</Name>
<Email>dfisek@fisek.com.tr</Email>
</Update>
</History>
</PISI>
game/puzzle/lmarbles/translations.xml
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>lmarbles</Name>
<Summary xml:lang="tr">Bilye oyunu</Summary>
<Description xml:lang="tr">LMarbles, Atomix oyunundan yola çıkılarak hazırlanmış bir oyundur. Bilyeleri istenen yerlere yerleştirerek bulmacaları çözmeniz gerekir.</Description>
</Source>
</PISI>
pisi-index.xml
+165354 -165024
View File
File diff suppressed because it is too large Load Diff
pisi-index.xml.sha1sum
+1 -1
View File
@@ -1 +1 @@
2a43efd850601b680ca15fec25fa19d8adf2d23e
fb3ef82b51874480b4e1f2e321aeb2195dbb1e27
pisi-index.xml.xz
BIN
View File
Binary file not shown.
pisi-index.xml.xz.sha1sum
+1 -1
View File
@@ -1 +1 @@
91dc1974c32c6c64c1f62f69c737283f2ba8156e
2078cb577e6d55fe5f618de48768d02b84844b8b
programming/language/python/pygame/actions.py
+40
View File
@@ -0,0 +1,40 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
from pisi.actionsapi import pisitools
from pisi.actionsapi import shelltools
from pisi.actionsapi import pythonmodules
from pisi.actionsapi import get
import os
#WorkDir = "pygame-%srelease" % get.srcVERSION()
docdir = "%s/%s" % (get.docDIR(), get.srcNAME())
pyversion = get.curPYTHON().replace("python", "")
arch = get.ARCH().replace("-", "_")
def fixperms(d):
for root, dirs, files in os.walk(d):
for name in dirs:
shelltools.chmod(os.path.join(root, name), 0755)
for name in files:
shelltools.chmod(os.path.join(root, name), 0644)
def setup():
for d in ["src", "lib", "docs", "examples"]:
fixperms(d)
pythonmodules.run("config.py -auto")
def build():
pythonmodules.compile()
shelltools.copy("lib/pygame_icon.bmp", "build/lib.linux-%s-%s/pygame/" % (arch, pyversion))
def install():
pythonmodules.install()
pisitools.insinto(docdir, "docs", "html")
pisitools.insinto(docdir, "examples")
programming/language/python/pygame/files/config.patch
+26
View File
@@ -0,0 +1,26 @@
Index: config_unix.py
===================================================================
--- config_unix.py (revision 2567)
+++ config_unix.py (working copy)
@@ -174,7 +174,7 @@
for d in DEPS[1:]:
if not d.found:
- if not confirm("""
+ if "-auto" not in sys.argv and not confirm("""
Warning, some of the pygame dependencies were not found. Pygame can still
compile and install, but games that depend on those missing dependencies
will not run. Would you like to continue the configuration?"""):
Index: config_msys.py
===================================================================
--- config_msys.py (revision 2567)
+++ config_msys.py (working copy)
@@ -283,7 +283,7 @@
for d in DEPS[1:]:
if not d.found:
- if not confirm("""
+ if "-auto" not in sys.argv and not confirm("""
Warning, some of the pygame dependencies were not found. Pygame can still
compile and install, but games that depend on those missing dependencies
will not run. Would you like to continue the configuration?"""):
programming/language/python/pygame/files/pygame-1.9.1-config.patch
+4
View File
@@ -0,0 +1,4 @@
--- pygame-1.9.1release/config_unix.py~ 2009-10-08 14:59:39.000000000 -0500
+++ pygame-1.9.1release/config_unix.py 2009-10-08 15:00:53.000000000 -0500
@@ -23,0 +24 @@
+ return 1
programming/language/python/pygame/files/pygame-1.9.1-no-test-install.patch
+61
View File
@@ -0,0 +1,61 @@
diff --git a/setup.py b/setup.py
index 45af61f..8ea5de5 100644
--- a/setup.py
+++ b/setup.py
@@ -183,11 +183,11 @@ for f in glob.glob(os.path.join('lib', '*')):
pygame_data_files.append(f)
#tests/fixtures
-add_datafiles(data_files, 'pygame/tests',
- ['test',
- [['fixtures',
- [['xbm_cursors',
- ['*.xbm']]]]]])
+#add_datafiles(data_files, 'pygame/tests',
+# ['test',
+# [['fixtures',
+# [['xbm_cursors',
+# ['*.xbm']]]]]])
#examples
add_datafiles(data_files, 'pygame/examples',
@@ -461,25 +461,25 @@ date_files = [(path, files) for path, files in data_files if files]
PACKAGEDATA = {
"cmdclass": cmdclass,
"packages": ['pygame', 'pygame.gp2x', 'pygame.threads',
- 'pygame.tests',
- 'pygame.tests.test_utils',
- 'pygame.tests.run_tests__tests',
- 'pygame.tests.run_tests__tests.all_ok',
- 'pygame.tests.run_tests__tests.failures1',
- 'pygame.tests.run_tests__tests.incomplete',
- 'pygame.tests.run_tests__tests.infinite_loop',
- 'pygame.tests.run_tests__tests.print_stderr',
- 'pygame.tests.run_tests__tests.print_stdout',
- 'pygame.tests.run_tests__tests.incomplete_todo',
- 'pygame.tests.run_tests__tests.exclude',
- 'pygame.tests.run_tests__tests.timeout',
- 'pygame.tests.run_tests__tests.everything',
+# 'pygame.tests',
+# 'pygame.tests.test_utils',
+# 'pygame.tests.run_tests__tests',
+# 'pygame.tests.run_tests__tests.all_ok',
+# 'pygame.tests.run_tests__tests.failures1',
+# 'pygame.tests.run_tests__tests.incomplete',
+# 'pygame.tests.run_tests__tests.infinite_loop',
+# 'pygame.tests.run_tests__tests.print_stderr',
+# 'pygame.tests.run_tests__tests.print_stdout',
+# 'pygame.tests.run_tests__tests.incomplete_todo',
+# 'pygame.tests.run_tests__tests.exclude',
+# 'pygame.tests.run_tests__tests.timeout',
+# 'pygame.tests.run_tests__tests.everything',
'pygame.docs',
'pygame.examples'],
"package_dir": {'pygame': 'lib',
'pygame.threads': 'lib/threads',
'pygame.gp2x': 'lib/gp2x',
- 'pygame.tests': 'test',
+# 'pygame.tests': 'test',
'pygame.docs': 'docs',
'pygame.examples': 'examples'},
"headers": headers,
programming/language/python/pygame/files/pygame-1.9.1-porttime.patch
+26
View File
@@ -0,0 +1,26 @@
diff --git a/config_unix.py b/config_unix.py
index c888c28..942a750 100644
--- a/config_unix.py
+++ b/config_unix.py
@@ -147,7 +147,7 @@ def main():
Dependency('JPEG', 'jpeglib.h', 'libjpeg', ['jpeg']),
Dependency('SCRAP', '', 'libX11', ['X11']),
Dependency('PORTMIDI', 'portmidi.h', 'libportmidi.so', ['portmidi']),
- Dependency('PORTTIME', 'porttime.h', 'libporttime.so', ['porttime']),
+ Dependency('PORTTIME', 'porttime.h', 'libportmidi.so', ['portmidi']),
#Dependency('GFX', 'SDL_gfxPrimitives.h', 'libSDL_gfx.so', ['SDL_gfx']),
]
if not DEPS[0].found:
diff --git a/Setup.in b/Setup.in
index 4bb6c1c..c90174f 100644
--- a/Setup.in
+++ b/Setup.in
@@ -16,7 +16,7 @@ PNG = -lpng
JPEG = -ljpeg
SCRAP = -lX11
PORTMIDI = -lportmidi
-PORTTIME = -lporttime
+PORTTIME =
#--EndConfig
#DEBUG = -C-W -C-Wall
programming/language/python/pygame/files/pygame-remove-v4l.patch
+165
View File
@@ -0,0 +1,165 @@
diff --git a/Setup.in b/Setup.in
index c90174f..2ad0252 100644
--- a/Setup.in
+++ b/Setup.in
@@ -34,7 +34,7 @@ _numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
+_camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
GFX = src/SDL_gfx/SDL_gfxPrimitives.c
diff --git a/src/_camera.c b/src/_camera.c
index d25cf63..f354fab 100644
--- a/src/_camera.c
+++ b/src/_camera.c
@@ -22,7 +22,7 @@
* Author: Nirav Patel
*
* This module allows for use of v4l2 webcams in pygame. The code is written
- * such that adding support for v4l or vfw cameras should be possible without
+ * such that adding support for vfw cameras should be possible without
* much modification of existing functions. v4l2 functions are kept seperate
* from functions available to pygame users and generic functions like
* colorspace conversion.
@@ -160,20 +160,8 @@ PyObject* camera_start (PyCameraObject* self)
{
#if defined(__unix__)
if (v4l2_open_device(self) == 0) {
- if (v4l_open_device(self) == 0) {
- v4l2_close_device(self);
- return NULL;
- } else {
- self->camera_type = CAM_V4L;
- if (v4l_init_device(self) == 0) {
- v4l2_close_device(self);
- return NULL;
- }
- if (v4l_start_capturing(self) == 0) {
- v4l2_close_device(self);
- return NULL;
- }
- }
+ v4l2_close_device(self);
+ return NULL;
} else {
self->camera_type = CAM_V4L2;
if (v4l2_init_device(self) == 0) {
diff --git a/src/camera.h b/src/camera.h
index 921ad96..f528ad8 100644
--- a/src/camera.h
+++ b/src/camera.h
@@ -39,7 +39,6 @@
#include <asm/types.h> /* for videodev2.h */
- #include <linux/videodev.h>
#include <linux/videodev2.h>
#endif
@@ -51,7 +50,7 @@
#define RGB_OUT 1
#define YUV_OUT 2
#define HSV_OUT 4
-#define CAM_V4L 1
+#define CAM_V4L 1 /* deprecated. the incomplete support in pygame was removed */
#define CAM_V4L2 2
struct buffer
@@ -111,8 +110,4 @@ int v4l2_init_device (PyCameraObject* self);
int v4l2_close_device (PyCameraObject* self);
int v4l2_open_device (PyCameraObject* self);
-/* internal functions specific to v4l */
-int v4l_open_device (PyCameraObject* self);
-int v4l_init_device(PyCameraObject* self);
-int v4l_start_capturing(PyCameraObject* self);
#endif
diff --git a/src/camera_v4l.c b/src/camera_v4l.c
index 674bfc6..e69de29 100644
--- a/src/camera_v4l.c
+++ b/src/camera_v4l.c
@@ -1,81 +0,0 @@
-/*
- pygame - Python Game Library
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-*/
-#if defined(__unix__)
-#include "camera.h"
-
-/*
- * V4L functions
- */
-
-int v4l_open_device (PyCameraObject* self)
-{
- struct stat st;
- struct video_capability cap;
- struct video_mbuf buf;
-
- if (-1 == stat (self->device_name, &st)) {
- PyErr_Format(PyExc_SystemError, "Cannot identify '%s': %d, %s",
- self->device_name, errno, strerror (errno));
- return 0;
- }
-
- if (!S_ISCHR (st.st_mode)) {
- PyErr_Format(PyExc_SystemError, "%s is no device",self->device_name);
- return 0;
- }
-
- self->fd = open (self->device_name, O_RDWR /* required | O_NONBLOCK */, 0);
-
- if (-1 == self->fd) {
- PyErr_Format(PyExc_SystemError, "Cannot open '%s': %d, %s",
- self->device_name, errno, strerror (errno));
- return 0;
- }
-
- if(ioctl(self->fd, VIDIOCGCAP, cap) == -1) {
- PyErr_Format(PyExc_SystemError, "%s is not a V4L device",
- self->device_name);
- return 0;
- }
-
- if(!(cap.type & VID_TYPE_CAPTURE)) {
- PyErr_Format(PyExc_SystemError, "%s is not a video capture device",
- self->device_name);
- return 0;
- }
-
- if( ioctl(self->fd , VIDIOCGMBUF , buf ) == -1 ) {
- PyErr_Format(PyExc_SystemError, "%s does not support streaming i/o",
- self->device_name);
- return 0;
- }
-
- return 1;
-}
-
-int v4l_init_device(PyCameraObject* self)
-{
- return 0;
-}
-
-int v4l_start_capturing(PyCameraObject* self)
-{
- return 0;
-}
-#endif
programming/language/python/pygame/pspec.xml
+95
View File
@@ -0,0 +1,95 @@
<?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI>
<Source>
<Name>pygame</Name>
<Homepage>http://www.pygame.org/</Homepage>
<Packager>
<Name>PisiLinux Community</Name>
<Email>admins@pisilinux.org</Email>
</Packager>
<License>LGPLv2.1</License>
<IsA>library</IsA>
<Summary>Python game library</Summary>
<Description>Python bindings to sdl and other libs that facilitate game production.</Description>
<Archive sha1sum="1d72ac6262cf956d987f1b6db00606fb71d58b25" type="targz">https://github.com/pygame/pygame/archive/1.9.3.tar.gz</Archive>
<BuildDependencies>
<Dependency>libsdl-devel</Dependency>
<Dependency>sdl-mixer-devel</Dependency>
<Dependency>sdl-ttf-devel</Dependency>
<Dependency>sdl-image-devel</Dependency>
<Dependency>smpeg-devel</Dependency>
<Dependency>python-numpy</Dependency>
<Dependency>portmidi-devel</Dependency>
<Dependency>python-setuptools</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>python-devel</Dependency>
<Dependency>freetype-devel</Dependency>
</BuildDependencies>
<!--<Patches>
<Patch>config.patch</Patch>
<Patch level="1">pygame-1.9.1-config.patch</Patch>
<Patch level="1">pygame-1.9.1-no-test-install.patch</Patch>
<Patch level="1">pygame-1.9.1-porttime.patch</Patch>
<Patch level="1">pygame-remove-v4l.patch</Patch>
</Patches>-->
</Source>
<Package>
<Name>pygame</Name>
<RuntimeDependencies>
<Dependency>libsdl</Dependency>
<Dependency>sdl-mixer</Dependency>
<Dependency>sdl-ttf</Dependency>
<Dependency>sdl-image</Dependency>
<Dependency>smpeg</Dependency>
<Dependency>python-numpy</Dependency>
<Dependency>portmidi</Dependency>
<Dependency>libjpeg-turbo</Dependency>
<Dependency>libX11</Dependency>
<Dependency>libpng</Dependency>
<Dependency>python</Dependency>
<Dependency>freetype</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="library">/usr/lib</Path>
</Files>
</Package>
<Package>
<Name>pygame-doc</Name>
<RuntimeDependencies>
<Dependency release="current">pygame</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<History>
<Update release="3">
<Date>2018-05-09</Date>
<Version>1.9.3</Version>
<Comment>Rebuild and version bump</Comment>
<Name>Stefan Gronewold</Name>
<Email>groni@pisilinux.org</Email>
</Update>
<Update release="2">
<Date>2013-11-03</Date>
<Version>1.9.1</Version>
<Comment>Rebuild</Comment>
<Name>Burak Fazıl Ertürk</Name>
<Email>burakerturk@pisilinux.org</Email>
</Update>
<Update release="1">
<Date>2011-05-06</Date>
<Version>1.9.1</Version>
<Comment>First release</Comment>
<Name>Pisi Linux Admins</Name>
<Email>admins@pisilinux.org</Email>
</Update>
</History>
</PISI>
programming/language/python/pygame/translations.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" ?>
<PISI>
<Source>
<Name>pygame</Name>
<Summary xml:lang="tr">Python oyun kütüphanesi</Summary>
<Description xml:lang="tr">Özellikle oyun programlamada kullanılan sdl ve benzeri kütüphaneler için python eklentileri</Description>
<Description xml:lang="fr">Liens (bindings) Python pour dsl et autres librairies facilitant la création de jeux.</Description>
<Description xml:lang="es">Acceso con Python a sdl y otras librerías que facilitan produccion de juegos</Description>
</Source>
</PISI>