diff options
33 files changed, 848 insertions, 84 deletions
diff --git a/community-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD new file mode 100644 index 000000000..e91975d83 --- /dev/null +++ b/community-staging/smc/PKGBUILD @@ -0,0 +1,50 @@ +# $Id: PKGBUILD 73645 2012-07-12 13:48:41Z stativ $ +# Maintainer: +# Contributor: Juergen Hoetzel <juergen@archlinux.org> +# Contributor: Kritoke <typeolinux@yahoo.com> + +pkgname=smc +pkgver=1.9 +pkgrel=16 +pkgdesc="Secret Maryo Chronicles" +arch=('i686' 'x86_64') +url="http://www.secretmaryo.org/" +license=('GPL3') +depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data') +makedepends=('autoconf' 'automake' 'boost') +source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2 + smc-for-cegui-v0-7.diff + boost_filesystem3.diff + smc.desktop + smc.png) +md5sums=('75ab7826303c49aec25b052a8b90287f' + '51dfea21b741ad19df14e738df52f1cf' + '309a5a6d4b3c0b3dc5e1b7f4de84086f' + '80fe208132ff41dd7677a53ee429ecdb' + 'efca7580e28748625eb676c9d24ee122') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # to remove when smc will be compatible with cegui-0.7.x + patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff" + # fix compilation + export CXXFLAGS="${CXXFLAGS} -fpermissive" + # fix for boost >= 1.50 + patch -Np1 -i "${srcdir}/boost_filesystem3.diff" + + ./autogen.sh + LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make install DESTDIR="$pkgdir" + # install some freedesktop.org compatibility + install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + + rm -rf "$pkgdir/usr/share/smc/" +} diff --git a/community-staging/smc/boost_filesystem3.diff b/community-staging/smc/boost_filesystem3.diff new file mode 100644 index 000000000..6786b98f5 --- /dev/null +++ b/community-staging/smc/boost_filesystem3.diff @@ -0,0 +1,48 @@ +diff -rup smc-1.9/src/core/filesystem/filesystem.cpp smc-1.9.new/src/core/filesystem/filesystem.cpp +--- smc-1.9/src/core/filesystem/filesystem.cpp 2009-07-04 12:11:18.000000000 +0200 ++++ smc-1.9.new/src/core/filesystem/filesystem.cpp 2012-07-12 15:36:31.361941069 +0200 +@@ -142,27 +142,27 @@ vector<std::string> Get_Directory_Files( + if( fs::is_directory( *dir_itr ) ) + { + // ignore hidden directories +- if( dir_itr->path().leaf().find( "." ) == 0 ) ++ if( dir_itr->path().filename().string().find( "." ) == 0 ) + { + continue; + } + + if( with_directories ) + { +- valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); ++ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() ); + } + + // load all items from the sub-directory + if( search_in_sub_directories ) + { +- vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories ); ++ vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories ); + valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() ); + } + } + // valid file +- else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos ) ++ else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos ) + { +- valid_files.push_back( dir + "/" + dir_itr->path().leaf() ); ++ valid_files.push_back( dir + "/" + dir_itr->path().filename().string() ); + } + } + catch( const std::exception &ex ) +diff -rup smc-1.9/src/overworld/world_manager.cpp smc-1.9.new/src/overworld/world_manager.cpp +--- smc-1.9/src/overworld/world_manager.cpp 2009-08-16 18:44:52.000000000 +0200 ++++ smc-1.9.new/src/overworld/world_manager.cpp 2012-07-12 15:37:13.564660591 +0200 +@@ -118,7 +118,7 @@ void cOverworld_Manager :: Load_Dir( con + {
+ try
+ {
+- std::string current_dir = dir_itr->path().leaf();
++ std::string current_dir = dir_itr->path().filename().string();
+
+ // only directories with an existing description
+ if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
diff --git a/community-staging/smc/smc-for-cegui-v0-7.diff b/community-staging/smc/smc-for-cegui-v0-7.diff new file mode 100644 index 000000000..a99cbce6c --- /dev/null +++ b/community-staging/smc/smc-for-cegui-v0-7.diff @@ -0,0 +1,437 @@ +diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac +--- smc-1.9/configure.ac 2009-08-17 15:59:00.000000000 +0200 ++++ smc-1.9-b/configure.ac 2011-01-19 00:43:37.809884881 +0100 +@@ -53,7 +53,7 @@ + AC_MSG_ERROR([SDL_ttf library not found])) + + # Check for the CEGUI library +-PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0) ++PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0) + CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS" + LIBS="$LIBS $CEGUI_LIBS" + +diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp +--- smc-1.9/src/core/editor.cpp 2009-08-13 17:11:42.000000000 +0200 ++++ smc-1.9-b/src/core/editor.cpp 2011-01-19 00:44:46.734328121 +0100 +@@ -118,16 +118,10 @@ + return tmp;
+ }
+
+-void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
++void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
+ {
+ // draw text
+- list_text->draw( position, alpha, clipper );
+-}
+-
+-void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
+-{
+- // draw text
+- list_text->draw( cache, targetRect, zBase, alpha, clipper );
++ list_text->draw( buffer, targetRect, alpha, clipper );
+ }
+
+ void cEditor_Item_Object :: Draw_Image( void )
+@@ -533,12 +527,12 @@ + if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
+ {
+ // Listbox dimension
+- float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
+- float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
++ float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
++ float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
+ // Vertical ScrollBar Position
+ float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
+ // font height
+- float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
++ float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
+
+ // draw items
+ for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
+diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h +--- smc-1.9/src/core/editor.h 2009-02-18 05:21:30.000000000 +0100 ++++ smc-1.9-b/src/core/editor.h 2011-01-19 00:43:37.809884881 +0100 +@@ -62,8 +62,7 @@ + */
+ virtual CEGUI::Size getPixelSize( void ) const;
+ // draw
+- void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
+- void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
++ void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
+ // draw image
+ void Draw_Image( void );
+
+diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp +--- smc-1.9/src/core/game_core.cpp 2009-08-16 18:44:42.000000000 +0200 ++++ smc-1.9-b/src/core/game_core.cpp 2011-01-19 00:59:02.668958883 +0100 +@@ -265,7 +265,7 @@ +
+
+ // align text
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ // fixme : Can't handle multiple lines of text
+ float text_width = font->getTextExtent( text ) * global_downscalex;
+
+@@ -1182,7 +1182,7 @@ + text_default->setText( gui_text );
+
+ // align text
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ float text_width = font->getTextExtent( gui_text ) * global_downscalex;
+
+ text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
+@@ -1190,7 +1190,7 @@ + text_default->moveToFront();
+
+ // set window height
+- text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
++ text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
+
+ while( draw )
+ {
+diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp +--- smc-1.9/src/core/main.cpp 2009-05-12 10:36:04.000000000 +0200 ++++ smc-1.9-b/src/core/main.cpp 2011-01-19 00:43:37.809884881 +0100 +@@ -444,13 +444,15 @@ + + if( pGuiSystem ) + { +- delete pGuiSystem; ++ CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider(); ++ pGuiSystem->destroy(); + pGuiSystem = NULL; ++ delete rp; + } + + if( pGuiRenderer ) + { +- delete pGuiRenderer; ++ pGuiRenderer->destroy( *pGuiRenderer ); + pGuiRenderer = NULL; + } + +@@ -507,7 +509,7 @@ + } + case SDL_VIDEORESIZE: + { +- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); ++ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) ); + break; + } + case SDL_KEYDOWN: +diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp +--- smc-1.9/src/gui/hud.cpp 2009-05-01 15:00:16.000000000 +0200 ++++ smc-1.9-b/src/gui/hud.cpp 2011-01-19 00:43:37.816550365 +0100 +@@ -946,7 +946,7 @@ + m_text_debug_text->setVisible( 1 );
+
+ // update position
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ float text_width = font->getTextExtent( gui_text ) * global_downscalex;
+
+ if( text_width > 800.0f )
+diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp +--- smc-1.9/src/input/mouse.cpp 2009-04-24 21:16:58.000000000 +0200 ++++ smc-1.9-b/src/input/mouse.cpp 2011-01-19 00:43:37.813217623 +0100 +@@ -432,17 +432,12 @@ +
+ void cMouseCursor :: Render( void ) const
+ {
+- if( !m_active )
+- {
++ CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
++
++ if ( m_active == mouse->isVisible() )
+ return;
+- }
+
+- // Render CEGUI Mouse
+- pGuiRenderer->setQueueingEnabled( 0 );
+- CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
+- mouse->setVisible( 1 );
+- mouse->draw();
+- mouse->setVisible( 0 );
++ mouse->setVisible( m_active );
+ }
+
+ void cMouseCursor :: Update_Position( void )
+diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp +--- smc-1.9/src/level/level_settings.cpp 2009-08-07 03:04:28.000000000 +0200 ++++ smc-1.9-b/src/level/level_settings.cpp 2011-01-19 01:06:59.064259070 +0100 +@@ -163,8 +163,8 @@ + editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
+ // preview window
+ CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
+- background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
+- background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
++ background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
++ background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
+
+ Update_BG_Colors( CEGUI::EventArgs() );
+
+@@ -555,8 +555,8 @@ +
+ // set default rect
+ CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
+- background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
+- background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
++ background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
++ background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
+
+ if( !File_Exists( filename ) )
+ {
+diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp +--- smc-1.9/src/objects/sprite.cpp 2009-04-18 09:55:06.000000000 +0200 ++++ smc-1.9-b/src/objects/sprite.cpp 2011-01-19 00:43:37.813217623 +0100 +@@ -1663,7 +1663,7 @@ + window_name->setText( name );
+ window_name->setTooltipText( tooltip );
+ // get text width
+- CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
++ CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
+ float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
+ // all names should have the same width
+ if( text_width > m_editor_window_name_width )
+diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp +--- smc-1.9/src/video/video.cpp 2009-07-04 11:46:56.000000000 +0200 ++++ smc-1.9-b/src/video/video.cpp 2011-01-19 01:22:45.338524592 +0100 +@@ -103,15 +103,15 @@ +
+ /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
+
+-cFake_Renderer :: cFake_Renderer( void )
+-{
+- d_identifierString = "Fake Renderer";
+-}
++//cFake_Renderer :: cFake_Renderer( void )
++//{
++// d_identifierString = "Fake Renderer";
++//}
+
+-cFake_Renderer :: ~cFake_Renderer( void )
+-{
++//cFake_Renderer :: ~cFake_Renderer( void )
++//{
+
+-}
++//}
+
+ /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
+
+@@ -158,7 +158,7 @@ + std::string log_dump_dir = "/dev/null";
+ #endif
+ // create fake system and renderer
+- pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
++ pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
+ }
+
+ void cVideo :: Delete_CEGUI_Fake( void ) const
+@@ -166,7 +166,7 @@ + CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
+ CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
+
+- delete pGuiSystem;
++ pGuiSystem->destroy();
+ pGuiSystem = NULL;
+ delete renderer;
+ delete rp;
+@@ -177,7 +177,7 @@ + // create renderer
+ try
+ {
+- pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
++ pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
+ }
+ // catch CEGUI Exceptions
+ catch( CEGUI::Exception &ex )
+@@ -186,10 +186,10 @@ + exit( EXIT_FAILURE );
+ }
+
+- /* create Resource Provider
+- * no need to destroy it later since it is handled by the CEGUI renderer
+- */
+- CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
++ pGuiRenderer->enableExtraStateSettings(true);
++
++ // create Resource Provider
++ CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
+
+ // set Resource Provider directories
+ rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
+@@ -215,7 +215,7 @@ + // create system
+ try
+ {
+- pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
++ pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
+ }
+ // catch CEGUI Exceptions
+ catch( CEGUI::Exception &ex )
+@@ -242,7 +242,7 @@ + // load the scheme file, which auto-loads the imageset
+ try
+ {
+- CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
++ CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
+ }
+ // catch CEGUI Exceptions
+ catch( CEGUI::Exception &ex )
+@@ -254,9 +254,7 @@ + // default mouse cursor
+ pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
+ // force new mouse image
+- CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
+- // hide CEGUI mouse always because we render it manually
+- CEGUI::MouseCursor::getSingleton().hide();
++ CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
+ // default tooltip
+ pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
+ // create default root window
+@@ -553,7 +551,7 @@ + pFont->Restore_Textures();
+
+ // send new size to CEGUI
+- pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
++ pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
+
+ // check if CEGUI is initialized
+ bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
+diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h +--- smc-1.9/src/video/video.h 2009-07-04 10:49:50.000000000 +0200 ++++ smc-1.9-b/src/video/video.h 2011-01-19 01:16:42.791283379 +0100 +@@ -23,7 +23,7 @@ + #include "SDL_opengl.h"
+ // CEGUI
+ #include "CEGUI.h"
+-#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
++#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
+
+ namespace SMC
+ {
+@@ -129,31 +129,100 @@ + EFFECT_IN_AMOUNT
+ };
+
+-/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
++/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
++// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
++class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
++{
++ void draw() const {}
++ void setTranslation(const CEGUI::Vector3&) {}
++ void setRotation(const CEGUI::Vector3&) {}
++ void setPivot(const CEGUI::Vector3&) {}
++ void setClippingRegion(const CEGUI::Rect&) {}
++ void appendVertex(const CEGUI::Vertex&) {}
++ void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
++ void setActiveTexture(CEGUI::Texture*) {}
++ void reset() {}
++ CEGUI::Texture* getActiveTexture() const { return 0; }
++ CEGUI::uint getVertexCount() const { return 0; }
++ CEGUI::uint getBatchCount() const { return 0; }
++ void setRenderEffect(CEGUI::RenderEffect*) {}
++ CEGUI::RenderEffect* getRenderEffect() { return 0; }
++};
+
+-class cFake_Renderer : public CEGUI::Renderer
++class cFake_Texture : public CEGUI::Texture
++{
++public:
++ cFake_Texture() :
++ m_size(1, 1),
++ m_scaling(1, 1) {}
++
++ const CEGUI::Size& getSize() const { return m_size; }
++ const CEGUI::Size& getOriginalDataSize() const { return m_size; }
++ const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
++ void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
++ void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
++ void saveToMemory(void*) {}
++
++private:
++ CEGUI::Size m_size;
++ CEGUI::Vector2 m_scaling;
++};
++
++class cFake_RenderTarget : public CEGUI::RenderTarget
+ {
+ public:
+- cFake_Renderer( void );
+- virtual ~cFake_Renderer( void );
++ cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
++ void draw(const CEGUI::GeometryBuffer&) {}
++ void draw(const CEGUI::RenderQueue&) {}
++ void setArea(const CEGUI::Rect&) {}
++ const CEGUI::Rect& getArea() const { return m_area; }
++ bool isImageryCache() const { return false; }
++ void activate() {}
++ void deactivate() {}
++ void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
++
++private:
++ CEGUI::Rect m_area;
++};
+
+- virtual void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
+- virtual void doRender(void) {};
+- virtual void clearRenderList(void) {};
+- virtual void setQueueingEnabled(bool setting) {};
+- virtual CEGUI::Texture *createTexture(void) { return NULL; };
+- virtual CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
+- virtual CEGUI::Texture *createTexture(float size) { return NULL; };
+- virtual void destroyTexture(CEGUI::Texture* texture) {};
+- virtual void destroyAllTextures(void) {};
+- virtual bool isQueueingEnabled(void) const { return 0; };
+- virtual float getWidth(void) const { return 0; };
+- virtual float getHeight(void) const { return 0; };
+- virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
+- virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
+- virtual unsigned int getMaxTextureSize(void) const { return 0; };
+- virtual unsigned int getHorzScreenDPI(void) const { return 0; };
+- virtual unsigned int getVertScreenDPI(void) const { return 0; };
++class cFake_Renderer : public CEGUI::Renderer
++{
++public:
++ cFake_Renderer( void ) :
++ m_size(0, 0),
++ m_dpi(0, 0),
++ m_identifierString("Fake Renderer"),
++ m_root(m_target) {}
++ ~cFake_Renderer( void ) {}
++
++ CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
++ CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
++ void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
++ void destroyAllGeometryBuffers() {}
++ CEGUI::TextureTarget* createTextureTarget() { return 0; }
++ void destroyTextureTarget(CEGUI::TextureTarget*) {}
++ void destroyAllTextureTargets() {}
++ CEGUI::Texture& createTexture() { return m_texture; }
++ CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
++ CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
++ void destroyTexture(CEGUI::Texture&) {}
++ void destroyAllTextures() {}
++ void beginRendering() {}
++ void endRendering() {}
++ void setDisplaySize(const CEGUI::Size&) {}
++ const CEGUI::Size& getDisplaySize() const { return m_size; }
++ const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
++ CEGUI::uint getMaxTextureSize() const { return 0; }
++ const CEGUI::String& getIdentifierString() const { return m_identifierString; }
++
++private:
++ CEGUI::Size m_size;
++ CEGUI::Vector2 m_dpi;
++ CEGUI::String m_identifierString;
++ cFake_GeometryBuffer m_geometry;
++ cFake_Texture m_texture;
++ cFake_RenderTarget m_target;
++ CEGUI::RenderingRoot m_root;
+ };
+
+ /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community-staging/smc/smc.desktop b/community-staging/smc/smc.desktop new file mode 100644 index 000000000..6cfe5b018 --- /dev/null +++ b/community-staging/smc/smc.desktop @@ -0,0 +1,9 @@ +[Desktop Entry]
+Name=Secret Maryo Chronicles
+GenericName=Arcade Game
+Exec=smc
+Icon=smc.png
+Terminal=false
+Type=Application
+Categories=Game;ArcadeGame;KidsGame;
+StartupNotify=false
\ No newline at end of file diff --git a/community-staging/smc/smc.png b/community-staging/smc/smc.png Binary files differnew file mode 100644 index 000000000..f02af1bfc --- /dev/null +++ b/community-staging/smc/smc.png diff --git a/community/avr-gdb/PKGBUILD b/community/avr-gdb/PKGBUILD new file mode 100644 index 000000000..ba22c2407 --- /dev/null +++ b/community/avr-gdb/PKGBUILD @@ -0,0 +1,50 @@ +# Maintainer: schuay <jakob.gruber@gmail.com> +# Contributor: Ivan Sichmann Freitas <ivansichfreitas at gmail dot com> +# Contributor: Laszlo Papp <djszapi2 at gmail dot com> +# Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> +# Contributor: Vladimir Cerny <blackvladimir@gmail.com> +# Contributor: 4javier <4javieregATgmailDOTcom> + +pkgname=avr-gdb +_pkgname=gdb +pkgver=7.4 +pkgrel=1 +pkgdesc="The GNU Debugger for AVR" +arch=('i686' 'x86_64') +url="http://www.gnu.org/software/gdb/" +license=('GPL3') +depends=('python') +options=('!libtool') +source=(http://ftp.gnu.org/gnu/gdb/${_pkgname}-${pkgver}.tar.bz2) +md5sums=('95a9a8305fed4d30a30a6dc28ff9d060') + +build() { + cd ${srcdir}/${_pkgname}-${pkgver} + + unset LDFLAGS + export CFLAGS="-O2 -pipe" + export CXXFLAGS="$CFLAGS" + + ./configure --prefix=/usr \ + --target=avr \ + --disable-nls \ + --enable-languages=c,c++ \ + --infodir=/usr/share/info \ + --libdir=/usr/lib \ + --program-prefix=avr- \ + --libexecdir=/usr/lib \ + --mandir=/usr/share/man \ + --with-system-readline + make +} + +package() { + cd ${srcdir}/${_pkgname}-${pkgver} + + make DESTDIR=${pkgdir} install + + rm -f ${pkgdir}/usr/lib/libiberty.a + rm -rf ${pkgdir}/usr/share/info + rm -rf ${pkgdir}/usr/share/gdb + rm -rf ${pkgdir}/usr/include/gdb +} diff --git a/community/geany-plugins/PKGBUILD b/community/geany-plugins/PKGBUILD index ec2a6626a..dd349c8d6 100644 --- a/community/geany-plugins/PKGBUILD +++ b/community/geany-plugins/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 72667 2012-06-18 20:30:29Z arodseth $ +# $Id: PKGBUILD 73662 2012-07-12 20:54:20Z arodseth $ # Maintainer: Alexander Rødseth <rodseth@gmail.com> # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> # Contributor: djgera # Contributor: Patrick Melo <patrick@patrickmelo.eti.br> pkgname=geany-plugins -pkgver=0.21.1 -pkgrel=2 +pkgver=1.22 +pkgrel=1 pkgdesc="Combined plugins release for Geany" arch=('x86_64' 'i686') url="http://plugins.geany.org/" @@ -16,7 +16,7 @@ makedepends=('intltool') optdepends=('hspell: hebrew spell checker') install=geany-plugins.install source=("http://plugins.geany.org/geany-plugins/$pkgname-$pkgver.tar.bz2") -sha256sums=('3a4bd29e690067ca5b97c11a74ea95ad0c960e5d45b205756c1f9e1f0f2847a6') +sha256sums=('a0dcf0cb00ac260670ef8fae682aade60c7c3075c88121fd21f3aecdff84e1ce') build() { cd "$srcdir/$pkgname-$pkgver" @@ -29,11 +29,6 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir" install - rmdir \ - "$pkgdir/usr/share/geany-plugins/devhelp" \ - "$pkgdir/usr/share/doc/geany-plugins/devhelp" \ - "$pkgdir/usr/share/geany-plugins/debugger" \ - "$pkgdir/usr/share/doc/geany-plugins/debugger" } # vim:set ts=2 sw=2 et: diff --git a/community/i2c-tools/PKGBUILD b/community/i2c-tools/PKGBUILD new file mode 100644 index 000000000..679dad5ca --- /dev/null +++ b/community/i2c-tools/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 73640 2012-07-12 13:05:49Z tredaelli $ +# Maintainer: Timothy Redaelli <timothy.redaelli@gmail.com> +# Contributor: DonVla <donvla@users.sourceforge.net> + +pkgname=i2c-tools +pkgver=3.1.0 +pkgrel=3 +pkgdesc="Heterogeneous set of I2C tools for Linux that used to be part of lm-sensors" +arch=('i686' 'x86_64') +url="http://www.lm-sensors.org/wiki/I2CTools" +license=('GPL') +depends=('python2') +optdepends=('read-edid: for decode-edid script') +source=(http://dl.lm-sensors.org/${pkgname}/releases/${pkgname}-${pkgver}.tar.bz2) +md5sums=('f15019e559e378c6e9d5d6299a00df21') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + make + make -C eepromer CFLAGS="$CFLAGS -I../include" + cd py-smbus + CPPFLAGS="$CPPFLAGS -I../include" python2 setup.py build +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make prefix="${pkgdir}/usr" install + install -Dm755 eepromer/eeprog eepromer/eeprom eepromer/eepromer "${pkgdir}/usr/sbin" + cd py-smbus + python2 setup.py install --prefix "${pkgdir}/usr" + rm -rf "${pkgdir}/usr/include" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/kdenlive/PKGBUILD b/community/kdenlive/PKGBUILD index 853d1c499..d547101ce 100644 --- a/community/kdenlive/PKGBUILD +++ b/community/kdenlive/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 71628 2012-05-31 14:14:16Z spupykin $ +# $Id: PKGBUILD 73620 2012-07-12 08:51:08Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Zuf <kontakt.zuf@gmail.com> # Contributor: Darwin Bautista <djclue917@gmail.com> pkgname=kdenlive pkgver=0.9.2 -pkgrel=1 +pkgrel=2 pkgdesc="A non-linear video editor for Linux" arch=('i686' 'x86_64') # http://download.kde.org/stable/kdenlive/ diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD index 059802ff6..255bb7c56 100644 --- a/community/leptonica/PKGBUILD +++ b/community/leptonica/PKGBUILD @@ -1,15 +1,16 @@ -# $Id: PKGBUILD 73532 2012-07-09 08:57:53Z spupykin $ +# $Id: PKGBUILD 73623 2012-07-12 09:07:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Christoph Drexler <chrdr at gmx dot at> pkgname=leptonica pkgver=1.69 -pkgrel=1 +pkgrel=2 pkgdesc="Software that is broadly useful for image processing and image analysis applications" arch=('i686' 'x86_64') url="http://www.leptonica.com/" license=('custom') -depends=('giflib' 'gnuplot' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp') +options=(!libtool) +depends=('giflib' 'libjpeg' 'libpng' 'libtiff' 'zlib' 'libwebp') source=(http://www.leptonica.com/source/leptonica-${pkgver}.tar.gz) md5sums=('d4085c302cbcab7f9af9d3d6f004ab22') diff --git a/community/libdlna/PKGBUILD b/community/libdlna/PKGBUILD index ea6c6a2d7..d72ab5531 100644 --- a/community/libdlna/PKGBUILD +++ b/community/libdlna/PKGBUILD @@ -1,31 +1,27 @@ -# $Id: PKGBUILD 58580 2011-11-15 20:11:36Z spupykin $ +# $Id: PKGBUILD 73658 2012-07-12 19:03:11Z spupykin $ # Maintainer: Kessia 'even' Pinheiro <kessiapinheiro at gmail.com> # Contributor: kastor <kastor@fobos.org.ar> pkgname=libdlna -pkgver=0.2.3 -pkgrel=10 +pkgver=0.2.4 +pkgrel=11 pkgdesc="An open-source implementation of DLNA (Digital Living Network Alliance) standards " url="http://libdlna.geexbox.org" license=("LGPL") arch=('i686' 'x86_64') options=('!libtool' '!makeflags') # not parallel safe, error find -ldlna -makedepends=('ctags') +#makedepends=('ctags') depends=('glibc' 'ffmpeg') -source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2" "libdlna-0.2.3-libavcodec-libavformat-include-paths.patch" "ffmpeg-0.8.patch") -md5sums=('2c974f95b711e5fd07f78fc4ebfcca66' - '937f1aebf930571127856056bd1d3959' - 'a5c9f58233fc7fc79b5fe550b297273b') +source=("http://libdlna.geexbox.org/releases/${pkgname}-${pkgver}.tar.bz2") +md5sums=('64d7de57aff5a729f2434fc5e69b4ffc') build() { cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i $srcdir/libdlna-0.2.3-libavcodec-libavformat-include-paths.patch - patch -Np1 -i $srcdir/ffmpeg-0.8.patch - ./configure --prefix=/usr --includedir=/usr/include/libavformat - make -j1 # not parallel safe, error find -ldlna + ./configure --prefix=/usr + make } package() { cd ${srcdir}/${pkgname}-${pkgver} - make INSTALL=/bin/install DESTDIR=${pkgdir} install + make DESTDIR=${pkgdir} install } diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD index cadb09300..7466e57c2 100644 --- a/community/percona-server/PKGBUILD +++ b/community/percona-server/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71873 2012-06-02 15:23:50Z mtorromeo $ +# $Id: PKGBUILD 73641 2012-07-12 13:35:50Z mtorromeo $ # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com> pkgname=percona-server pkgver=5.5.24_rel26.0 -pkgrel=1 +pkgrel=3 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server" arch=('i686' 'x86_64') @@ -20,7 +20,10 @@ backup=('etc/mysql/my.cnf') install=percona.install source=("http://www.percona.com/downloads/Percona-Server-${pkgver%.*_*}/Percona-Server-${pkgver/_rel/-}/source/Percona-Server-${pkgver/_/-}.tar.gz" 'mysqld' - 'my.cnf') + 'my.cnf' + 'mysqld-post' + 'mysqld.service' + 'tmpfiles.conf') build() { cd "${srcdir}/Percona-Server-${pkgver/_/-}" @@ -97,8 +100,15 @@ package() { rm "${pkgdir}"/usr/share/man/man1/mysql-test-run.pl.1 install -dm700 "${pkgdir}"/var/lib/mysql + + install -Dm644 "$srcdir/tmpfiles.conf" "$pkgdir/usr/lib/tmpfiles.d/mysqld.conf" + install -Dm644 "$srcdir/mysqld.service" "$pkgdir/usr/lib/systemd/system/mysqld.service" + install -Dm755 "$srcdir/mysqld-post" "$pkgdir/usr/bin/mysqld-post" } md5sums=('76f835e98ad3c71fcaa33794ee187630' '243864805611764a7e5883c1dba7afd8' - '1c949c0dbea5206af0db14942d9927b6') + '1c949c0dbea5206af0db14942d9927b6' + '5143dadeaac15f1ff88ea16716588554' + 'e2e21a54c1aa1d6ab83a3dd0629aac52' + '7af72b49f943bd52defce8bc4e804e64') diff --git a/community/percona-server/mysqld-post b/community/percona-server/mysqld-post new file mode 100644 index 000000000..8c404f4c4 --- /dev/null +++ b/community/percona-server/mysqld-post @@ -0,0 +1,6 @@ +#!/bin/sh +while true; do + response=`/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1` && break + echo "$response" | grep -q "mysqld is alive" && break + sleep 1 +done diff --git a/community/percona-server/mysqld.service b/community/percona-server/mysqld.service new file mode 100644 index 000000000..15802b226 --- /dev/null +++ b/community/percona-server/mysqld.service @@ -0,0 +1,21 @@ +[Unit] +Description=MySQL database server +After=syslog.target network.target + +[Service] +User=mysql +Group=mysql + +ExecStart=/usr/bin/mysqld --pid-file=/var/run/mysqld/mysqld.pid +ExecStop=/bin/kill -15 $MAINPID +PIDFile=/var/run/mysqld/mysqld.pid +WorkingDirectory=/usr + +# We rely on systemd, not mysqld_safe, to restart mysqld if it dies +Restart=always + +# Place temp files in a secure directory, not /tmp +PrivateTmp=true + +[Install] +WantedBy=multi-user.target diff --git a/community/percona-server/tmpfiles.conf b/community/percona-server/tmpfiles.conf new file mode 100644 index 000000000..d621cd9df --- /dev/null +++ b/community/percona-server/tmpfiles.conf @@ -0,0 +1 @@ +d /var/run/mysqld 0755 mysql mysql -
\ No newline at end of file diff --git a/community/pv/PKGBUILD b/community/pv/PKGBUILD index 8d7b5cfac..c39a359f0 100644 --- a/community/pv/PKGBUILD +++ b/community/pv/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 73006 2012-06-27 20:22:20Z lfleischer $ +# $Id: PKGBUILD 73617 2012-07-12 05:30:42Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=pv -pkgver=1.3.1 +pkgver=1.3.4 pkgrel=1 pkgdesc='A terminal-based tool for monitoring the progress of data through a pipeline.' arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ url='http://www.ivarch.com/programs/pv.shtml' license=('custom:Artistic 2.0') depends=('glibc') source=("http://www.ivarch.com/programs/sources/$pkgname-$pkgver.tar.bz2") -md5sums=('4ca3b00c92e4c79045ca2d056fb77f40') +md5sums=('8041eac8a2942ef11ce6c7559cc4fb0a') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/community/virtviewer/PKGBUILD b/community/virtviewer/PKGBUILD index d4cd88bc5..f43651287 100644 --- a/community/virtviewer/PKGBUILD +++ b/community/virtviewer/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 64445 2012-02-13 15:08:55Z spupykin $ +# $Id: PKGBUILD 73649 2012-07-12 13:51:32Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Jonathan Wiersma <archaur at jonw dot org> pkgname=virtviewer -pkgver=0.4.2 +pkgver=0.5.3 pkgrel=1 pkgdesc="A lightweight interface for interacting with the graphical display of virtualized guest OS." depends=('gtk-vnc' 'libglade>=2.6.0' 'libvirt') @@ -12,11 +12,11 @@ url="http://virt-manager.et.redhat.com" arch=('i686' 'x86_64') license=('GPL') source=("http://virt-manager.et.redhat.com/download/sources/virt-viewer/virt-viewer-$pkgver.tar.gz") -md5sums=('4fc003cb655aa45b77c9f2ee45ba6d4f') +md5sums=('69a7c6d5cbd23d478396da4883567261') build() { cd $srcdir/virt-viewer-$pkgver - export LDFLAGS=-lX11 +# export LDFLAGS=-lX11 ./configure --prefix=/usr make make DESTDIR=$pkgdir install diff --git a/extra/gnome-screensaver/PKGBUILD b/extra/gnome-screensaver/PKGBUILD index a7e1c99d5..8d245b7b4 100644 --- a/extra/gnome-screensaver/PKGBUILD +++ b/extra/gnome-screensaver/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162983 2012-07-04 16:51:30Z ibiru $ +# $Id: PKGBUILD 163480 2012-07-12 19:58:42Z ibiru $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=gnome-screensaver -pkgver=3.4.2 +pkgver=3.4.3 pkgrel=1 pkgdesc="Screensaver designed to integrate well with the GNOME desktop." arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ options=(!emptydirs) install=gnome-screensaver.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz gnome-screensaver.pam) -sha256sums=('17e6585e27019200dd059f9f9495427b64aded8efa51c71018fe66f9ba45df6d' +sha256sums=('76bea2526c6065e5d182e23fda8e75eb2e0afe9d1d40301b019a3cfc39d95a3e' 'c19870c4f2d6e91ba0eea2603753a74e0c5c82ff5fa3cacb1198027a38d0a6cb') build() { diff --git a/extra/hyphen/PKGBUILD b/extra/hyphen/PKGBUILD index c73032877..05a453a1c 100644 --- a/extra/hyphen/PKGBUILD +++ b/extra/hyphen/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 162738 2012-06-29 10:59:41Z andyrtr $ +# $Id: PKGBUILD 163474 2012-07-12 19:03:03Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> pkgbase=hyphen pkgname=('hyphen' 'hyphen-en') -pkgver=2.8.4 +pkgver=2.8.5 pkgrel=1 arch=('i686' 'x86_64') url="http://hunspell.sf.net" license=('GPL' 'LGPL' 'MPL') -groups=() makedepends=('glibc' 'perl') options=('!libtool') source=(http://downloads.sourceforge.net/hunspell/${pkgname}-${pkgver}.tar.gz) -md5sums=('a2f6010987e1c601274ab5d63b72c944') +md5sums=('15cf1c2e54869fefcdc4b8f9cca68633') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 9dad0740b..4903f12db 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161903 2012-06-16 12:11:28Z ibiru $ +# $Id: PKGBUILD 163468 2012-07-12 16:40:51Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> @@ -13,9 +13,9 @@ if [ "${_git}" = "true" ]; then pkgver=7.10.99.git20110709 #pkgver=7.11 else - pkgver=8.0.3 + pkgver=8.0.4 fi -pkgrel=3 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') @@ -35,7 +35,7 @@ if [ "${_git}" = "true" ]; then fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' 'c452ed3392468170726c004c2f4e02ca' - 'cc5ee15e306b8c15da6a478923797171') + 'd546f988adfdf986cff45b1efa2d8a46') build() { cd ${srcdir}/?esa-* diff --git a/extra/nettle/PKGBUILD b/extra/nettle/PKGBUILD index 2509d8bb0..2e9f8c08e 100644 --- a/extra/nettle/PKGBUILD +++ b/extra/nettle/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 140462 2011-10-15 08:19:09Z andyrtr $ +# $Id: PKGBUILD 163476 2012-07-12 19:05:48Z andyrtr $ # Maintainer: Andreas Radke <andyrtr@archlinux.org> # Contributor: bender02 at gmx dot com pkgname=nettle -pkgver=2.4 +pkgver=2.5 pkgrel=1 pkgdesc="A low-level cryptographic library" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('GPL2') install=$pkgname.install depends=('gmp') source=(ftp://ftp.lysator.liu.se/pub/security/lsh/$pkgname-$pkgver.tar.gz) -md5sums=(''450be8c4886d46c09f49f568ad6fa013'') +md5sums=('d66882e6ad31a9f651b73d7a1a93bd4c') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/nouveau-dri/PKGBUILD b/extra/nouveau-dri/PKGBUILD index e4066e945..ad1daa62a 100644 --- a/extra/nouveau-dri/PKGBUILD +++ b/extra/nouveau-dri/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161906 2012-06-16 12:11:45Z ibiru $ +# $Id: PKGBUILD 163472 2012-07-12 17:49:23Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgname=nouveau-dri -pkgver=8.0.3 -pkgrel=3 +pkgver=8.0.4 +pkgrel=1 arch=('i686' 'x86_64') makedepends=('glproto>=1.4.15' 'libdrm-old' 'libdrm-nouveau1' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1' 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183') @@ -16,7 +16,7 @@ source=(LICENSE ) md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' 'c452ed3392468170726c004c2f4e02ca' - 'cc5ee15e306b8c15da6a478923797171') + 'd546f988adfdf986cff45b1efa2d8a46') build() { cd ${srcdir}/?esa-* diff --git a/extra/stardict/PKGBUILD b/extra/stardict/PKGBUILD index 8ce7a50e8..09b9aa4d5 100644 --- a/extra/stardict/PKGBUILD +++ b/extra/stardict/PKGBUILD @@ -1,31 +1,37 @@ -# $Id: PKGBUILD 131980 2011-07-18 15:27:26Z bisson $ -# Maintainer: Aaron Griffin <aaron@archlinux.org> +# $Id: PKGBUILD 163464 2012-07-12 12:42:33Z bisson $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Aaron Griffin <aaron@archlinux.org> # Contributor: Neil Lin <neil@vip.url.com.tw> pkgname=stardict pkgver=3.0.3 -pkgrel=1 +pkgrel=2 pkgdesc='International dictionary software' arch=('i686' 'x86_64') url='http://www.stardict.org/' license=('GPL') depends=('enchant' 'gtk2' 'libsigc++' 'libsm') -makedepends=('intltool' 'popt' 'gnome-doc-utils' 'libmysqlclient') +makedepends=('intltool' 'popt' 'gnome-doc-utils' 'gnome-common' 'libmysqlclient') options=('!libtool' '!emptydirs') source=("http://stardict-3.googlecode.com/files/stardict-${pkgver}.tar.bz2" - 'NetDictRequests.patch' - 'gcc46.patch') + 'crash-empty-dict.patch' + 'gcc46.patch' + 'glib2.patch' + 'zlib.patch') sha1sums=('5043c0918963cd4d40e6d6289353f295766ec74f' '97af8fdb73c8f04674234b629c6867254e9bd043' - '6605a9cdfc4abc2a0ab4462d1228233d34806f0a') + '6605a9cdfc4abc2a0ab4462d1228233d34806f0a' + '467880bca5e89aa25cb4a57a9e1caba9a8841822' + '024ac5eb75a11c96569e31021a4bd65463b3cf5b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - # ugly hack to avoid crashing with empty dictionaries - patch -p1 -i ../NetDictRequests.patch + patch -p1 -i ../crash-empty-dict.patch patch -p1 -i ../gcc46.patch - automake + patch -p1 -i ../glib2.patch + patch -p1 -i ../zlib.patch + ./autogen.sh # gnome-autogen.sh requires gnome-common ./configure \ PKG_CONFIG=/usr/bin/pkg-config \ diff --git a/extra/stardict/crash-empty-dict.patch b/extra/stardict/crash-empty-dict.patch new file mode 100644 index 000000000..4d6fe145a --- /dev/null +++ b/extra/stardict/crash-empty-dict.patch @@ -0,0 +1,12 @@ +diff -aur old/dict/src/lib/compositelookup.cpp new/dict/src/lib/compositelookup.cpp +--- old/dict/src/lib/compositelookup.cpp 2011-07-02 23:58:40.000000000 -0700 ++++ new/dict/src/lib/compositelookup.cpp 2011-07-18 07:40:01.795710505 -0700 +@@ -50,7 +50,7 @@ + void CompositeLookup::send_net_dict_request(const std::string& dict_id, const std::string& key) + { + NetDictRequest request(dict_id, key); +- g_assert(NetDictRequests.end() == std::find(NetDictRequests.begin(), NetDictRequests.end(), request)); ++ std::find(NetDictRequests.begin(), NetDictRequests.end(), request); + NetDictRequests.push_back(request); + } + diff --git a/extra/stardict/glib2.patch b/extra/stardict/glib2.patch new file mode 100644 index 000000000..6296dab0d --- /dev/null +++ b/extra/stardict/glib2.patch @@ -0,0 +1,36 @@ +diff -Naur old/dict/configure.ac new/dict/configure.ac +--- old/dict/configure.ac 2011-07-03 16:58:40.000000000 +1000 ++++ new/dict/configure.ac 2012-07-12 22:31:52.875176842 +1000 +@@ -266,6 +266,9 @@ + fi + AC_SUBST(WIKI_PARSEDATA_PLUGIN_DIR) + ++GMODULE2_LIBS=`pkg-config --libs gmodule-2.0` ++AC_SUBST([GMODULE2_LIBS]) ++ + dnl ================================================================ + dnl main program checks. + dnl ================================================================ +diff -Naur old/dict/src/Makefile.am new/dict/src/Makefile.am +--- old/dict/src/Makefile.am 2011-07-03 16:58:40.000000000 +1000 ++++ new/dict/src/Makefile.am 2012-07-12 22:29:53.714870692 +1000 +@@ -33,7 +33,7 @@ + stardict_DEPENDENCIES = lib/libstardict.la $(LOCAL_SIGCPP_LIBFILE) + stardict_LDFLAGS = + ## place libstardict.la before any system library, otherwise build with --as-needed linker option may fail +-stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) ++stardict_LDADD = lib/libstardict.la $(STARDICT_LIBS) $(LOCAL_SIGCPP_LIBFILE) $(GMODULE2_LIBS) + + if !GNOME_SUPPORT + if MAEMO_SUPPORT +diff -Naur old/dict/src/tomboykeybinder.h new/dict/src/tomboykeybinder.h +--- old/dict/src/tomboykeybinder.h 2011-07-03 16:58:40.000000000 +1000 ++++ new/dict/src/tomboykeybinder.h 2012-07-12 22:28:04.337920391 +1000 +@@ -21,7 +21,6 @@ + #ifndef __TOMBOY_KEY_BINDER_H__ + #define __TOMBOY_KEY_BINDER_H__ + +-#include <glib/gtypes.h> + + G_BEGIN_DECLS + diff --git a/extra/stardict/zlib.patch b/extra/stardict/zlib.patch new file mode 100644 index 000000000..eb5a9a12a --- /dev/null +++ b/extra/stardict/zlib.patch @@ -0,0 +1,35 @@ +diff -Naur old/lib/src/libcommon.cpp new/lib/src/libcommon.cpp +--- old/lib/src/libcommon.cpp 2012-07-12 11:33:30.343333334 +0000 ++++ new/lib/src/libcommon.cpp 2012-07-12 11:34:05.006568754 +0000 +@@ -614,7 +614,7 @@ + return EXIT_FAILURE; + } + while(true) { +- len = gzread(get_impl(in), buf, buffer_size); ++ len = gzread((gzFile)get_impl(in), buf, buffer_size); + if(len < 0) { + g_critical(read_file_err, arch_file_name, ""); + return EXIT_FAILURE; +@@ -871,3 +871,8 @@ + return res; + } + } ++ ++int gzclose_compat(void * file) ++{ ++ return gzclose ((gzFile)file); ++} +diff -Naur old/lib/src/libcommon.h new/lib/src/libcommon.h +--- old/lib/src/libcommon.h 2012-07-12 11:33:30.343333334 +0000 ++++ new/lib/src/libcommon.h 2012-07-12 11:34:05.006568754 +0000 +@@ -187,8 +187,9 @@ + typedef ResourceWrapper<FILE, FILE*, int, fclose> File; + } + ++extern int gzclose_compat(void * file); + namespace zip { +-typedef ResourceWrapper<void, void*, int, gzclose> gzFile; ++typedef ResourceWrapper<void, void*, int, gzclose_compat> gzFile; + } + + /* Create a new temporary file. Return file name in file name encoding. diff --git a/extra/xf86-input-wacom/PKGBUILD b/extra/xf86-input-wacom/PKGBUILD index 07fabd1ee..8e81fe712 100644 --- a/extra/xf86-input-wacom/PKGBUILD +++ b/extra/xf86-input-wacom/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 158905 2012-05-12 20:58:34Z andyrtr $ +# $Id: PKGBUILD 163478 2012-07-12 19:09:28Z andyrtr $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: M Rawash <mrawash@gmail.com> pkgname=xf86-input-wacom -pkgver=0.15.0 +pkgver=0.16.0 pkgrel=1 pkgdesc="X.Org Wacom tablet driver" arch=('i686' 'x86_64') @@ -17,8 +17,8 @@ conflicts=('xorg-server<1.12.0') options=(!libtool) source=(http://downloads.sourceforge.net/project/linuxwacom/${pkgname}/${pkgname}-${pkgver}.tar.bz2 70-wacom.rules) -sha1sums=('6e8e4fa2ccc2448cae97119c6f2842fe283f9b29' - '7cebb94459f9cf49693e65215f3af59cea5e2b73') +md5sums=('aeee2bd339c825a9b1215df6a2e5e50b' + '10db4f8272286690255c1bcc18bfdd92') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/multilib/lib32-mpg123/PKGBUILD b/multilib/lib32-mpg123/PKGBUILD index c247d9a15..34e052fa2 100644 --- a/multilib/lib32-mpg123/PKGBUILD +++ b/multilib/lib32-mpg123/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70685 2012-05-14 16:36:45Z bluewind $ +# $Id: PKGBUILD 73656 2012-07-12 17:46:35Z svenstaro $ # Maintainer: Hugo Doria <hugo@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> _pkgbasename=mpg123 pkgname=lib32-$_pkgbasename -pkgver=1.14.2 -pkgrel=1 +pkgver=1.14.3 +pkgrel=2 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3 (32-bit)" arch=('x86_64') url="http://sourceforge.net/projects/mpg123" @@ -15,7 +15,7 @@ makedepends=('lib32-sdl' gcc-multilib libtool-multilib) optdepends=('lib32-sdl: for additional audio support') options=('libtool') source=(http://downloads.sourceforge.net/sourceforge/${_pkgbasename}/${_pkgbasename}-${pkgver}.tar.bz2) -md5sums=('70ccfc51fc9f7f1c776ae8cf611f6be3') +md5sums=('443473ffae67b57bbf95c8ed63f0c7c9') build() { export CC="gcc -m32" diff --git a/testing/iputils/PKGBUILD b/testing/iputils/PKGBUILD index f5c5d4e3c..6b5348b45 100644 --- a/testing/iputils/PKGBUILD +++ b/testing/iputils/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162019 2012-06-18 20:29:20Z stephane $ +# $Id: PKGBUILD 163462 2012-07-12 10:24:03Z stephane $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Maintainer: Tobias Powalowski <tpowa@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=iputils pkgver=20101006 -pkgrel=3 +pkgrel=4 pkgdesc="IP Configuration Utilities (and Ping)" arch=('i686' 'x86_64') license=('GPL') @@ -18,9 +18,11 @@ conflicts=('netkit-base' 'arping' 'netkit-tftpd') replaces=('netkit-base') backup=(etc/xinetd.d/tftp) install=${pkgname}.install -source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd) +source=(http://www.skbuff.net/${pkgname}/${pkgname}-s${pkgver}.tar.bz2 tftp.xinetd + iputils-20101006-ping-integer-overflow.patch) sha1sums=('a08cc5423a7bf940205f2353fe3d129cd39ff242' - 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd') + 'fc2ae26f5609725e3f4aeaf4ab82dfa6d2e378fd' + 'ec78574d798b53e4f8bdd37e42514fc17ed71667') build() { cd "${srcdir}/${pkgname}-s${pkgver}" @@ -28,6 +30,9 @@ build() { # Use our CFLAGS sed -i -e "/^CCOPT=/s|-O2|${CFLAGS}|" Makefile + # FS#28897 + patch -Np1 -i ../iputils-20101006-ping-integer-overflow.patch + make cd doc diff --git a/testing/iputils/iputils-20101006-ping-integer-overflow.patch b/testing/iputils/iputils-20101006-ping-integer-overflow.patch new file mode 100644 index 000000000..720e5e888 --- /dev/null +++ b/testing/iputils/iputils-20101006-ping-integer-overflow.patch @@ -0,0 +1,11 @@ +--- iputils-s20101006/ping_common.c 2010-10-06 13:59:20.000000000 +0200 ++++ iputils-s20101006-patched/ping_common.c 2012-03-09 16:42:46.878151032 +0100 +@@ -590,7 +590,7 @@ + + /* If we are here, recvmsg() is unable to wait for + * required timeout. */ +- if (1000*next <= 1000000/(int)HZ) { ++ if (((uint64_t)1000*next) <= (uint64_t)1000000/(int)HZ) { + /* Very short timeout... So, if we wait for + * something, we sleep for MININTERVAL. + * Otherwise, spin! */ diff --git a/testing/poppler/PKGBUILD b/testing/poppler/PKGBUILD index 77d2c39e8..a5ef22a42 100644 --- a/testing/poppler/PKGBUILD +++ b/testing/poppler/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 162295 2012-06-24 19:25:19Z foutrelis $ +# $Id: PKGBUILD 163466 2012-07-12 14:37:16Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgbase=poppler pkgname=('poppler' 'poppler-glib' 'poppler-qt') -pkgver=0.20.1 +pkgver=0.20.2 pkgrel=1 arch=(i686 x86_64) license=('GPL') @@ -13,7 +13,7 @@ url="http://poppler.freedesktop.org/" _testtag=0d2bfd4af4c76a3bac27ccaff793d9129df7b57a source=(http://poppler.freedesktop.org/${pkgbase}-${pkgver}.tar.gz http://cgit.freedesktop.org/poppler/test/snapshot/test-${_testtag}.tar.bz2) -md5sums=('a61e3b844061f5324512a16d6d16984c' +md5sums=('45dd2c16c8c4d1a39e830e45745c4e25' '9dc64c254a31e570507bdd4ad4ba629a') build() { diff --git a/testing/util-linux/PKGBUILD b/testing/util-linux/PKGBUILD index 2dc698974..73d1c6cd4 100644 --- a/testing/util-linux/PKGBUILD +++ b/testing/util-linux/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 163397 2012-07-11 22:26:49Z tomegun $ +# $Id: PKGBUILD 163482 2012-07-13 02:30:58Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Contributor: judd <jvinet@zeroflux.org> pkgname=util-linux pkgver=2.21.2 -pkgrel=4 +pkgrel=5 pkgdesc="Miscellaneous system utilities for Linux" url="http://www.kernel.org/pub/linux/utils/util-linux/" arch=('i686' 'x86_64') diff --git a/testing/util-linux/util-linux.install b/testing/util-linux/util-linux.install index fa27d4555..90ce5bd73 100644 --- a/testing/util-linux/util-linux.install +++ b/testing/util-linux/util-linux.install @@ -3,6 +3,8 @@ post_upgrade() { if [ -f /var/lib/hwclock/adjtime ]; then mv /var/lib/hwclock/adjtime /etc/adjtime fi - rmdir /var/lib/hwclock + if [ -d /var/lib/hwclock ]; then + rmdir /var/lib/hwclock + fi fi } |
