diff options
| author | root <root@rshg054.dnsready.net> | 2012-10-03 01:32:13 -0700 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2012-10-03 01:32:13 -0700 |
| commit | 1350233b6dc1924ba29a42462447995f26dae0dc (patch) | |
| tree | 5dfb3384023621f023e449f02df1f035a9b45170 | |
| parent | 941550cbc215d608bd18439f99500b74fbb80f0d (diff) | |
Wed Oct 3 01:31:01 PDT 2012
164 files changed, 3566 insertions, 507 deletions
diff --git a/community-staging/haskell-gtk/PKGBUILD b/community-staging/haskell-gtk/PKGBUILD new file mode 100644 index 000000000..2ef22e5c2 --- /dev/null +++ b/community-staging/haskell-gtk/PKGBUILD @@ -0,0 +1,48 @@ +# $Id: PKGBUILD 76935 2012-10-02 13:34:57Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-gtk +pkgver=0.12.3.1 +pkgrel=2 +pkgdesc="Binding to the gtk library for Gtk2Hs." +url="http://hackage.haskell.org/package/gtk" +license=('LGPL2.1') +arch=('i686' 'x86_64') +depends=('ghc' 'gtk2' "haskell-pango" 'haskell-mtl') +makedepends=("gtk2hs-buildtools") +provides=('gtk2hs-gtk') +replaces=('gtk2hs-gtk') +conflicts=('gtk2hs-gtk') +options=('strip') +install=gtk2hs-gtk.install +source=(http://hackage.haskell.org/packages/archive/gtk/$pkgver/gtk-$pkgver.tar.gz + ghc-7.6.1.patch) +md5sums=('b10dfe92d2e4dfe3c0c92dd349489727' + '5fb93f37fe3f494b30ee682a36b8f1b6') + +build() { + cd ${srcdir}/gtk-${pkgver} + patch -p1 <$srcdir/ghc-7.6.1.patch + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-gtk \ + --libsubdir=\$compiler/site-local/\$pkgid + sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/UI/Gtk/Types.chs + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + _hmtlver=`pacman -Q haskell-mtl | cut -f2 -d\ | cut -f1 -d-` + _hpangover=`pacman -Q haskell-pango | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc" "gtk2" "haskell-pango=${_hpangover}" "haskell-mtl=${_hmtlver}") + + cd ${srcdir}/gtk-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-gtk/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-gtk/html ${pkgdir}/usr/share/doc/ghc/html/libraries/gtk2hs-gtk + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community-staging/haskell-gtk/ghc-7.6.1.patch b/community-staging/haskell-gtk/ghc-7.6.1.patch new file mode 100644 index 000000000..5e259a38f --- /dev/null +++ b/community-staging/haskell-gtk/ghc-7.6.1.patch @@ -0,0 +1,574 @@ +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs gtk/Graphics/UI/Gtk/Abstract/Object.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Abstract/Object.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Abstract/Object.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -126,7 +126,8 @@ + + {#pointer GWeakNotify#} + +-foreign import ccall "wrapper" mkDestructor :: IO () -> IO GWeakNotify ++foreign import ccall "wrapper" mkDestructor ++ :: (Ptr () -> Ptr GObject -> IO ()) -> IO GWeakNotify + + -- | Attach a callback that will be called after the + -- destroy hooks have been called +@@ -134,7 +135,7 @@ + objectWeakref :: ObjectClass o => o -> IO () -> IO GWeakNotify + objectWeakref obj uFun = do + funPtrContainer <- newIORef nullFunPtr +- uFunPtr <- mkDestructor $ do ++ uFunPtr <- mkDestructor $ \_ _ -> do + uFun + funPtr <- readIORef funPtrContainer + freeHaskellFunPtr funPtr +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs gtk/Graphics/UI/Gtk/Entry/Entry.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Entry/Entry.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Entry/Entry.chs 2012-10-02 16:27:26.000000000 +0400 +@@ -78,6 +78,10 @@ + entrySetCompletion, + entryGetCompletion, + #endif ++#if GTK_CHECK_VERSION (2,18,0) ++ entryGetBuffer, ++ entrySetBuffer, ++#endif + #if GTK_CHECK_VERSION(2,20,0) + entryGetIconWindow, + entryGetTextWindow, +@@ -104,6 +108,9 @@ + entryAlignment, + entryCompletion, + #endif ++#if GTK_CHECK_VERSION (2,18,0) ++ entryBuffer, ++#endif + + -- * Signals + entryActivate, +@@ -157,6 +164,9 @@ + import Graphics.UI.Gtk.Gdk.EventM (EventM, EButton, EKey) + import Control.Monad.Reader ( ask ) + import Control.Monad.Trans ( liftIO ) ++#if GTK_CHECK_VERSION (2,18,0) ++import Graphics.UI.Gtk.Entry.EntryBuffer ++#endif + {#import Graphics.UI.Gtk.Types#} + {#import Graphics.UI.Gtk.Signals#} + +@@ -429,6 +439,23 @@ + (toEntry self) + #endif + ++#if GTK_CHECK_VERSION(2,18,0) ++-- | Get the 'EntryBuffer' object which holds the text for this widget. ++entryGetBuffer :: EntryClass self => self ++ -> IO EntryBuffer ++entryGetBuffer self = ++ makeNewGObject mkEntryBuffer $ ++ {# call gtk_entry_get_buffer #} ++ (toEntry self) ++ ++-- | Set the 'EntryBuffer' object which holds the text for this widget. ++entrySetBuffer :: (EntryClass self, EntryBufferClass buffer) => self ++ -> buffer -> IO () ++entrySetBuffer self = ++ {# call gtk_entry_set_buffer #} ++ (toEntry self) . toEntryBuffer ++#endif ++ + #if GTK_CHECK_VERSION(2,20,0) + -- | Returns the 'Window' which contains the entry's icon at @iconPos@. This function is useful when + -- drawing something to the entry in an 'eventExpose' callback because it enables the callback to +@@ -623,6 +650,15 @@ + entrySetCompletion + #endif + ++#if GTK_CHECK_VERSION(2,18,0) ++entryBuffer :: (EntryClass self, EntryBufferClass buffer) => ++ ReadWriteAttr self EntryBuffer buffer ++entryBuffer = newAttr ++ entryGetBuffer ++ entrySetBuffer ++#endif ++ ++ + -------------------- + -- Signals + +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc gtk/Graphics/UI/Gtk/Gdk/EventM.hsc +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Gdk/EventM.hsc 2012-10-02 16:27:27.000000000 +0400 +@@ -639,14 +639,16 @@ + + + -- | Execute an event handler and assume it handled the event unless it +--- threw a pattern match exception. ++-- threw a pattern match exception or calls mzero (e.g. via guard). + tryEvent :: EventM any () -> EventM any Bool + tryEvent act = do + ptr <- ask + liftIO $ (runReaderT (act >> return True) ptr) + #if __GLASGOW_HASKELL__ >= 610 + `catches` [ Handler (\ (PatternMatchFail _) -> return False) +- , Handler (\ e -> if isUserError e && "Pattern" `isPrefixOf` ioeGetErrorString e ++ , Handler (\ e -> if isUserError e && ++ ("Pattern" `isPrefixOf` ioeGetErrorString e || ++ "mzero" == ioeGetErrorString e) + then return False + else throw e) ] + #else +@@ -654,6 +656,8 @@ + IOException e + | "user error (Pattern" `isPrefixOf` show e -> + return False ++ | "user error (mzero" `isPrefixOf` show e -> ++ return False + PatternMatchFail _ -> return False + _ -> throw e) + #endif +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Gdk/Pixbuf.chs 2012-10-02 16:27:28.000000000 +0400 +@@ -69,6 +69,7 @@ + + -- * Constructors + pixbufNew, ++ pixbufNewFromData, + pixbufNewFromFile, + #if GTK_CHECK_VERSION(2,4,0) + pixbufNewFromFileAtSize, +@@ -402,6 +403,19 @@ + (fromBool hasAlpha) (fromIntegral bitsPerSample) (fromIntegral width) + (fromIntegral height) + ++pixbufNewFromData :: Ptr CUChar -> Colorspace -> Bool -> Int -> Int -> Int -> Int -> IO Pixbuf ++pixbufNewFromData imData cSpace hasAlpha bitsPerSample width height rowStride ++ = wrapNewGObject mkPixbuf $ ++ {#call pixbuf_new_from_data #} ++ imData ++ (fromIntegral . fromEnum $ cSpace) ++ (fromBool hasAlpha) ++ (fromIntegral bitsPerSample) ++ (fromIntegral width) ++ (fromIntegral height) ++ (fromIntegral rowStride) ++ nullFunPtr nullPtr ++ + -- | Create a new image from a String. + -- + -- * Creates a new pixbuf from a string description. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs gtk/Graphics/UI/Gtk/General/Clipboard.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/Clipboard.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/General/Clipboard.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -260,7 +260,7 @@ + -- data succeeded. + clipboardSetWithData self targets getFunc clearFunc = do + gFunPtr <- mkClipboardGetFunc +- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) ++ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) + cFunPtr <- mkClipboardClearFunc + (\_ _ -> clearFunc) + res <- withTargetEntries targets $ \nTargets targets -> +@@ -282,7 +282,7 @@ + {#pointer ClipboardClearFunc#} + + foreign import ccall "wrapper" mkClipboardGetFunc :: +- (Ptr Clipboard -> Ptr () -> {#type guint#} -> IO ()) -> IO ClipboardGetFunc ++ (Ptr Clipboard -> Ptr () -> {#type guint#} -> Ptr () -> IO ()) -> IO ClipboardGetFunc + + foreign import ccall "wrapper" mkClipboardClearFunc :: + (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardClearFunc +@@ -313,7 +313,7 @@ + -- ignored. + clipboardSetWithOwner self targets getFunc clearFunc owner = do + gFunPtr <- mkClipboardGetFunc +- (\_ sPtr info -> runReaderT (getFunc info) sPtr >> return ()) ++ (\_ sPtr info _ -> runReaderT (getFunc info) sPtr >> return ()) + cFunPtr <- mkClipboardClearFunc + (\_ _ -> clearFunc) + res <- withTargetEntries targets $ \nTargets targets -> +@@ -404,7 +404,7 @@ + clipboardRequestContents self (Atom target) callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + runReaderT callback sPtr + return ()) +@@ -418,7 +418,7 @@ + {#pointer ClipboardReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardReceivedFunc :: +- (Ptr Clipboard -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc ++ (Ptr Clipboard -> Ptr () -> Ptr () -> IO ()) -> IO ClipboardReceivedFunc + + -- %hash c:7bb1 d:4ef1 + -- | Requests the contents of the clipboard as text. When the text is later +@@ -439,7 +439,7 @@ + clipboardRequestText self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardTextReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mStr <- if sPtr==nullPtr then return Nothing else + liftM Just $ peekUTFString sPtr +@@ -453,7 +453,7 @@ + {#pointer ClipboardTextReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardTextReceivedFunc :: +- (Ptr Clipboard -> CString -> IO ()) -> IO ClipboardTextReceivedFunc ++ (Ptr Clipboard -> CString -> Ptr () -> IO ()) -> IO ClipboardTextReceivedFunc + + + #if GTK_CHECK_VERSION(2,6,0) +@@ -477,7 +477,7 @@ + clipboardRequestImage self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardImageReceivedFunc +- (\_ sPtr -> do ++ (\_ sPtr _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mPixbuf <- maybeNull (makeNewGObject mkPixbuf) (return sPtr) + callback mPixbuf) +@@ -490,7 +490,7 @@ + {#pointer ClipboardImageReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardImageReceivedFunc :: +- (Ptr Clipboard -> Ptr Pixbuf -> IO ()) -> IO ClipboardImageReceivedFunc ++ (Ptr Clipboard -> Ptr Pixbuf -> Ptr () -> IO ()) -> IO ClipboardImageReceivedFunc + + #endif + +@@ -513,7 +513,7 @@ + clipboardRequestTargets self callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardTargetsReceivedFunc +- (\_ tPtr len -> do ++ (\_ tPtr len _ -> do + -- We must free Haskell pointer *in* the callback to avoid segfault. + freeHaskellFunPtr =<< readIORef cbRef + mTargets <- if tPtr==nullPtr then return Nothing else +@@ -528,7 +528,7 @@ + {#pointer ClipboardTargetsReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardTargetsReceivedFunc :: +- (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> IO ()) -> IO ClipboardTargetsReceivedFunc ++ (Ptr Clipboard -> Ptr (Ptr ()) -> {#type gint#} -> Ptr () -> IO ()) -> IO ClipboardTargetsReceivedFunc + + #if GTK_CHECK_VERSION(2,10,0) + -- %hash c:5601 d:d6a6 +@@ -552,10 +552,10 @@ + clipboardRequestRichText self buffer callback = do + cbRef <- newIORef nullFunPtr + cbPtr <- mkClipboardRichTextReceivedFunc +- (\_ tPtr sPtr len -> do ++ (\_ tPtr sPtr len _ -> do + freeHaskellFunPtr =<< readIORef cbRef + mRes <- if sPtr==nullPtr then return Nothing else liftM Just $ do +- str <- peekUTFStringLen (sPtr,fromIntegral len) ++ str <- peekUTFStringLen (castPtr sPtr,fromIntegral len) + return (Atom tPtr, str) + callback mRes) + writeIORef cbRef cbPtr +@@ -568,7 +568,7 @@ + {#pointer ClipboardRichTextReceivedFunc#} + + foreign import ccall "wrapper" mkClipboardRichTextReceivedFunc :: +- (Ptr Clipboard -> Ptr () -> CString -> {#type gsize#} -> IO ()) -> ++ (Ptr Clipboard -> Ptr () -> Ptr CUChar -> {#type gsize#} -> Ptr () -> IO ()) -> + IO ClipboardRichTextReceivedFunc + #endif + #endif +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs gtk/Graphics/UI/Gtk/General/General.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/General/General.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/General/General.chs 2012-10-02 16:27:28.000000000 +0400 +@@ -202,7 +202,7 @@ + -- their arguments from the main loop, that is, from the OS thread of Gtk, + -- thereby ensuring that any Gtk and OS function can be called. + -- +-{#fun unsafe gdk_threads_enter as threadsEnter {} -> `()' #} ++{#fun gdk_threads_enter as threadsEnter {} -> `()' #} + + -- | Release the global Gtk lock. + -- +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/ComboBox.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -493,17 +493,17 @@ + {# call gtk_combo_box_set_row_separator_func #} + (toComboBox self) nullFunPtr nullPtr nullFunPtr + comboBoxSetRowSeparatorSource self (Just (model, extract)) = do +- funPtr <- mkRowSeparatorFunc $ \_ iterPtr -> do ++ funPtr <- mkRowSeparatorFunc $ \_ iterPtr _ -> do + iter <- peek iterPtr + value <- customStoreGetRow model iter +- return (extract value) ++ return (fromBool $ extract value) + {# call gtk_combo_box_set_row_separator_func #} + (toComboBox self) funPtr (castFunPtrToPtr funPtr) destroyFunPtr + + {#pointer TreeViewRowSeparatorFunc#} + + foreign import ccall "wrapper" mkRowSeparatorFunc :: +- (Ptr TreeModel -> Ptr TreeIter -> IO Bool) -> IO TreeViewRowSeparatorFunc ++ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean #}) -> IO TreeViewRowSeparatorFunc + + -- %hash c:5bf8 + -- | Sets whether the popup menu should have a tearoff menu item. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.chs 2012-10-02 16:27:30.000000000 +0400 +@@ -76,6 +76,12 @@ + menuItemNewWithMnemonic, + + -- * Methods ++#if GTK_CHECK_VERSION(2,16,0) ++ menuItemSetLabel, ++ menuItemGetLabel, ++ menuItemSetUseUnderline, ++ menuItemGetUseUnderline, ++#endif + menuItemSetSubmenu, + menuItemGetSubmenu, + menuItemRemoveSubmenu, +@@ -89,6 +95,10 @@ + -- * Attributes + menuItemSubmenu, + menuItemRightJustified, ++#if GTK_CHECK_VERSION(2,16,0) ++ menuItemLabel, ++ menuItemUseUnderline, ++#endif + + -- * Signals + menuItemActivateItem, +@@ -163,7 +173,36 @@ + + -------------------- + -- Methods ++#if GTK_CHECK_VERSION(2,16,0) ++-- | Sets text on the MenuItem label ++ ++menuItemSetLabel :: (MenuItemClass self) => self -> String -> IO () ++menuItemSetLabel self label = ++ withUTFString label $ {# call gtk_menu_item_set_label #} (toMenuItem self) ++ ++-- | Gets text on the MenuItem label ++menuItemGetLabel :: (MenuItemClass self) => self -> IO String ++menuItemGetLabel self = ++ {# call gtk_menu_item_get_label #} ++ (toMenuItem self) ++ >>= \strPtr -> if strPtr == nullPtr ++ then return "" ++ else peekUTFString strPtr ++ ++-- | If True, an underline in the text indicates the next character should be used for the mnemonic accelerator key. ++-- ++menuItemSetUseUnderline :: (MenuItemClass self) => self -> Bool -> IO () ++menuItemSetUseUnderline self = ++ {# call gtk_menu_item_set_use_underline #} (toMenuItem self) . fromBool + ++-- | Checks if an underline in the text indicates the next character should be used for the mnemonic accelerator key. ++-- ++menuItemGetUseUnderline :: (MenuItemClass self) => self -> IO Bool ++menuItemGetUseUnderline self = ++ liftM toBool $ {# call gtk_menu_item_get_use_underline #} ++ (toMenuItem self) ++ ++#endif + -- | Sets the item's submenu, or changes it. + -- + menuItemSetSubmenu :: (MenuItemClass self, MenuClass submenu) => self -> submenu -> IO () +@@ -278,6 +317,22 @@ + menuItemGetRightJustified + menuItemSetRightJustified + ++#if GTK_CHECK_VERSION(2,16,0) ++-- | \'label\' property. See 'menuItemSetLabel' and 'menuItemGetLabel' ++-- ++menuItemLabel :: MenuItemClass self => Attr self String ++menuItemLabel = newAttr ++ menuItemGetLabel ++ menuItemSetLabel ++ ++-- | \'useUnderline\' property. See 'menuItemSetUseUnderline' and ++-- 'menuItemGetUseEUnderline' ++-- ++menuItemUseUnderline :: MenuItemClass self => Attr self Bool ++menuItemUseUnderline = newAttr ++ menuItemGetUseUnderline ++ menuItemSetUseUnderline ++#endif + -------------------- + -- Signals + +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/CustomStore.chs 2012-10-02 16:27:33.000000000 +0400 +@@ -239,7 +239,7 @@ + customTreeDragSourceIface = fromMaybe dummyDragSource mDragSource, + customTreeDragDestIface = fromMaybe dummyDragDest mDragDest } + privPtr <- newStablePtr priv +- liftM con $ makeNewGObject (CustomStore, objectUnref) $ ++ liftM con $ wrapNewGObject (CustomStore, objectUnref) $ + gtk2hs_store_new implPtr privPtr + + foreign import ccall unsafe "Gtk2HsStore.h gtk2hs_store_new" +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeModel.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -427,7 +427,7 @@ + {#pointer TreeModelForeachFunc#} + + foreign import ccall "wrapper" mkTreeModelForeachFunc :: +- (Ptr () -> Ptr () -> Ptr TreeIter -> Ptr () -> IO CInt) -> ++ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO CInt) -> + IO TreeModelForeachFunc + + #if GTK_CHECK_VERSION(2,2,0) +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeModelFilter.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -160,7 +160,7 @@ + {#pointer TreeModelFilterVisibleFunc #} + + foreign import ccall "wrapper" mkTreeModelFilterVisibleFunc :: +- (Ptr TreeModelFilter -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> ++ (Ptr TreeModel -> Ptr TreeIter -> Ptr () -> IO {#type gboolean#}) -> + IO TreeModelFilterVisibleFunc + + -- %hash c:a56d d:b42e +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeSelection.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -151,7 +151,7 @@ + treeSelectionSetSelectFunction :: TreeSelectionClass self => self + -> TreeSelectionCB -> IO () + treeSelectionSetSelectFunction ts fun = do +- fPtr <- mkTreeSelectionFunc (\_ _ tp _ -> do ++ fPtr <- mkTreeSelectionFunc (\_ _ tp _ _ -> do + path <- peekTreePath (castPtr tp) + liftM fromBool $ fun path + ) +@@ -168,7 +168,7 @@ + {#pointer TreeSelectionFunc#} + + foreign import ccall "wrapper" mkTreeSelectionFunc :: +- (Ptr () -> Ptr () -> Ptr TreePath -> Ptr () -> IO CInt)-> ++ (Ptr TreeSelection -> Ptr TreeModel -> Ptr NativeTreePath -> {#type gint#} -> Ptr () -> IO CInt)-> + IO TreeSelectionFunc + + -- | Retrieve the 'TreeView' widget that this 'TreeSelection' works on. +@@ -199,7 +199,7 @@ + -> TreeSelectionForeachCB + -> IO () + treeSelectionSelectedForeach self fun = do +- fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr -> do ++ fPtr <- mkTreeSelectionForeachFunc (\_ _ iterPtr _ -> do + -- make a deep copy of the iterator. This makes it possible to store this + -- iterator in Haskell land somewhere. The TreeModel parameter is not + -- passed to the function due to performance reasons. But since it is +@@ -219,7 +219,7 @@ + {#pointer TreeSelectionForeachFunc#} + + foreign import ccall "wrapper" mkTreeSelectionForeachFunc :: +- (Ptr () -> Ptr () -> Ptr TreeIter -> IO ()) -> IO TreeSelectionForeachFunc ++ (Ptr TreeModel -> Ptr NativeTreePath -> Ptr TreeIter -> Ptr () -> IO ()) -> IO TreeSelectionForeachFunc + + #if GTK_CHECK_VERSION(2,2,0) + -- | Creates a list of paths of all selected rows. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs gtk/Graphics/UI/Gtk/ModelView/TreeView.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/ModelView/TreeView.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -582,7 +582,7 @@ + {#pointer TreeViewColumnDropFunc#} + + foreign import ccall "wrapper" mkTreeViewColumnDropFunc :: +- (Ptr () -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> ++ (Ptr TreeView -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> Ptr TreeViewColumn -> + Ptr () -> IO {#type gboolean#}) -> IO TreeViewColumnDropFunc + + -- | Scroll to a coordinate. +@@ -798,7 +798,7 @@ + {#pointer TreeViewMappingFunc#} + + foreign import ccall "wrapper" mkTreeViewMappingFunc :: +- (Ptr () -> Ptr NativeTreePath -> Ptr () -> IO ()) -> ++ (Ptr TreeView -> Ptr NativeTreePath -> Ptr () -> IO ()) -> + IO TreeViewMappingFunc + + -- | Check if row is expanded. +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Multiline/TextBuffer.chs 2012-10-02 16:27:34.000000000 +0400 +@@ -1251,16 +1251,26 @@ + + -- | A 'Pixbuf' is inserted into the buffer. + -- ++-- * See note in 'bufferInsertText'. ++-- + insertPixbuf :: TextBufferClass self => Signal self (TextIter -> Pixbuf -> IO ()) + insertPixbuf = Signal (connect_BOXED_OBJECT__NONE "insert-pixbuf" mkTextIterCopy) + + -- | The 'insertChildAnchor' signal is emitted to insert a 'TextChildAnchor' in a 'TextBuffer'. + -- Insertion actually occurs in the default handler. + -- ++-- * See note in 'bufferInsertText'. ++-- + insertChildAnchor :: TextBufferClass self => Signal self (TextIter -> TextChildAnchor -> IO ()) + insertChildAnchor = Signal (connect_BOXED_OBJECT__NONE "insert-child-anchor" mkTextIterCopy) + +--- | Some text was inserted. ++-- | Some text is inserted. Insertion actually occurs in the default handler. ++-- ++-- * The function connected to this handler may not modify the buffer since ++-- this would invalidate the iterator. If this function replaces the ++-- default handler, it needs to stop the emission of this signal in order ++-- to prevent the default handler from running. If additional text should ++-- be inserted, this can be done using the 'after' function to connect. + -- + bufferInsertText :: TextBufferClass self => Signal self (TextIter -> String -> IO ()) + bufferInsertText = Signal $ \after obj handler -> +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs gtk/Graphics/UI/Gtk/Multiline/TextIter.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Multiline/TextIter.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -797,7 +797,7 @@ + {#pointer TextCharPredicate#} + + foreign import ccall "wrapper" mkTextCharPredicate :: +- ({#type gunichar#} -> Ptr () -> {#type gboolean#}) -> IO TextCharPredicate ++ ({#type gunichar#} -> Ptr () -> IO {#type gboolean#}) -> IO TextCharPredicate + + -- | Move 'TextIter' forward until a + -- predicate function returns True. +@@ -810,7 +810,7 @@ + textIterForwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> + IO Bool + textIterForwardFindChar ti pred limit = do +- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) ++ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) + res <- liftM toBool $ {#call text_iter_forward_find_char#} + ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) + freeHaskellFunPtr fPtr +@@ -827,7 +827,7 @@ + textIterBackwardFindChar :: TextIter -> (Char -> Bool) -> Maybe TextIter -> + IO Bool + textIterBackwardFindChar ti pred limit = do +- fPtr <- mkTextCharPredicate (\c _ -> fromBool $ pred (chr (fromIntegral c))) ++ fPtr <- mkTextCharPredicate (\c _ -> return $ fromBool $ pred (chr (fromIntegral c))) + res <- liftM toBool $ {#call text_iter_backward_find_char#} + ti fPtr nullPtr (fromMaybe (TextIter nullForeignPtr) limit) + freeHaskellFunPtr fPtr +diff -wbBur /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs gtk/Graphics/UI/Gtk/Windows/Assistant.chs +--- /home/sergej/community-my.svn/haskell-gtk/trunk/src/gtk-0.12.3.1/Graphics/UI/Gtk/Windows/Assistant.chs 2012-06-18 01:39:34.000000000 +0400 ++++ gtk/Graphics/UI/Gtk/Windows/Assistant.chs 2012-10-02 16:30:54.000000000 +0400 +@@ -274,7 +274,7 @@ + {#pointer AssistantPageFunc#} + + foreign import ccall "wrapper" mkAssistantPageFunc :: +- ({#type glong#} -> Ptr () -> IO {#type glong#}) ++ ({#type gint#} -> Ptr () -> IO {#type gint#}) + -> IO AssistantPageFunc + + -- | Sets the page type for @page@. The page type determines the page behavior diff --git a/community-staging/haskell-gtk/gtk-gthread.h-include.patch b/community-staging/haskell-gtk/gtk-gthread.h-include.patch new file mode 100644 index 000000000..fc600d6be --- /dev/null +++ b/community-staging/haskell-gtk/gtk-gthread.h-include.patch @@ -0,0 +1,15 @@ +diff -u gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c\~ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c +--- gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c~ 2011-11-14 07:15:41.000000000 +0900 ++++ gtk-0.12.2/Graphics/UI/Gtk/General/hsgthread.c 2012-01-08 14:58:45.849209318 +0900 +@@ -26,7 +26,8 @@ + */ + + #include <glib.h> +-#include <glib/gthread.h> ++/* f17 gives Error "Only <glib.h> can be included directly." ++ #include <glib/gthread.h> */ + #include <gdk/gdk.h> + #include "hsgthread.h" + + +Diff finished. Sun Jan 8 14:58:54 2012 diff --git a/community-staging/haskell-gtk/gtk2hs-gtk.install b/community-staging/haskell-gtk/gtk2hs-gtk.install new file mode 100644 index 000000000..7ed674b78 --- /dev/null +++ b/community-staging/haskell-gtk/gtk2hs-gtk.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/gtk2hs-gtk +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community-staging/haskell-pango/PKGBUILD b/community-staging/haskell-pango/PKGBUILD new file mode 100644 index 000000000..1c3b89124 --- /dev/null +++ b/community-staging/haskell-pango/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 76927 2012-10-02 10:46:31Z spupykin $ +# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> + +pkgname=haskell-pango +pkgver=0.12.3 +pkgrel=3 +pkgdesc="Binding to the pango library for Gtk2Hs." +url="http://hackage.haskell.org/package/pango" +license=('LGPL2.1') +arch=('i686' 'x86_64') +depends=('ghc' 'pango' 'haskell-glib' 'haskell-cairo') +makedepends=("gtk2hs-buildtools") +provides=('gtk2hs-pango') +replaces=('gtk2hs-pango') +conflicts=('gtk2hs-pango') +options=('strip') +install=gtk2hs-pango.install +source=(http://hackage.haskell.org/packages/archive/pango/${pkgver}/pango-${pkgver}.tar.gz) +md5sums=('1ef3132cb569703d5b1bc262c9d86fe3') + +build() { + cd ${srcdir}/pango-${pkgver} + runhaskell Setup configure -O -p --enable-split-objs --enable-shared \ + --prefix=/usr --docdir=/usr/share/doc/haskell-pango \ + --libsubdir=\$compiler/site-local/\$pkgid + sed -i 's|import Foreign.C.Types.*(CULong, CUInt)|import Foreign.C.Types (CULong(..), CUInt(..))|' Graphics/Rendering/Pango/Types.chs + runhaskell Setup build + runhaskell Setup haddock + runhaskell Setup register --gen-script + runhaskell Setup unregister --gen-script + sed -i -r -e "s|ghc-pkg.*unregister[^ ]* |&'--force' |" unregister.sh +} + +package() { + _ghcver=`pacman -Q ghc | cut -f2 -d\ | cut -f1 -d-` + _hglibver=`pacman -Q haskell-glib | cut -f2 -d\ | cut -f1 -d-` + _hcairover=`pacman -Q haskell-cairo | cut -f2 -d\ | cut -f1 -d-` + depends=("ghc=${_ghcver}" "pango" "haskell-glib=${_hglibver}" "haskell-cairo=${_hcairover}") + + cd ${srcdir}/pango-${pkgver} + install -D -m744 register.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/register.sh + install -m744 unregister.sh ${pkgdir}/usr/share/haskell/gtk2hs-pango/unregister.sh + install -d -m755 ${pkgdir}/usr/share/doc/ghc/html/libraries + ln -s /usr/share/doc/haskell-pango/html ${pkgdir}/usr/share/doc/ghc/html/libraries/pango + runhaskell Setup copy --destdir=${pkgdir} +} diff --git a/community-staging/haskell-pango/gtk2hs-pango.install b/community-staging/haskell-pango/gtk2hs-pango.install new file mode 100644 index 000000000..f2be2100f --- /dev/null +++ b/community-staging/haskell-pango/gtk2hs-pango.install @@ -0,0 +1,18 @@ +HS_DIR=usr/share/haskell/gtk2hs-pango +post_install() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_upgrade() { + ${HS_DIR}/unregister.sh +} +post_upgrade() { + ${HS_DIR}/register.sh + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} +pre_remove() { + ${HS_DIR}/unregister.sh +} +post_remove() { + (cd usr/share/doc/ghc/html/libraries; ./gen_contents_index) +} diff --git a/community-staging/hedgewars/PKGBUILD b/community-staging/hedgewars/PKGBUILD index 5259b435e..13c99efd2 100644 --- a/community-staging/hedgewars/PKGBUILD +++ b/community-staging/hedgewars/PKGBUILD @@ -1,20 +1,20 @@ -# $Id: PKGBUILD 74209 2012-07-22 21:11:50Z spupykin $ +# $Id: PKGBUILD 76929 2012-10-02 11:08:53Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=hedgewars pkgver=0.9.17 -pkgrel=4 +pkgrel=5 pkgdesc="Free Worms-like turn based strategy game" arch=('i686' 'x86_64') url="http://hedgewars.org" license=('GPL' 'custom') depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua') makedepends=('fpc' 'cmake' - # haskell specific - 'ghc=7.4.2-1' - 'haskell-network=2.3.0.14-1' 'haskell-bytestring-show=0.3.5.1-3' - 'haskell-utf8-string=0.3.7-2' 'haskell-dataenc=0.14.0.3-2' - 'haskell-hslogger=1.1.5-7') + # haskell specific + 'ghc' + 'haskell-network' 'haskell-bytestring-show' + 'haskell-utf8-string' 'haskell-dataenc' + 'haskell-hslogger') source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2 hedgewars.desktop hedgewars.png) @@ -26,6 +26,7 @@ build() { cd $pkgname-src-$pkgver # sed -i 's|.*misc/liblua.*||' CMakeLists.txt + sed -i 's|instance NFData B.ByteString||' gameServer/Actions.hs cmake \ -DCMAKE_INSTALL_PREFIX=/usr \ diff --git a/community-staging/python-mpi4py/PKGBUILD b/community-staging/python-mpi4py/PKGBUILD new file mode 100644 index 000000000..5352cf41c --- /dev/null +++ b/community-staging/python-mpi4py/PKGBUILD @@ -0,0 +1,43 @@ +# $Id: PKGBUILD 76992 2012-10-03 00:59:14Z stephane $ +# Maintainer : Stéphane Gaudreault <stephane@archlinux.org> +# Contributor: Sebastien Binet <binet@cern.ch> + +pkgbase=python-mpi4py +pkgname=('python-mpi4py' 'python2-mpi4py') +pkgver=1.3 +pkgrel=2 +arch=('i686' 'x86_64') +url="http://mpi4py.scipy.org" +license=('BSD') +makedepends=('python' 'python2' 'python-distribute' 'python2-distribute' 'openmpi') +source=(http://mpi4py.googlecode.com/files/mpi4py-${pkgver}.tar.gz) +sha1sums=('282c1b9e35b242c9bd86126ebc5af6c70d8c2833') + +build() { + cd "${srcdir}" + cp -a mpi4py-${pkgver}{,-python2} + + # Build python 3 module + cd mpi4py-${pkgver} + python3 setup.py build + + # Build python 2 module + cd ../mpi4py-${pkgver}-python2 + python2 setup.py build +} + +package_python-mpi4py() { + pkgdesc="Python bindings of the Message Passing Interface (MPI)" + depends=('python>=3.3' 'openmpi') + + cd "${srcdir}/mpi4py-${pkgver}" + python3 setup.py install --root "${pkgdir}" --optimize=1 --skip-build +} + +package_python2-mpi4py() { + pkgdesc="Python2 bindings of the Message Passing Interface (MPI)" + depends=('python2>=2.7' 'openmpi') + + cd "${srcdir}/mpi4py-${pkgver}-python2" + python2 setup.py install --root "${pkgdir}" --optimize=1 --skip-build +} diff --git a/community-staging/python-pyproj/PKGBUILD b/community-staging/python-pyproj/PKGBUILD new file mode 100644 index 000000000..d52a59c80 --- /dev/null +++ b/community-staging/python-pyproj/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 76990 2012-10-03 00:51:46Z stephane $ +# Maintainer: Stéphane Gaudreault <stephane@archlinux.org> + +pkgbase=python-pyproj +pkgname=('python-pyproj' 'python2-pyproj') +pkgver=1.9.2 +pkgrel=1 +pkgdesc="Python interfaces to PROJ.4 library" +arch=('i686' 'x86_64') +url="http://code.google.com/p/pyproj" +license=('custom') +source=(http://pyproj.googlecode.com/files/pyproj-${pkgver}.tar.gz) +makedepends=('python' 'python2') +sha1sums=('a7a4bf95f3492e45704bccd4aeafe3bbe32fb023') + +build() { + cd "${srcdir}" + + cp -a pyproj-${pkgver}{,-python2} + + # Build python 3 module + cd pyproj-${pkgver} + python3 setup.py build + + # Build python 2 module + cd ../pyproj-${pkgver}-python2 + python2 setup.py build +} + +package_python-pyproj() { + depends=('proj' 'python>=3.3') + + cd "${srcdir}"/pyproj-${pkgver} + python3 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + + install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} + +package_python2-pyproj() { + depends=('proj' 'python2>=2.7') + replaces=('pyproj') + + cd "${srcdir}"/pyproj-${pkgver}-python2 + python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build + + install -dm755 "${pkgdir}"/usr/share/licenses/${pkgname} + install -m644 LICENSE_proj4 "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE +} diff --git a/community-testing/virtualbox-modules/PKGBUILD b/community-testing/virtualbox-modules/PKGBUILD new file mode 100644 index 000000000..27c4cb38d --- /dev/null +++ b/community-testing/virtualbox-modules/PKGBUILD @@ -0,0 +1,69 @@ +# $Id: PKGBUILD 76984 2012-10-02 21:53:33Z seblu $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> +# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> + +pkgbase=virtualbox-modules +pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules') +pkgver=4.2.0 +pkgrel=4 +arch=('i686' 'x86_64') +url='http://virtualbox.org' +license=('GPL') +makedepends=('linux-headers' + "virtualbox-host-source>=$pkgver" + "virtualbox-guest-source>=$pkgver" + 'expac') + +build() { + # current kernel version + #_kernver=$(expac -Q '%v' linux-headers)-ARCH + _kernver=3.6.0-1-ARCH + # dkms need modification to be run as user + cp -r /var/lib/dkms . + echo "dkms_tree='$srcdir/dkms'" > dkms.conf + # build host modules + msg2 'Host modules' + dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver" + # build guest modules + msg2 'Guest modules' + dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver" +} + +package_virtualbox-host-modules(){ + pkgdesc='Host kernel modules for VirtualBox' + depends=('linux>=3.6' 'linux<3.7') + replaces=('virtualbox-modules') + conflicts=('virtualbox-modules') + install=virtualbox-host-modules.install + + #_kernver=$(expac -Q '%v' linux-headers)-ARCH + _kernver=3.6.0-1-ARCH + _extraver=extramodules-${_kernver%.*}-ARCH + + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules.install" +} + +package_virtualbox-guest-modules(){ + pkgdesc='Guest kernel modules for VirtualBox' + license=('GPL') + depends=('linux>=3.6' 'linux<3.7') + replaces=('virtualbox-archlinux-modules') + conflicts=('virtualbox-archlinux-modules') + install=virtualbox-guest-modules.install + + #_kernver=$(expac -Q '%v' linux-headers)-ARCH + _kernver=3.6.0-1-ARCH + _extraver=extramodules-${_kernver%.*}-ARCH + + install -dm755 "$pkgdir/usr/lib/modules/$_extraver" + cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module" + install -m644 * "$pkgdir/usr/lib/modules/$_extraver" + find "$pkgdir" -name '*.ko' -exec gzip -9 {} + + sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules.install" +} + +# vim:set ts=2 sw=2 et: diff --git a/community-testing/virtualbox-modules/build.sh b/community-testing/virtualbox-modules/build.sh new file mode 100755 index 000000000..828448cab --- /dev/null +++ b/community-testing/virtualbox-modules/build.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +if (( $# != 1 )); then + echo "usage: $0 extra" + echo " $0 testing" + exit 1 +fi + +$1-i686-build +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686 +linux32 makechrootpkg -r /var/lib/archbuild/$1-i686 + +$1-x86_64-build +makechrootpkg -I ../../virtualbox/trunk/virtualbox-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -I ../../virtualbox/trunk/virtualbox-guest-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64 +makechrootpkg -r /var/lib/archbuild/$1-x86_64 + + +# vim:set ts=2 sw=2 ft=sh et: diff --git a/community-testing/virtualbox-modules/virtualbox-guest-modules.install b/community-testing/virtualbox-modules/virtualbox-guest-modules.install new file mode 100644 index 000000000..15d536b7f --- /dev/null +++ b/community-testing/virtualbox-modules/virtualbox-guest-modules.install @@ -0,0 +1,17 @@ +post_install() { +cat << EOF +===> You may want to load vboxguest, vboxsf and vboxvideo +EOF + EXTRAMODULES='extramodules-3.5-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.5-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.5-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/community-testing/virtualbox-modules/virtualbox-host-modules.install b/community-testing/virtualbox-modules/virtualbox-host-modules.install new file mode 100644 index 000000000..3f2ed4a10 --- /dev/null +++ b/community-testing/virtualbox-modules/virtualbox-host-modules.install @@ -0,0 +1,19 @@ +post_install() { +cat << EOF +===> You must load vboxdrv module before starting VirtualBox: +===> # modprobe vboxdrv +EOF + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo 'In order to use the new version, reload all virtualbox modules manually.' +} + +post_remove() { + EXTRAMODULES='extramodules-3.6-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} diff --git a/community/catalyst-dkms/3.5-do_mmap.patch b/community/catalyst-dkms/3.5-do_mmap.patch new file mode 100644 index 000000000..04248eb7b --- /dev/null +++ b/community/catalyst-dkms/3.5-do_mmap.patch @@ -0,0 +1,50 @@ +--- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-15 18:30:13.483762070 +0200 ++++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2012-06-17 17:47:36.543041869 +0200 +@@ -2106,6 +2106,12 @@ + } + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0) ++# define NO_DO_MMAP ++# define do_mmap(a,b,c,d,e,f) vm_mmap(a, b, c, d, e, f) ++# define do_munmap(a,b,c) vm_munmap(b, c) ++#endif ++ + unsigned long ATI_API_CALL KCL_MEM_AllocLinearAddrInterval( + KCL_IO_FILE_Handle file, + unsigned long addr, +@@ -2117,10 +2123,13 @@ + + flags = MAP_SHARED; + prot = PROT_READ|PROT_WRITE; +- ++#ifdef NO_DO_MMAP ++ vaddr = (void *) vm_mmap(file, 0, len, prot, flags, pgoff); ++#else + down_write(¤t->mm->mmap_sem); + vaddr = (void *) do_mmap(file, 0, len, prot, flags, pgoff); + up_write(¤t->mm->mmap_sem); ++#endif + if (IS_ERR(vaddr)) + return 0; + else +@@ -2131,7 +2140,9 @@ + { + int retcode = 0; + ++#ifndef NO_DO_MMAP + down_write(¤t->mm->mmap_sem); ++#endif + #ifdef FGL_LINUX_RHEL_MUNMAP_API + retcode = do_munmap(current->mm, + addr, +@@ -2142,7 +2153,9 @@ + addr, + len); + #endif ++#ifndef NO_DO_MMAP + up_write(¤t->mm->mmap_sem); ++#endif + return retcode; + } + diff --git a/community/catalyst-dkms/PKGBUILD b/community/catalyst-dkms/PKGBUILD new file mode 100644 index 000000000..175851c6b --- /dev/null +++ b/community/catalyst-dkms/PKGBUILD @@ -0,0 +1,49 @@ +# $Id: PKGBUILD 76979 2012-10-02 21:27:47Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero +# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert + +pkgname=catalyst-dkms +pkgver=12.8 +pkgrel=0.1 +pkgdesc="AMD proprietary gpu kernel driver" +arch=('i686' 'x86_64') +url="http://www.amd.com" +license=('custom') +depends=('linux>=3.5' 'linux-headers>=3.5' 'dkms') +source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip + dkms.conf + 3.5-do_mmap.patch) +md5sums=('41c5478322b13be6909eeb46412a3aa0' + '972049dc247a74a7162f2227078abcb0' + 'a450e2e3db61994b09e9d99d95bee837') +install=catalyst.install + +package() { + depends=(${depends[@]} "catalyst-utils=${pkgver}") + + cd ${srcdir} + + if [ "${CARCH}" = "x86_64" ]; then + _archdir=x86_64 + else + _archdir=x86 + fi + + sh ./amd-driver-installer*.run --extract fglrx-install + + cd fglrx-install + patch -Np1 -i ../3.5-do_mmap.patch + + install -dm755 "${pkgdir}/usr/lib/modprobe.d" + install -dm755 "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}" + cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" + cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" + cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/" + sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-${pkgver}-${pkgrel}/dkms.conf" + + echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst.conf" + + # license + install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} diff --git a/community/catalyst-dkms/catalyst.install b/community/catalyst-dkms/catalyst.install new file mode 100644 index 000000000..f32e7ae7a --- /dev/null +++ b/community/catalyst-dkms/catalyst.install @@ -0,0 +1,24 @@ +post_install() +{ + dkms add -m fglrx -v $1 + dkms build -m fglrx -v $1 + dkms install -m fglrx -v $1 +} + +pre_upgrade() +{ + dkms remove -m fglrx -v $1 --all +} + +post_upgrade() +{ + dkms add -m fglrx -v $1 + dkms build -m fglrx -v $1 + dkms install -m fglrx -v $1 +} + +pre_remove() +{ + dkms remove -m fglrx -v $1 --all +} + diff --git a/community/catalyst-dkms/dkms.conf b/community/catalyst-dkms/dkms.conf new file mode 100644 index 000000000..8d312da4f --- /dev/null +++ b/community/catalyst-dkms/dkms.conf @@ -0,0 +1,7 @@ +PACKAGE_NAME="fglrx" +PACKAGE_VERSION="@VERSION@" +CLEAN="rm -f *.*o" +BUILT_MODULE_NAME[0]="fglrx" +MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck" +DEST_MODULE_LOCATION[0]="/extramodules" +AUTOINSTALL="yes" diff --git a/community/catalyst-lts-dkms/PKGBUILD b/community/catalyst-lts-dkms/PKGBUILD new file mode 100644 index 000000000..2c0683df7 --- /dev/null +++ b/community/catalyst-lts-dkms/PKGBUILD @@ -0,0 +1,46 @@ +# $Id: PKGBUILD 76980 2012-10-02 21:28:25Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> +# Contributor: Vi0L0, wonder, Eduardo "kensai" Romero +# Contributor: aidanlinz, Rip-Rip, OvsInc, Sebastian Siebert + +pkgname=catalyst-lts-dkms +pkgver=12.8 +pkgrel=0.1 +pkgdesc="AMD proprietary gpu kernel driver" +arch=('i686' 'x86_64') +url="http://www.amd.com" +license=('custom') +depends=('linux-lts' 'linux-lts-headers' 'dkms') +source=(http://www2.ati.com/drivers/linux/amd-driver-installer-${pkgver/./-}-x86.x86_64.zip + dkms.conf) +md5sums=('41c5478322b13be6909eeb46412a3aa0' + '98d42443e84e91674ba79f0e6c38c572') +install=catalyst.install + +package() { + depends=(${depends[@]} "catalyst-utils=${pkgver}") + + cd ${srcdir} + + if [ "${CARCH}" = "x86_64" ]; then + _archdir=x86_64 + else + _archdir=x86 + fi + + sh ./amd-driver-installer*.run --extract fglrx-install + + cd fglrx-install + + install -dm755 "${pkgdir}/usr/lib/modprobe.d" + install -dm755 "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}" + cp -r common/lib/modules/fglrx/build_mod/* "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/" + cp "arch/${_archdir}"/lib/modules/fglrx/build_mod/libfglrx_ip.a "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/" + cp ${srcdir}/dkms.conf "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/" + sed -i -e "s/@VERSION@/${pkgver}-${pkgrel}/" "${pkgdir}/usr/src/fglrx-lts-${pkgver}-${pkgrel}/dkms.conf" + + echo "blacklist radeon" >> "${pkgdir}/usr/lib/modprobe.d/catalyst-lts.conf" + + # license + install -Dm644 "${srcdir}/fglrx-install/LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.TXT" +} diff --git a/community/catalyst-lts-dkms/catalyst.install b/community/catalyst-lts-dkms/catalyst.install new file mode 100644 index 000000000..021f3fc54 --- /dev/null +++ b/community/catalyst-lts-dkms/catalyst.install @@ -0,0 +1,24 @@ +post_install() +{ + dkms add -m fglrx-lts -v $1 + dkms build -m fglrx-lts -v $1 + dkms install -m fglrx-lts -v $1 +} + +pre_upgrade() +{ + dkms remove -m fglrx-lts -v $1 --all +} + +post_upgrade() +{ + dkms add -m fglrx-lts -v $1 + dkms build -m fglrx-lts -v $1 + dkms install -m fglrx-lts -v $1 +} + +pre_remove() +{ + dkms remove -m fglrx-lts -v $1 --all +} + diff --git a/community/catalyst-lts-dkms/dkms.conf b/community/catalyst-lts-dkms/dkms.conf new file mode 100644 index 000000000..64f81f832 --- /dev/null +++ b/community/catalyst-lts-dkms/dkms.conf @@ -0,0 +1,7 @@ +PACKAGE_NAME="fglrx-lts" +PACKAGE_VERSION="@VERSION@" +CLEAN="rm -f *.*o" +BUILT_MODULE_NAME[0]="fglrx" +MAKE[0]="sh make.sh --nohints --uname_r=$kernelver --norootcheck" +DEST_MODULE_LOCATION[0]="/extramodules" +AUTOINSTALL="yes" diff --git a/community/mftrace/PKGBUILD b/community/mftrace/PKGBUILD index 8bc526c61..8d8d7ba9c 100644 --- a/community/mftrace/PKGBUILD +++ b/community/mftrace/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 66235 2012-02-23 05:09:11Z spupykin $ +# $Id: PKGBUILD 76923 2012-10-02 09:37:01Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: William Rea <sillywilly@gmail.com> pkgname=mftrace -pkgver=1.2.17 -pkgrel=2 +pkgver=1.2.18 +pkgrel=1 pkgdesc="Traces TeX bitmap fonts into PFA, PFB, or TTF" arch=('i686' 'x86_64') url="http://lilypond.org/mftrace/" license=("GPL") depends=('python2' 'potrace' 't1utils') source=(http://lilypond.org/download/sources/mftrace/mftrace-$pkgver.tar.gz) -md5sums=('1a40b28e94594d215d5c4401b5ac76cb') +md5sums=('7d660226b6f933a239b2413ac010fe0c') build() { cd $srcdir/$pkgname-$pkgver diff --git a/community/monit/PKGBUILD b/community/monit/PKGBUILD index 9f7426ba0..726379806 100644 --- a/community/monit/PKGBUILD +++ b/community/monit/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70938 2012-05-20 10:06:55Z jlichtblau $ +# $Id: PKGBUILD 76973 2012-10-02 18:27:38Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org> # Contributor: Marco Bartholomew <marco@marcobartholomew.com> pkgname=monit -pkgver=5.4 +pkgver=5.5 pkgrel=1 pkgdesc="Utility for managing and monitoring, processes, files, directories and devices on a *NIX system" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ backup=('etc/monitrc') changelog=$pkgname.changelog source=(http://mmonit.com/$pkgname/dist/$pkgname-$pkgver.tar.gz \ monitd) -sha256sums=('805c6545de2dd7f3d9e6e0c68018b2aadd5fc98b243c8868178f247a60906038' +sha256sums=('8276b060b3f0e6453c9748d421dec044ddae09d3e4c4666e13472aab294d7c53' 'b235b2fdeec49015d6b74f028d161b289663692f9ee2d2d78cf52d8db87ca496') build() { diff --git a/community/monit/monit.changelog b/community/monit/monit.changelog index f0472719c..7c26c1a39 100644 --- a/community/monit/monit.changelog +++ b/community/monit/monit.changelog @@ -1,3 +1,6 @@ +2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * monit 5.5-1 + 2012-05-20 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * monit 5.4-1 diff --git a/community/osdbattery/PKGBUILD b/community/osdbattery/PKGBUILD index 8e45267ef..1d2da5715 100644 --- a/community/osdbattery/PKGBUILD +++ b/community/osdbattery/PKGBUILD @@ -1,31 +1,36 @@ -# $Id: PKGBUILD 67719 2012-03-14 08:59:42Z giovanni $ +# $Id: PKGBUILD 76967 2012-10-02 18:09:45Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: dibblethewrecker <dibblethewrecker@jiwe.org> pkgname=osdbattery pkgver=1.4 -pkgrel=4 +pkgrel=5 pkgdesc="Displays battery information in the OSD style" arch=('i686' 'x86_64') -url="http://osdbattery.sourceforge.net" +url="http://osdbattery.sourceforge.net/" license=('GPL2') depends=('xosd') -install=osdbattery.install -source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${pkgver}.tar.gz" - 'showbatt') -md5sums=('43f9cc0428b6cb25baf1e6e2286e88b1' - 'a786cd645135a369c8ed55b837174c92') +makedepends=('patch') +install=$pkgname.install +source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}_${pkgver}.tar.gz + sysfs.patch::"http://sourceforge.net/tracker/download.php?group_id=120528&atid=687314&file_id=429967&aid=3450277" + showbatt) +sha256sums=('b1f775c746cd78b6aa7fc9ee75ecf2806ef3da93a42dd806c0414dcae55aed9f' + 'd7a00e918929d36aaf3eb398649ea070ed6c4840e3da2407226fc5d9ae15d776' + '69969053235642315b49fe6ea5df7f8c391befbf492fd4ff71afbf4d438333b2') build() { - cd "${srcdir}/${pkgname}_${pkgver}" + cd ${srcdir}/${pkgname}_${pkgver} + + patch -i ${srcdir}/sysfs.patch make } package() { - cd "${srcdir}/${pkgname}_${pkgver}" + cd ${srcdir}/${pkgname}_${pkgver} - install -D -m755 $pkgname "${pkgdir}/usr/bin/${pkgname}" - install -D -m755 ${srcdir}/showbatt "${pkgdir}/usr/bin/showbatt" - install -D -m644 $pkgname.cfg "${pkgdir}/etc/${pkgname}/${pkgname}.cfg" + install -D -m755 $pkgname ${pkgdir}/usr/bin/${pkgname} + install -D -m755 ${srcdir}/showbatt ${pkgdir}/usr/bin/showbatt + install -D -m644 $pkgname.cfg ${pkgdir}/etc/${pkgname}/${pkgname}.cfg } diff --git a/community/parrot/PKGBUILD b/community/parrot/PKGBUILD index d0c7dc3b2..72e283e60 100644 --- a/community/parrot/PKGBUILD +++ b/community/parrot/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 74176 2012-07-22 18:32:23Z spupykin $ +# $Id: PKGBUILD 76937 2012-10-02 14:00:19Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: mpie <michael.kyne-phillips1@ntlworld.com> pkgname=parrot -pkgver=4.6.0 -_rel=stable -#_rel=devel +pkgver=4.8.0 +#_rel=stable +_rel=devel pkgrel=1 pkgdesc="Standalone VM that can execute bytecode compiled dynamic languages" arch=('x86_64' 'i686') @@ -16,7 +16,7 @@ makedepends=('perl-json') optdepends=('freeglut') options=('!makeflags') source=(ftp://ftp.parrot.org/pub/parrot/releases/$_rel/$pkgver/$pkgname-$pkgver.tar.bz2) -md5sums=('2acdf1855baf04f07bac6d6e307dcd0d') +md5sums=('c00ed8867dcf69255452a2e1267906ec') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/viking/PKGBUILD b/community/viking/PKGBUILD index 76f27bb29..e9f8b27f5 100644 --- a/community/viking/PKGBUILD +++ b/community/viking/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 70959 2012-05-20 19:00:08Z jlichtblau $ +# $Id: PKGBUILD 76965 2012-10-02 17:50:42Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Nick Østergaard <oe.nick@gmail.com> # Contributor: Jonny Gerold <jonny@fsk141.com> pkgname=viking -pkgver=1.3 -pkgrel=2 +pkgver=1.3.2.1 +pkgrel=1 pkgdesc="GTK+2 application to manage GPS data" arch=('i686' 'x86_64') url="http://viking.sourceforge.net/" @@ -16,7 +16,7 @@ options=('!emptydirs') install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz) -sha256sums=('54dc43b0136722118b8402d51ac8d78180ad59cc37e37ddf3fb6a7ee6bf04fdf') +sha256sums=('ebd6f134a340a1b2ba582ea77bd97ddd9db16b476be7090a12649f6069fa1565') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/viking/viking.changelog b/community/viking/viking.changelog index d9333735f..3fc494db1 100644 --- a/community/viking/viking.changelog +++ b/community/viking/viking.changelog @@ -1,3 +1,6 @@ +2012-10-02 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * viking 1.3.2.1-1 + 2012-05-05 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * viking 1.3.0-1 diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD index fce2f644e..ec813949f 100644 --- a/core/dbus-core/PKGBUILD +++ b/core/dbus-core/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 163991 2012-07-23 14:58:38Z andyrtr $ +# $Id: PKGBUILD 167557 2012-10-02 18:43:42Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus-core -pkgver=1.6.4 +pkgver=1.6.8 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" @@ -13,10 +13,9 @@ depends=('expat' 'coreutils' 'filesystem' 'libsystemd' 'shadow' 'systemd-tools') makedepends=('libx11') options=(!libtool) install=dbus.install -source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc} +source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc} dbus) -md5sums=('5ec43dc4554cba638917317b2b4f7640' - '3d4482ee39b49da334441c76f83bf1cb' +md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2' 'f0364f3f5dc5f653bb05d39aa36e3264') build() { diff --git a/extra/cairo/PKGBUILD b/extra/cairo/PKGBUILD index 52ff6100b..ee34626b9 100644 --- a/extra/cairo/PKGBUILD +++ b/extra/cairo/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 161326 2012-06-09 14:55:04Z foutrelis $ +# $Id: PKGBUILD 167546 2012-10-02 15:03:57Z foutrelis $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Brice Carpentier <brice@daknet.org> @@ -6,7 +6,7 @@ pkgname=cairo #_gitdate=20120426 #_gitver=957a9cc619965178a8927d114fe852034fc2385c pkgver=1.12.2 -pkgrel=2 +pkgrel=3 pkgdesc="Cairo vector graphics library" arch=(i686 x86_64) license=('LGPL' 'MPL') @@ -21,11 +21,13 @@ source=(http://cairographics.org/releases/$pkgname-$pkgver.tar.xz #$pkgname-$pkgver.tar.gz::http://cgit.freedesktop.org/cairo/snapshot/cairo-${_gitver}.tar.gz cairo-1.10.0-buggy_gradients.patch cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch + cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch #git_fixes.patch ) md5sums=('87649eb75789739d517c743e94879e51' '9b323790dab003e228c6955633cb888e' - '75ec73746cfaefcbed0e9b2a9f76bf00') + '75ec73746cfaefcbed0e9b2a9f76bf00' + '56f64466fd70ead732b00691464144f2') build() { cd "$srcdir/$pkgname-$pkgver" @@ -33,6 +35,8 @@ build() { patch -Np1 -i ${srcdir}/cairo-1.10.0-buggy_gradients.patch # https://bugs.freedesktop.org/show_bug.cgi?id=50852 patch -Np1 -i ${srcdir}/cairo-1.12.2-reduce-broken-stopped-edge-continuation.patch + # https://bugs.freedesktop.org/show_bug.cgi?id=51443 + patch -Np1 -i ${srcdir}/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch # status is 2012-04-26 last commit: image: Fix typo in _blit_spans() #patch -Np1 -i ${srcdir}/git_fixes.patch autoreconf -vfi diff --git a/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch b/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch new file mode 100644 index 000000000..e43a10312 --- /dev/null +++ b/extra/cairo/cairo-1.12.2-ignore-charset-for-non-cid-fonts.patch @@ -0,0 +1,37 @@ +From 2f1d6b27e8b78c77346a5b603114b54400e57d83 Mon Sep 17 00:00:00 2001 +From: Adrian Johnson <ajohnson@redneon.com> +Date: Thu, 07 Jun 2012 09:48:52 +0000 +Subject: cff-subsetting: Ignore charset for non cid fonts + +Fixes crash in https://bugzilla.gnome.org/show_bug.cgi?id=677422 +--- +diff --git a/src/cairo-cff-subset.c b/src/cairo-cff-subset.c +index db6fdf7..6f0cd66 100644 +--- a/src/cairo-cff-subset.c ++++ b/src/cairo-cff-subset.c +@@ -1178,14 +1178,16 @@ cairo_cff_font_read_top_dict (cairo_cff_font_t *font) + goto fail; + font->num_glyphs = _cairo_array_num_elements (&font->charstrings_index); + +- operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size); +- if (font->is_cid && !operand) +- return CAIRO_INT_STATUS_UNSUPPORTED; ++ if (font->is_cid) { ++ operand = cff_dict_get_operands (font->top_dict, CHARSET_OP, &size); ++ if (!operand) ++ return CAIRO_INT_STATUS_UNSUPPORTED; + +- decode_integer (operand, &offset); +- font->charset = font->data + offset; +- if (font->charset >= font->data_end) +- return CAIRO_INT_STATUS_UNSUPPORTED; ++ decode_integer (operand, &offset); ++ font->charset = font->data + offset; ++ if (font->charset >= font->data_end) ++ return CAIRO_INT_STATUS_UNSUPPORTED; ++ } + + if (!font->is_opentype) + cairo_cff_font_read_font_metrics (font, font->top_dict); +-- +cgit v0.9.0.2-2-gbebe diff --git a/extra/dbus/PKGBUILD b/extra/dbus/PKGBUILD index 0f9977539..54b0e62b3 100644 --- a/extra/dbus/PKGBUILD +++ b/extra/dbus/PKGBUILD @@ -1,19 +1,18 @@ -# $Id: PKGBUILD 163993 2012-07-23 14:58:54Z andyrtr $ +# $Id: PKGBUILD 167558 2012-10-02 18:43:55Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus -pkgver=1.6.4 +pkgver=1.6.8 pkgrel=1 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64) license=('GPL' 'custom') depends=("dbus-core>=$pkgver" 'libx11') -source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz{,.asc} +source=(http://dbus.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz #{,.asc} 30-dbus) -md5sums=('5ec43dc4554cba638917317b2b4f7640' - '3d4482ee39b49da334441c76f83bf1cb' +md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2' '9fafe8b28460aeaa6054309ef4c5ed92') build() { diff --git a/extra/dcraw/PKGBUILD b/extra/dcraw/PKGBUILD index 9c2571bd3..1a28c41ce 100644 --- a/extra/dcraw/PKGBUILD +++ b/extra/dcraw/PKGBUILD @@ -1,19 +1,17 @@ -# $Id: PKGBUILD 162767 2012-06-29 22:10:56Z eric $ +# $Id: PKGBUILD 167554 2012-10-02 18:35:41Z eric $ # Maintainer: tobias <tobias@archlinux.org> # Contributor: Tobias Kieslich <tobias@justdreams.de> pkgname=dcraw -pkgver=9.15 +pkgver=9.16 pkgrel=1 pkgdesc="A command line based converter for digicams raw output" arch=('i686' 'x86_64') url="http://www.cybercom.net/~dcoffin/dcraw/" license=('custom') depends=('lcms' 'jasper') -source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz - license.txt) -sha1sums=('0b06047603640fe19b5d3b2461319d6ba22eee6a' - '502c8f0ac7434d48f5dcb2eefe7599627cb69454') +source=(http://www.cybercom.net/~dcoffin/dcraw/archive/${pkgname}-${pkgver}.tar.gz) +sha1sums=('fb73ca3ccd703bd522a759e0366814f0a3411902') build() { cd "${srcdir}/${pkgname}" @@ -44,5 +42,6 @@ package() { msgfmt -o "${pkgdir}"/usr/share/locale/$lang/LC_MESSAGES/dcraw.mo dcraw_$lang.po done - install -Dm644 "${srcdir}/license.txt" "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt + install -d "${pkgdir}"/usr/share/licenses/${pkgname} + head -25 dcraw.c > "${pkgdir}"/usr/share/licenses/${pkgname}/license.txt } diff --git a/extra/fcitx/PKGBUILD b/extra/fcitx/PKGBUILD index 42e234dc9..c726e14b3 100644 --- a/extra/fcitx/PKGBUILD +++ b/extra/fcitx/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166605 2012-09-12 22:49:29Z eric $ +# $Id: PKGBUILD 167680 2012-10-02 22:57:36Z eric $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: csslayer <wengxt AT gmail com> pkgbase=fcitx pkgname=('fcitx' 'fcitx-gtk2' 'fcitx-gtk3' 'fcitx-qt') -pkgver=4.2.6 +pkgver=4.2.6.1 pkgrel=1 arch=('i686' 'x86_64') url="http://code.google.com/p/fcitx/" @@ -12,7 +12,7 @@ license=('GPL') makedepends=('cmake' 'intltool' 'doxygen' 'gtk2' 'gtk3' 'qt' 'icu' 'wget' \ 'iso-codes' 'gobject-introspection' 'libxkbfile' 'enchant') source=(http://fcitx.googlecode.com/files/${pkgbase}-${pkgver}.tar.xz) -sha1sums=('3abc1d5f8725b7e700b347d1ba19b4f40ba7be14') +sha1sums=('dc4577bb6bd6de41317f978196f377fc801cc63a') build() { cd "${srcdir}" diff --git a/extra/freenx/PKGBUILD b/extra/freenx/PKGBUILD index b62092a0f..f686b0bb1 100644 --- a/extra/freenx/PKGBUILD +++ b/extra/freenx/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 157437 2012-04-28 09:58:42Z andyrtr $ +# $Id: PKGBUILD 167672 2012-10-02 21:03:34Z andyrtr $ # Maintainer: Tobias Powalowski <tpowa@archlinux.org> #Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org> pkgname=freenx pkgver=0.7.3 -pkgrel=11 +pkgrel=13 pkgdesc="Free Software (GPL) Implementation of the NX Server" arch=(i686 x86_64) url="http://freenx.berlios.de" license=('GPL') -depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'python' +depends=('nx-common' 'nx-x11' 'nxagent' 'nxproxy' 'gnu-netcat' 'inetutils' 'openssh' 'expect' 'python2' 'python2-gobject' 'xorg-xauth' 'xorg-fonts-misc' 'coreutils' 'xorg-xmessage' 'xorg-xrdb' 'xorg-xpr' 'xorg-xset' 'xorg-sessreg') optdepends=('cups: adds printing support') makedepends=('imake') @@ -65,6 +65,9 @@ build() { sed -i -e 's:NOMACHINE_NX_HOME_DIR="/usr/lib/nx/home/nx":NOMACHINE_NX_HOME_DIR="/var/lib/nxserver/home/nx":g' nxloadconfig node.conf.sample sed -i -e 's:\/usr\/NX:\/usr\/lib\/nx:g' nxdialog + # python2 fix + sed -i -e 's:\/usr\/bin\/env\ python:\/usr\/bin\/env\ python2:' nx-session-launcher/nx-session-launcher + # fix key generation sed -i -e 's,AUTOMATIC="no",AUTOMATIC="yes",g' nxsetup diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD index 527f2d9d9..a5c916b24 100644 --- a/extra/mercurial/PKGBUILD +++ b/extra/mercurial/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166022 2012-09-04 11:54:18Z giovanni $ +# $Id: PKGBUILD 167548 2012-10-02 17:15:26Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Douglas Soares de Andrade <douglas@archlinux.org> pkgname=mercurial -pkgver=2.3.1 +pkgver=2.3.2 pkgrel=1 pkgdesc="A scalable distributed SCM tool" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ optdepends=('tk: for the hgk GUI') backup=('etc/mercurial/hgrc') source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz" 'mercurial.profile') -md5sums=('22a46a3ae64a5d625f068e588b4d6ec2' +md5sums=('6e90450ab3886bc650031e0d9aef367a' '43e1d36564d4c7fbe9a091d3ea370a44') package() { diff --git a/extra/perl-yaml-syck/PKGBUILD b/extra/perl-yaml-syck/PKGBUILD index 1b3f73adf..fe8dc26e9 100644 --- a/extra/perl-yaml-syck/PKGBUILD +++ b/extra/perl-yaml-syck/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 160567 2012-06-02 10:28:42Z bluewind $ +# $Id: PKGBUILD 167670 2012-10-02 21:01:45Z eric $ # This PKGBUILD was generated by cpan4pacman via CPANPLUS::Dist::Pacman # Maintainer: kevin <kevin@archlinux.org> pkgname=perl-yaml-syck _realname=YAML-Syck -pkgver=1.20 -pkgrel=2 +pkgver=1.21 +pkgrel=1 pkgdesc="Fast, lightweight YAML loader and dumper" arch=('i686' 'x86_64') license=('custom') @@ -13,7 +13,7 @@ url="http://search.cpan.org/dist/${_realname}/" depends=('perl') options=('!emptydirs') source=(http://www.cpan.org/authors/id/T/TO/TODDR/${_realname}-$pkgver.tar.gz) -md5sums=('8f6d04ee5817b8479e1234264a8d458d') +md5sums=('e9f8d4f9cea7def4d0b132dbf66516b2') build() { cd "${srcdir}/${_realname}-$pkgver" diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD index 6a9b87fdc..98739e106 100644 --- a/extra/xf86-video-intel/PKGBUILD +++ b/extra/xf86-video-intel/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166751 2012-09-17 16:20:14Z andyrtr $ +# $Id: PKGBUILD 167556 2012-10-02 18:42:38Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=xf86-video-intel -pkgver=2.20.8 +pkgver=2.20.9 pkgrel=1 arch=(i686 x86_64) url="http://xorg.freedesktop.org/" @@ -18,7 +18,7 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x options=('!libtool') groups=('xorg-drivers' 'xorg') source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2) -sha256sums=('2a126b2bb93b8d9db5eef68f1496e83713fd51ac435a7fafc7a36ff9c7ca83e7') +sha256sums=('b9830c9fdaf2f64648cd45807883821f14dd91f9ff1cfa59af11035f62dc9389') build() { cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/gnome-unstable/cheese/PKGBUILD b/gnome-unstable/cheese/PKGBUILD new file mode 100644 index 000000000..c995b74fb --- /dev/null +++ b/gnome-unstable/cheese/PKGBUILD @@ -0,0 +1,31 @@ +# $Id: PKGBUILD 167536 2012-10-02 10:58:46Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Jan de Groot <jgc@archlinux.org> + +pkgname=cheese +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Use your webcam to take photos and videos, apply fancy special effects and share the fun with others" +arch=(i686 x86_64) +license=('GPL') +depends=('gtk3' 'gstreamer' 'gst-plugins-bad' 'gst-plugins-base' 'gst-plugins-good' 'clutter-gst' 'clutter-gtk' 'libcanberra' 'libgee' 'gnome-video-effects' 'librsvg' 'gnome-desktop') +makedepends=('pkgconfig' 'intltool' 'gobject-introspection' 'itstool' 'vala' 'nautilus-sendto') +optdepends=('nautilus-sendto: Send images') +groups=('gnome-extra') +options=('!libtool' '!emptydirs') +url="http://www.gnome.org/projects/cheese/" +install=cheese.install +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('f0872c6c276fabf054e37e427cb4a4174351a439ebfae7431ecc09a1837e9a80') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --disable-static --disable-schemas-compile + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/cheese/cheese.install b/gnome-unstable/cheese/cheese.install new file mode 100644 index 000000000..f7e8c46ac --- /dev/null +++ b/gnome-unstable/cheese/cheese.install @@ -0,0 +1,12 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/eog/PKGBUILD b/gnome-unstable/eog/PKGBUILD index a5703bd8a..c64b08382 100644 --- a/gnome-unstable/eog/PKGBUILD +++ b/gnome-unstable/eog/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166892 2012-09-20 22:54:41Z jgc $ +# $Id: PKGBUILD 167529 2012-10-02 10:02:14Z jgc $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> pkgname=eog -pkgver=3.5.92 +pkgver=3.6.0 pkgrel=1 pkgdesc="Eye of Gnome: An image viewing and cataloging program" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ groups=('gnome-extra') options=('!emptydirs' '!libtool') url="http://www.gnome.org" source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('b9ab6a1529d4b5199360b48bbe50d432cc9fe98aae800b5e607af421464bbe3f') +sha256sums=('8f8e43a337a3fb7071c650078f2ef89567b4889527f300d053491e9185dbae6b') build() { cd "$pkgname-$pkgver" diff --git a/gnome-unstable/gdk-pixbuf2/PKGBUILD b/gnome-unstable/gdk-pixbuf2/PKGBUILD new file mode 100644 index 000000000..514681b1e --- /dev/null +++ b/gnome-unstable/gdk-pixbuf2/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 167531 2012-10-02 10:18:16Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gdk-pixbuf2 +pkgver=2.26.4 +pkgrel=1 +pkgdesc="An image loading library" +arch=('i686' 'x86_64') +url="http://www.gtk.org/" +license=('GPL2') +depends=('glib2' 'libpng' 'libtiff' 'libjpeg' 'libx11') +makedepends=('gtk-doc' 'gobject-introspection') +options=('!libtool') +install=gdk-pixbuf2.install +source=(http://download.gnome.org/sources/gdk-pixbuf/${pkgver%.*}/gdk-pixbuf-$pkgver.tar.xz) +sha256sums=('a91458645f078debf204fef8bb06b30f356fcb5d48f65395132a5dba2b3510be') + +build() { + cd gdk-pixbuf-$pkgver + + ./configure --prefix=/usr \ + --without-libjasper \ + --with-x11 \ + --with-included-loaders=png + make +} + +package() { + cd gdk-pixbuf-$pkgver + + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install b/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install new file mode 100644 index 000000000..f04c0967a --- /dev/null +++ b/gnome-unstable/gdk-pixbuf2/gdk-pixbuf2.install @@ -0,0 +1,11 @@ +post_install() { + gdk-pixbuf-query-loaders --update-cache +} + +post_upgrade() { + post_install +} + +pre_remove() { + rm -f /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/loaders.cache +} diff --git a/gnome-unstable/gnome-bluetooth/PKGBUILD b/gnome-unstable/gnome-bluetooth/PKGBUILD index 7437fc613..9df4296a6 100644 --- a/gnome-unstable/gnome-bluetooth/PKGBUILD +++ b/gnome-unstable/gnome-bluetooth/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 167079 2012-09-25 09:40:56Z jgc $ +# $Id: PKGBUILD 167534 2012-10-02 10:33:21Z jgc $ # Maintainer: Ionut Biru <ibiru@archlinux.org> # Contributor: Roman Kyrylych <roman@archlinux.org> pkgname=gnome-bluetooth -pkgver=3.5.92 +pkgver=3.6.0 pkgrel=1 pkgdesc="The GNOME Bluetooth Subsystem" arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs') install=gnome-bluetooth.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz 61-gnome-bluetooth-rfkill.rules) -sha256sums=('bb832118364be36510d32e6e33e90788c0f651c82c146f9abd800403f0a235f8' +sha256sums=('021d9711d76e6d195812b1804ff39b5936ce978c25f900bc92e4bffd7045d306' 'b8acb8ea2e7f3588575cffd8ea14ec50c8641f518f2ea899771a508b299ea474') build() { diff --git a/gnome-unstable/gnome-color-manager/PKGBUILD b/gnome-unstable/gnome-color-manager/PKGBUILD new file mode 100644 index 000000000..b8b7089ac --- /dev/null +++ b/gnome-unstable/gnome-color-manager/PKGBUILD @@ -0,0 +1,35 @@ +# $Id: PKGBUILD 167683 2012-10-03 00:26:49Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=gnome-color-manager +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Color profile manager for the GNOME desktop" +arch=(i686 x86_64) +url="http://projects.gnome.org/gnome-color-manager/" +license=(GPL2) +depends=('libcanberra' 'vte3' 'exiv2' 'hicolor-icon-theme' 'desktop-file-utils' 'clutter-gtk' + 'mash' 'shared-color-profiles' 'shared-color-targets' 'gnome-desktop' 'colord-gtk') +makedepends=('intltool' 'yelp-tools') +install=gnome-color-manager.install +options=('!libtool' '!emptydirs') +groups=('gnome-extra') +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('c4e9d63c53061c65c4d1bcdd14952dd01aed7332c2e36d34f4a243a9e5097ec9') + +build(){ + cd $pkgname-$pkgver + + # man pages need docbook-sgml, which we don't have + ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-color-manager --disable-static --disable-man-pages + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-color-manager/gnome-color-manager.install b/gnome-unstable/gnome-color-manager/gnome-color-manager.install new file mode 100644 index 000000000..04fda0ddc --- /dev/null +++ b/gnome-unstable/gnome-color-manager/gnome-color-manager.install @@ -0,0 +1,19 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +pre_upgrade() { + if (( $(vercmp $2 2.90.0) < 0 )); then + usr/sbin/gconfpkg --uninstall gnome-color-manager + fi +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-contacts/PKGBUILD b/gnome-unstable/gnome-contacts/PKGBUILD new file mode 100644 index 000000000..4c3ac48c8 --- /dev/null +++ b/gnome-unstable/gnome-contacts/PKGBUILD @@ -0,0 +1,29 @@ +# $Id: PKGBUILD 167540 2012-10-02 11:23:59Z jgc $ +# Maintainer: Ionut Biru <ibiru@archlinux.org> + +pkgname=gnome-contacts +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Contacts Manager for GNOME" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL2') +groups=(gnome-extra) +depends=('gtk3' 'folks' 'libnotify' 'gnome-desktop' 'dconf' 'gnome-online-accounts' 'libgee' 'telepathy-glib' 'cheese') +makedepends=('intltool' 'vala') +install=$pkgname.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('203ed52fbdad3412fa88ae011c0d1cf94e8fe15c13dc192e8be554a1268614a5') + +build() { + cd $pkgname-$pkgver + ./configure --prefix=/usr --libexecdir=/usr/lib/gnome-contacts + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-contacts/gnome-contacts.install b/gnome-unstable/gnome-contacts/gnome-contacts.install new file mode 100644 index 000000000..c19349f72 --- /dev/null +++ b/gnome-unstable/gnome-contacts/gnome-contacts.install @@ -0,0 +1,11 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-disk-utility/PKGBUILD b/gnome-unstable/gnome-disk-utility/PKGBUILD new file mode 100644 index 000000000..189d66771 --- /dev/null +++ b/gnome-unstable/gnome-disk-utility/PKGBUILD @@ -0,0 +1,30 @@ +# $Id: PKGBUILD 167542 2012-10-02 11:41:39Z jgc $ +# Maintainer: Jan de Groot <jgc@archlinux.org> +# Contributor: Silvio Knizek (killermoehre) + +pkgname=gnome-disk-utility +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Disk Management Utility for GNOME" +arch=('i686' 'x86_64') +license=('GPL') +url="http://www.gnome.org" +groups=('gnome-extra') +depends=('gtk3' 'udisks2' 'hicolor-icon-theme' 'libsecret' 'libpwquality' 'desktop-file-utils') +makedepends=('intltool' 'docbook-xsl') +options=('!libtool' '!emptydirs') +install=gnome-disk-utility.install +source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('0e3ccd8ae0f79a8ccc41bfaaf0f34c14fec7b193249e650862c589d82053e57d') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --sysconfdir=/etc + + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install b/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install new file mode 100644 index 000000000..8b17fa3d4 --- /dev/null +++ b/gnome-unstable/gnome-disk-utility/gnome-disk-utility.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/gnome-documents/PKGBUILD b/gnome-unstable/gnome-documents/PKGBUILD new file mode 100644 index 000000000..7cb5fb873 --- /dev/null +++ b/gnome-unstable/gnome-documents/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 167688 2012-10-03 00:43:15Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=gnome-documents +pkgver=3.6.0 +pkgrel=1 +pkgdesc="Documents Manager for GNOME" +arch=(i686 x86_64) +url="http://www.gnome.org" +license=('GPL') +groups=('gnome-extra') +depends=('clutter-gtk' 'evince' 'gjs' 'gtk3' 'gnome-desktop' 'gnome-online-accounts' 'libgdata' + 'tracker' 'libzapojit') +makedepends=('intltool') +optdepends=('unoconv: Support for Libreoffice document types') +options=('!libtool') +install=gnome-documents.install +source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('a4a5c525cba047a6c8f712f8a0d73fc26dc0445d4c8278c10ecbeac4efd342e2') + +build() { + cd $pkgname-$pkgver + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/gnome-documents + make +} + +package() { + cd $pkgname-$pkgver + make DESTDIR="$pkgdir" install +} + +# vim:set ts=2 sw=2 et: diff --git a/gnome-unstable/gnome-documents/gnome-documents.install b/gnome-unstable/gnome-documents/gnome-documents.install new file mode 100644 index 000000000..1571179ca --- /dev/null +++ b/gnome-unstable/gnome-documents/gnome-documents.install @@ -0,0 +1,13 @@ +post_install() { + glib-compile-schemas /usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/gnome-unstable/libzapojit/PKGBUILD b/gnome-unstable/libzapojit/PKGBUILD new file mode 100644 index 000000000..af49e2190 --- /dev/null +++ b/gnome-unstable/libzapojit/PKGBUILD @@ -0,0 +1,26 @@ +# $Id: PKGBUILD 167689 2012-10-03 00:44:12Z heftig $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> + +pkgname=libzapojit +pkgver=0.0.2 +pkgrel=1 +pkgdesc="GLib/GObject wrapper for the SkyDrive and Hotmail REST APIs" +arch=('i686' 'x86_64') +license=('GPL') +depends=('libsoup' 'gnome-online-accounts') +makedepends=('intltool' 'gobject-introspection') +url="http://www.gnome.org" +options=('!libtool') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('7b5a2fcf8e94fa8c869098b8461104633f4b046c471a03e3fea2b1a358574b24') + +build() { + cd "$pkgname-$pkgver" + ./configure --prefix=/usr --disable-static + make +} + +package() { + cd "$pkgname-$pkgver" + make DESTDIR="$pkgdir" install +} diff --git a/gnome-unstable/tracker/PKGBUILD b/gnome-unstable/tracker/PKGBUILD new file mode 100644 index 000000000..5751a041e --- /dev/null +++ b/gnome-unstable/tracker/PKGBUILD @@ -0,0 +1,90 @@ +# $Id: PKGBUILD 167544 2012-10-02 13:24:36Z jgc $ +# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> +# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Contributor: Alexander Fehr <pizzapunk gmail com> + +pkgbase=tracker +pkgname=(tracker libtracker-sparql) +pkgver=0.14.2 +_tver=${pkgver%.*} +pkgrel=2 +pkgdesc="All-in-one indexer, search tool and metadata database" +arch=('i686' 'x86_64') +license=('GPL') +makedepends=('libgee' 'libgnome-keyring' 'upower' 'libexif' 'exempi' + 'poppler-glib' 'libgsf' 'icu' 'enca' 'networkmanager' 'gtk3' + 'desktop-file-utils' 'hicolor-icon-theme' 'gobject-introspection' + 'intltool' 'giflib' 'gstreamer0.10-base' 'totem-plparser' + 'taglib' 'nautilus' 'gnome-panel' 'libvorbis' 'flac' 'vala') +url="http://www.gnome.org" +options=('!libtool' '!emptydirs') +source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/$_tver/$pkgbase-$pkgver.tar.xz + bug675660.patch + tracker-extract-pdf-crash-fix.patch) +sha256sums=('9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1' + '77c1377860f09aba42fc0bb662cb188613d5ed3744f3ffb3a710d1e60499cb8c' + 'afa14805b9a1adb2442dc4a6032b1575a07a87aa969599ca28669a2cf975e772') + +build() { + cd $pkgbase-$pkgver + + patch -Np1 -i "${srcdir}/bug675660.patch" + patch -Np1 -i "${srcdir}/tracker-extract-pdf-crash-fix.patch" + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --libexecdir=/usr/lib/tracker \ + --disable-unit-tests \ + --enable-libflac \ + --enable-libvorbis + + sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0 /g' -e 's/ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then/ func_append compile_command " -Wl,-O1,--as-needed"\n func_append finalize_command " -Wl,-O1,--as-needed"\n\0/' libtool + + make +} + +package_tracker() { + depends=("libtracker-sparql=$pkgver-$pkgrel" 'libgee' 'libgnome-keyring' + 'upower' 'libexif' 'exempi' 'poppler-glib' 'libgsf' 'enca' + 'networkmanager' 'gtk3' 'desktop-file-utils' 'hicolor-icon-theme') + optdepends=('giflib: extractor for GIF data' + 'gstreamer0.10-base: video extractor' + 'totem-plparser: playlist support' + 'nautilus: nautilus-extension' + 'libvorbis: Vorbis metadata extractor' + 'flac: FLAC metadata extractor' + 'taglib: writeback for audio files' + 'gnome-panel: tracker-search-bar') + groups=('gnome-extra') + install=tracker.install + + cd $pkgbase-$pkgver + make DESTDIR="$pkgdir" install + +### Split libtracker-sparql + + mkdir -p "$srcdir"/sparql/usr/{include,lib}/tracker-$_tver + mkdir -p "$srcdir"/sparql/usr/lib/{girepository-1.0,pkgconfig} + mkdir -p "$srcdir"/sparql/usr/share/{gir-1.0,vala/vapi} + + mv "$pkgdir"/usr/lib/libtracker-sparql-* "$srcdir/sparql/usr/lib" + + mv "$pkgdir"/usr/lib/tracker-$_tver/*.so* \ + "$srcdir/sparql/usr/lib/tracker-$_tver" + + mv "$pkgdir"/usr/share/vala/vapi/tracker-sparql-* \ + "$srcdir/sparql/usr/share/vala/vapi" + + mv {"$pkgdir","$srcdir/sparql"}/usr/include/tracker-$_tver/libtracker-sparql + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/girepository-1.0/Tracker-$_tver.typelib + mv {"$pkgdir","$srcdir/sparql"}/usr/lib/pkgconfig/tracker-sparql-$_tver.pc + mv {"$pkgdir","$srcdir/sparql"}/usr/share/gir-1.0/Tracker-$_tver.gir +} + +package_libtracker-sparql() { + pkgdesc="$pkgdesc (SPARQL library)" + depends=('sqlite' 'icu' 'glib2' 'libffi' 'pcre' 'util-linux') + + mv "$srcdir"/sparql/* "$pkgdir" +} diff --git a/gnome-unstable/tracker/bug675660.patch b/gnome-unstable/tracker/bug675660.patch new file mode 100644 index 000000000..5f217d983 --- /dev/null +++ b/gnome-unstable/tracker/bug675660.patch @@ -0,0 +1,29 @@ +From 48713ba26af38a15a97fc7ebb0828cd287ef2447 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev <tetromino@gentoo.org> +Date: Fri, 20 Jul 2012 14:46:33 +0000 +Subject: libtracker-fts: ICU cannot handle complex locale descriptions + +ubrk_open expects the name of just a single locale (e.g. "en_US.UTF-8"), +not the full definition of your various locale variables and their +values as returned by glibc's setlocale(LC_ALL, NULL). + +Instead, limit ourselves to LC_CTYPE, since after all, that's all we +need to determine word boundaries. + +Fixes GB#675660. +--- +diff --git a/src/libtracker-fts/tracker-parser-libicu.c b/src/libtracker-fts/tracker-parser-libicu.c +index 7388f69..69f75ed 100644 +--- a/src/libtracker-fts/tracker-parser-libicu.c ++++ b/src/libtracker-fts/tracker-parser-libicu.c +@@ -676,7 +676,7 @@ tracker_parser_reset (TrackerParser *parser, + + /* Open word-break iterator */ + parser->bi = ubrk_open(UBRK_WORD, +- setlocale (LC_ALL, NULL), ++ setlocale (LC_CTYPE, NULL), + parser->utxt, + parser->utxt_size, + &error); +-- +cgit v0.9.0.2 diff --git a/gnome-unstable/tracker/tracker-extract-pdf-crash-fix.patch b/gnome-unstable/tracker/tracker-extract-pdf-crash-fix.patch new file mode 100644 index 000000000..ac8522f6a --- /dev/null +++ b/gnome-unstable/tracker/tracker-extract-pdf-crash-fix.patch @@ -0,0 +1,22 @@ +From 008677280d32b6db56483832b143760888c91ad4 Mon Sep 17 00:00:00 2001 +From: Sam Thursfield <sam.thursfield@codethink.co.uk> +Date: Tue, 31 Jul 2012 14:26:53 +0000 +Subject: tracker-extract-pdf: Fix crash if mmap() fails + +Patch from Fedora: https://bugzilla.redhat.com/show_bug.cgi?id=751922 +--- +diff --git a/src/tracker-extract/tracker-extract-pdf.c b/src/tracker-extract/tracker-extract-pdf.c +index caa24c7..85066b3 100644 +--- a/src/tracker-extract/tracker-extract-pdf.c ++++ b/src/tracker-extract/tracker-extract-pdf.c +@@ -451,7 +451,7 @@ tracker_extract_get_metadata (TrackerExtractInfo *info) + len = 0; + } else { + contents = (gchar *) mmap (NULL, st.st_size, PROT_READ, MAP_PRIVATE, fd, 0); +- if (contents == NULL) { ++ if (contents == NULL || contents == MAP_FAILED) { + g_warning ("Could not mmap pdf file '%s': %s\n", + filename, + g_strerror (errno)); +-- +cgit v0.9.0.2 diff --git a/gnome-unstable/tracker/tracker.install b/gnome-unstable/tracker/tracker.install new file mode 100644 index 000000000..95114273e --- /dev/null +++ b/gnome-unstable/tracker/tracker.install @@ -0,0 +1,13 @@ +post_install() { + usr/bin/glib-compile-schemas usr/share/glib-2.0/schemas + update-desktop-database -q + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/multilib-staging/lib32-glu/PKGBUILD b/multilib-staging/lib32-glu/PKGBUILD new file mode 100644 index 000000000..47e0f4d2f --- /dev/null +++ b/multilib-staging/lib32-glu/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 76975 2012-10-02 19:05:10Z lcarlier $ +# Maintainer: Laurent Carlier <lordheavym@gmail.com> + +pkgname=lib32-glu +pkgver=9.0.0 +pkgrel=1 +pkgdesc="Mesa OpenGL utility library (32 bits)" +arch=('x86_64') +url="http://mesa.freedesktop.org/" +license=('LGPL') +depends=('lib32-libgl') +makedepends=('gcc-multilib' 'lib32-mesa') +options=('!libtool') +source=(ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.bz2) +sha256sums=('1f7ad0d379a722fcbd303aa5650c6d7d5544fde83196b42a73d1193568a4df12') + +build() { + cd ${srcdir}/glu-$pkgver + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + ./configure --prefix=/usr --disable-static \ + --libdir=/usr/lib32 + make +} + +check() { + cd "$srcdir/glu-$pkgver" + + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + + make -k check +} + +package() { + cd ${srcdir}/glu-$pkgver + + make DESTDIR=${pkgdir} install + + rm -rf ${pkgdir}/usr/include +} diff --git a/multilib-staging/lib32-mesa/PKGBUILD b/multilib-staging/lib32-mesa/PKGBUILD new file mode 100644 index 000000000..e796b9e2b --- /dev/null +++ b/multilib-staging/lib32-mesa/PKGBUILD @@ -0,0 +1,248 @@ +# $Id: PKGBUILD 76978 2012-10-02 21:18:44Z lcarlier $ +# Contributor: Jan de Groot <jgc@archlinux.org> +# Contributor: Andreas Radke <andyrtr@archlinux.org> + +pkgbase=lib32-mesa +pkgname=('lib32-libglapi' 'lib32-libgl' 'lib32-mesa' 'lib32-osmesa' 'lib32-libgles' 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri') # lib32-libgbm needs udev + +_git=true +_gitdate=20121002 +#_git=false + +if [ "${_git}" = "true" ]; then + pkgver=8.99.git_$_gitdate + else + pkgver=8.0.4 +fi + +pkgrel=1 +arch=('x86_64') +makedepends=('glproto>=1.4.16' 'lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' 'lib32-libx11>=1.5.0' + 'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'gcc-multilib' 'imake' 'lib32-llvm') +url="http://mesa3d.sourceforge.net" +license=('custom') +options=('!libtool') +source=(mesa-radeon-parallel-make.diff) +if [ "${_git}" = "true" ]; then + # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 + #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') + source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-604cd6b966d060334fdaa11ae8444797d54d3142.tar.gz") +else + source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2") +fi +md5sums=('549f6a106686ecab7ec9f9c3602d64c3' + 'e9fedcc48587dfa14a242bbf339c228e') + +build() { + export CC="gcc -m32" + export CXX="g++ -m32" + export PKG_CONFIG_PATH="/usr/lib32/pkgconfig" + # for our llvm-config for 32 bit + export LLVM_CONFIG=/usr/bin/llvm-config32 + + # fix segfault with gfx cards > Ati R700 + export CFLAGS="${CFLAGS} -O1" + export CXXFLAGS="${CXXFLAGS} -O1" + + cd ${srcdir}/?esa-* + + # fix parallel build - http://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/radeon/Makefile?id=cebbdd4ac23725963207bf6f8fc7101150e6065f + # and the next commit - http://cgit.freedesktop.org/mesa/mesa/commit/?id=2baaa5c7eb21517f0197bfd91154e9b4886fbb1b + patch -Np1 -i ${srcdir}/mesa-radeon-parallel-make.diff + + COMMONOPTS="--prefix=/usr \ + --sysconfdir=/etc \ + --with-dri-driverdir=/usr/lib32/xorg/modules/dri \ + --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \ + --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ + --enable-gallium-llvm \ + --disable-gallium-egl --enable-shared-glapi \ + --enable-shared-glapi \ + --enable-glx-tls \ + --enable-dri \ + --enable-gles1 \ + --enable-gles2 \ + --disable-egl \ + --enable-texture-float \ + --enable-osmesa \ + --enable-32-bit \ + --libdir=/usr/lib32 " + # --enable-gbm disabled because it needs udev + + if [ "${_git}" = "true" ]; then + ./autogen.sh \ + $COMMONOPTS + else + autoreconf -vfi + ./configure \ + $COMMONOPTS + fi + + make +} + +package_lib32-libglapi() { + depends=('lib32-glibc' 'libglapi') + pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions (32-bits)" + + cd ${srcdir}/?esa-* + + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" + ln -s libglapi "${pkgdir}/usr/share/licenses/libglapi/lib32-libglapi" +} + +package_lib32-libgl() { + depends=('lib32-libdrm>=2.4.39' 'lib32-libxxf86vm>=1.1.2' 'lib32-libxdamage>=1.1.3' 'lib32-expat>=2.1.0' 'lib32-libglapi' 'libgl') + pkgdesc="Mesa 3-D graphics library and DRI software rasterizer (32-bit)" + # currently disabled so force the remove + conflicts=('lib32-libgbm') + replace=('lib32-libgbm') + + cd ${srcdir}/?esa-* + + # fix linking because of splitted package + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + # libGL & libdricore + make -C src/glx DESTDIR="${pkgdir}" install + make -C src/mesa/libdricore DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall + + # --with-gallium-drivers=swrast + make -C src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/libgl" + ln -s libgl "${pkgdir}/usr/share/licenses/libgl/lib32-libgl" +} + +package_lib32-mesa() { + depends=('lib32-libgl' 'lib32-libx11>=1.5.0' 'lib32-libxt>=1.1.3' 'lib32-gcc-libs>=4.7.1-6' 'mesa') + pkgdesc="Mesa 3-D graphics libraries and include files (32-bit)" + + cd ${srcdir}/?esa-* + + # .pc files + make -C src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA + make -C src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" + ln -s mesa "$pkgdir/usr/share/licenses/mesa/lib32-mesa" +} + +package_lib32-osmesa() { + depends=('lib32-mesa') + optdepends=('opengl-man-pages: for the OpenGL API man pages') + pkgdesc="Mesa 3D off-screen rendering library (32-bits)" + + make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install +} + +package_lib32-libgbm() { + depends=('lib32-libglapi' 'lib32-libdrm' 'libgbm') + pkgdesc="Mesa gbm library (32-bit)" + + cd ${srcdir}/?esa-* + + # fix linking because of splitted package + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + make -C src/gbm DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" + ln -s libgbm "$pkgdir/usr/share/licenses/libgbm/lib32-libgbm" +} + +package_lib32-libgles() { + depends=('lib32-libglapi' 'lib32-libdrm' 'libgles') + pkgdesc="Mesa GLES libraries (32-bit)" + + cd ${srcdir}/?esa-* + + # fix linking because of splitted package + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + # --enable-gles1 --enable-gles2 + make -C src/mapi/es1api DESTDIR="${pkgdir}" install + make -C src/mapi/es2api DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall + + rm -r "${pkgdir}"/usr/include + + install -m755 -d "${pkgdir}/usr/share/licenses/libgles" + ln -s libgles "$pkgdir/usr/share/licenses/libgles/lib32-libgles" +} + +package_lib32-ati-dri() { + depends=("lib32-libgl=${pkgver}" 'ati-dri') + pkgdesc="Mesa DRI radeon/r200 + Gallium3D for r300 and later chipsets drivers for AMD/ATI Radeon (32-bit)" + conflicts=('xf86-video-ati<6.9.0-6') + + cd ${srcdir}/?esa-* + + # fix linking because of splitted package + make -C src/mesa/libdricore DESTDIR="${pkgdir}" install + + # classic mesa drivers for radeon,r200 + make -C src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install + make -C src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install + # gallium3D driver for r300,r600 + make -C src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install + make -C src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install + make -C src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri" + ln -s ati-dri "$pkgdir/usr/share/licenses/ati-dri/lib32-ati-dri" +} + +package_lib32-intel-dri() { + depends=("lib32-libgl=${pkgver}" 'intel-dri') + pkgdesc="Mesa DRI drivers for Intel (32-bit)" + + cd ${srcdir}/?esa-* + + # fix linking because of splitted package + make -C src/mesa/libdricore DESTDIR="${pkgdir}" install + + make -C src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install + make -C src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri" + ln -s intel-dri "$pkgdir/usr/share/licenses/intel-dri/lib32-intel-dri" +} + +package_lib32-nouveau-dri() { + depends=("lib32-libgl=${pkgver}" 'nouveau-dri') + pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau (32-bit)" + + cd ${srcdir}/?esa-* + + # fix linking because of splitted package + make -C src/mesa/libdricore DESTDIR="${pkgdir}" install + + # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so + make -C src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install + # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so + make -C src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" + ln -s nouveau-dri "$pkgdir/usr/share/licenses/nouveau-dri/lib32-nouveau-dri" +} + diff --git a/multilib-staging/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/multilib-staging/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch new file mode 100644 index 000000000..922577aef --- /dev/null +++ b/multilib-staging/lib32-mesa/mesa-8.0.3-llvm-3.1-fixes.patch @@ -0,0 +1,44 @@ +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +index a50a51d..f1bb4d9 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +@@ -235,7 +235,24 @@ lp_disassemble(const void* func) + int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); + #endif + +-#if HAVE_LLVM >= 0x0300 ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); ++ if (!MRI) { ++ debug_printf("error: no register info for target %s\n", Triple.c_str()); ++ return; ++ } ++ ++ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); ++ if (!MII) { ++ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); ++ return; ++ } ++#endif ++ ++#if HAVE_LLVM >= 0x0301 ++ OwningPtr<MCInstPrinter> Printer( ++ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); ++#elif HAVE_LLVM == 0x0300 + OwningPtr<MCInstPrinter> Printer( + T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); + #elif HAVE_LLVM >= 0x0208 +diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +index fe7616b..68f8808 100644 +--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp ++++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp +@@ -62,7 +62,11 @@ + extern "C" void + lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) + { ++#if HAVE_LLVM >= 0x0301 ++ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); ++#else + llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); ++#endif + } diff --git a/multilib-staging/lib32-mesa/mesa-radeon-parallel-make.diff b/multilib-staging/lib32-mesa/mesa-radeon-parallel-make.diff new file mode 100644 index 000000000..a9ea10fc4 --- /dev/null +++ b/multilib-staging/lib32-mesa/mesa-radeon-parallel-make.diff @@ -0,0 +1,129 @@ +From cebbdd4ac23725963207bf6f8fc7101150e6065f Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Wed, 29 Aug 2012 13:01:15 +0000 +Subject: radeon/llvm: Cleanup makefile + +Hopefully, this will fix all the parallel make problems people have +been having. +--- +diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile +index 43f668a..7f1c613 100644 +--- a/src/gallium/drivers/radeon/Makefile ++++ b/src/gallium/drivers/radeon/Makefile +@@ -20,8 +20,6 @@ tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3 + + HAVE_LLVM_INTRINSICS = $(shell grep IntrinsicsR600.td $(LLVM_INCLUDEDIR)/llvm/Intrinsics.td) + +-gen: $(GENERATED_SOURCES) +- + SIRegisterInfo.td: SIGenRegisterInfo.pl + $(PERL) $^ > $@ + +@@ -38,37 +36,37 @@ endif + R600RegisterInfo.td: R600GenRegisterInfo.pl + $(PERL) $^ > $@ + +-AMDGPUGenRegisterInfo.inc: *.td ++AMDGPUGenRegisterInfo.inc: $(TD_FILES) + $(call tablegen, -gen-register-info, AMDGPU.td, $@) + +-AMDGPUGenInstrInfo.inc: *.td ++AMDGPUGenInstrInfo.inc: $(TD_FILES) + $(call tablegen, -gen-instr-info, AMDGPU.td, $@) + +-AMDGPUGenAsmWriter.inc: *.td ++AMDGPUGenAsmWriter.inc: $(TD_FILES) + $(call tablegen, -gen-asm-writer, AMDGPU.td, $@) + +-AMDGPUGenDAGISel.inc: *.td ++AMDGPUGenDAGISel.inc: $(TD_FILES) + $(call tablegen, -gen-dag-isel, AMDGPU.td, $@) + +-AMDGPUGenCallingConv.inc: *.td ++AMDGPUGenCallingConv.inc: $(TD_FILES) + $(call tablegen, -gen-callingconv, AMDGPU.td, $@) + +-AMDGPUGenSubtargetInfo.inc: *.td ++AMDGPUGenSubtargetInfo.inc: $(TD_FILES) + $(call tablegen, -gen-subtarget, AMDGPU.td, $@) + +-AMDGPUGenEDInfo.inc: *.td ++AMDGPUGenEDInfo.inc: $(TD_FILES) + $(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@) + +-AMDGPUGenIntrinsics.inc: *.td ++AMDGPUGenIntrinsics.inc: $(TD_FILES) + $(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@) + +-AMDGPUGenCodeEmitter.inc: *.td ++AMDGPUGenCodeEmitter.inc: $(TD_FILES) + $(call tablegen, -gen-emitter, AMDGPU.td, $@) + +-AMDGPUGenMCCodeEmitter.inc: *.td ++AMDGPUGenMCCodeEmitter.inc: $(TD_FILES) + $(call tablegen, -mc-emitter -gen-emitter, AMDGPU.td, $@) + +-AMDGPUGenDFAPacketizer.inc: *.td ++AMDGPUGenDFAPacketizer.inc: $(TD_FILES) + $(call tablegen, -gen-dfa-packetizer, AMDGPU.td, $@) + + LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser) +diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources +index 2eb1120..333dd03 100644 +--- a/src/gallium/drivers/radeon/Makefile.sources ++++ b/src/gallium/drivers/radeon/Makefile.sources +@@ -1,4 +1,30 @@ + ++TD_FILES := \ ++ AMDGPU.td \ ++ AMDGPUInstrInfo.td \ ++ AMDGPUInstructions.td \ ++ AMDGPUIntrinsics.td \ ++ AMDGPURegisterInfo.td \ ++ AMDILBase.td \ ++ AMDILInstrInfo.td \ ++ AMDILIntrinsics.td \ ++ AMDILRegisterInfo.td \ ++ Processors.td \ ++ R600InstrInfo.td \ ++ R600Instructions.td \ ++ R600Intrinsics.td \ ++ R600IntrinsicsNoOpenCL.td \ ++ R600IntrinsicsOpenCL.td \ ++ R600RegisterInfo.td \ ++ R600Schedule.td \ ++ SIInstrFormats.td \ ++ SIInstrInfo.td \ ++ SIInstructions.td \ ++ SIIntrinsics.td \ ++ SIRegisterInfo.td \ ++ SISchedule.td ++ ++ + GENERATED_SOURCES := \ + R600Intrinsics.td \ + R600RegisterInfo.td \ +-- +cgit v0.9.0.2-2-gbebe +From 2baaa5c7eb21517f0197bfd91154e9b4886fbb1b Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Thu, 06 Sep 2012 14:05:22 +0000 +Subject: radeon/llvm: Remove R600InstrInfo.td from TD_FILES + +Fixes build bug introduced by +cebbdd4ac23725963207bf6f8fc7101150e6065f +--- +diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources +index 333dd03..f387636 100644 +--- a/src/gallium/drivers/radeon/Makefile.sources ++++ b/src/gallium/drivers/radeon/Makefile.sources +@@ -10,7 +10,6 @@ TD_FILES := \ + AMDILIntrinsics.td \ + AMDILRegisterInfo.td \ + Processors.td \ +- R600InstrInfo.td \ + R600Instructions.td \ + R600Intrinsics.td \ + R600IntrinsicsNoOpenCL.td \ +-- +cgit v0.9.0.2-2-gbebe diff --git a/staging/mesa/PKGBUILD b/staging/mesa/PKGBUILD index ad5805e58..2b8d95b63 100644 --- a/staging/mesa/PKGBUILD +++ b/staging/mesa/PKGBUILD @@ -1,77 +1,57 @@ -# $Id: PKGBUILD 161649 2012-06-13 10:34:32Z ibiru $ +# $Id: PKGBUILD 167550 2012-10-02 17:40:28Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Maintainer: Andreas Radke <andyrtr@archlinux.org> pkgbase=mesa -pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri') #'nouveau-dri') +pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri') -#_git=true -_gitdate=20111031 -_git=false +_git=true +_gitdate=20121002 +#_git=false if [ "${_git}" = "true" ]; then - pkgver=7.10.99.git20110709 - #pkgver=7.11 + pkgver=8.99.git_$_gitdate 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') +makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3' + 'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm' 'systemd' 'libvdpau>=0.5') url="http://mesa3d.sourceforge.net" license=('custom') +options=('!libtool') source=(LICENSE - mesa-8.0.3-llvm-3.1-fixes.patch) + mesa-radeon-parallel-make.diff) if [ "${_git}" = "true" ]; then - # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0 - #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2') - source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2") + # mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0 + #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz') + source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-604cd6b966d060334fdaa11ae8444797d54d3142.tar.gz") else source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2" #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2" - #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2" ) fi md5sums=('5c65a0fe315dd347e09b1f2826a1df5a' - 'c452ed3392468170726c004c2f4e02ca' - 'cc5ee15e306b8c15da6a478923797171') + '5dca6edbe6b636c59c2e64f77271f12a' + '71af5320af6873920384d245f103b892') build() { cd ${srcdir}/?esa-* - patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch" + # fix parallel build - http://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/radeon/Makefile?id=cebbdd4ac23725963207bf6f8fc7101150e6065f + # and the next commit - http://cgit.freedesktop.org/mesa/mesa/commit/?id=2baaa5c7eb21517f0197bfd91154e9b4886fbb1b + patch -Np1 -i ${srcdir}/mesa-radeon-parallel-make.diff -if [ "${_git}" = "true" ]; then - autoreconf -vfi - ./autogen.sh --prefix=/usr \ + COMMONOPTS="--prefix=/usr \ + --sysconfdir=/etc \ --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,nouveau,svga,swrast \ + --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \ + --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \ --enable-gallium-llvm \ - --enable-gallium-egl \ - --enable-shared-glapi \ - --enable-gbm \ - --enable-glx-tls \ - --enable-dri \ - --enable-glx \ - --enable-osmesa \ - --enable-gles1 \ - --enable-gles2 \ --enable-egl \ - --enable-texture-float \ - --enable-xa \ - --enable-shared-dricore - #--enable-gbm \ - # --enable-gallium-svga \ - - else - autoreconf -vfi - ./configure --prefix=/usr \ - --with-dri-driverdir=/usr/lib/xorg/modules/dri \ - --with-gallium-drivers=r300,r600,svga,swrast \ - --with-dri-drivers=i915,i965,r200,radeon,swrast \ - --enable-gallium-llvm \ --enable-gallium-egl \ + --with-egl-platforms=x11,drm \ --enable-shared-glapi \ --enable-gbm \ --enable-glx-tls \ @@ -80,190 +60,231 @@ if [ "${_git}" = "true" ]; then --enable-osmesa \ --enable-gles1 \ --enable-gles2 \ - --enable-egl \ --enable-texture-float \ --enable-xa \ - --enable-shared-dricore + --enable-vdpau " + +# not default: +# --enable-gallium-egl enable optional EGL state tracker (not required for +# EGL support in Gallium with OpenGL and OpenGL ES) +# [default=disable] +# --enable-xa enable build of the XA X Acceleration API [default=no] + + +if [ "${_git}" = "true" ]; then + ./autogen.sh \ + $COMMONOPTS + else + autoreconf -vfi + ./configure \ + $COMMONOPTS fi - make + make +} + +package_libglapi() { + depends=('glibc') + pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" + + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" } package_libgl() { - depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs') + depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs') pkgdesc="Mesa 3-D graphics library and DRI software rasterizer" - #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri') - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + # libGL & libdricore + make -C ${srcdir}/?esa-*/src/glx DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall - bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/" - bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/" - bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/" - cd src/mesa/drivers/dri make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install + # See FS#26284 + install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions" ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" install -m755 -d "${pkgdir}/usr/share/licenses/libgl" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/" } +package_mesa() { + depends=('libgl' 'libx11>=1.5.0' 'libxt>=1.1.3' 'gcc-libs>=4.7.1-6') # check pkg/mesa/usr/lib/pkgconfig/gl.pc + optdepends=('opengl-man-pages: for the OpenGL API man pages') + pkgdesc="Mesa 3-D graphics libraries and include files" + + make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-glHEADERS + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-driincludeHEADERS + make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-pkgconfigDATA + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri DESTDIR="${pkgdir}" install-pkgconfigDATA + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/common DESTDIR="${pkgdir}" install-sysconfDATA + + make -C ${srcdir}/?esa-*/src/gallium/targets/xa-vmwgfx DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/mesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" +} + package_osmesa() { - depends=('mesa') + depends=('gcc-libs') optdepends=('opengl-man-pages: for the OpenGL API man pages') pkgdesc="Mesa 3D off-screen rendering library" - make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa -} - -package_libglapi() { - depends=('glibc') - pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions" - - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/" + make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/share/licenses/libglapi" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/" + install -m755 -d "${pkgdir}/usr/share/licenses/osmesa" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/" } package_libgbm() { - depends=('glibc') + depends=('systemd' 'libglapi' 'libdrm') pkgdesc="Mesa gbm library" - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall install -m755 -d "${pkgdir}/usr/share/licenses/libgbm" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/" } package_libgles() { - depends=('libglapi' 'khrplatform-devel') + depends=('libglapi' 'libdrm' 'khrplatform-devel') pkgdesc="Mesa GLES libraries and headers" - cd ${srcdir}/?esa-* - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/GLES" - install -m755 -d "${pkgdir}/usr/include/GLES2" - bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/" - bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" - bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + + make -C ${srcdir}/?esa-*/src/mapi/es1api DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mapi/es2api DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall install -m755 -d "${pkgdir}/usr/share/licenses/libgles" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/" } package_libegl() { - depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel') + depends=('libxext' 'libxfixes' 'libgbm' 'khrplatform-devel') pkgdesc="Mesa EGL libraries and headers" - cd ${srcdir}/?esa-* - make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install - install -m755 -d "${pkgdir}/usr/lib" - install -m755 -d "${pkgdir}/usr/lib/pkgconfig" - install -m755 -d "${pkgdir}/usr/include" - install -m755 -d "${pkgdir}/usr/include/" - install -m755 -d "${pkgdir}/usr/include/EGL" - install -m755 -d "${pkgdir}/usr/share" - install -m755 -d "${pkgdir}/usr/share/doc" + make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install install -m755 -d "${pkgdir}/usr/share/doc/libegl" - bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/" - install -m755 -d "${pkgdir}/usr/lib/egl" - bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/" - bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/" - bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/" - bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/" + install -m644 ${srcdir}/?esa-*/docs/egl.html "${pkgdir}/usr/share/doc/libegl/" + + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" install + + make -C ${srcdir}/?esa-*/src/egl DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/gbm DESTDIR="${pkgdir}" uninstall + make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall install -m755 -d "${pkgdir}/usr/share/licenses/libegl" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/" + + # fix file conflicts + rm -rf ${pkgdir}/usr/include/KHR } package_khrplatform-devel() { - #depends=('') pkgdesc="Khronos platform development package" - cd ${srcdir}/?esa-* install -m755 -d "${pkgdir}/usr/include/KHR" - bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" + install -m644 ${srcdir}/?esa-*/include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/" install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel" install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/" } -package_mesa() { - depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc - optdepends=('opengl-man-pages: for the OpenGL API man pages') - pkgdesc="Mesa 3-D graphics libraries and include files" - - cd ${srcdir}/?esa-* - make DESTDIR="${pkgdir}" install - - rm -f "${pkgdir}/usr/lib/libGL.so"* - rm -f "${pkgdir}/usr/lib/libglapi.so"* - rm -f "${pkgdir}/usr/lib/libgbm.so"* - rm -f "${pkgdir}/usr/lib/libGLESv"* - rm -f "${pkgdir}/usr/lib/libEGL"* - rm -rf "${pkgdir}/usr/lib/egl" - rm -f "${pkgdir}/usr/lib/libOSMesa"* - rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc} - rm -rf "${pkgdir}/usr/lib/xorg" - rm -f "${pkgdir}/usr/include/GL/glew.h" - rm -f "${pkgdir}/usr/include/GL/glxew.h" - rm -f "${pkgdir}/usr/include/GL/wglew.h" - rm -f "${pkgdir}/usr/include/GL/glut.h" - rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR} - - install -m755 -d "${pkgdir}/usr/share/licenses/mesa" - install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/" -} - package_ati-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon" conflicts=('xf86-video-ati<6.9.0-6') + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + # classic mesa drivers for radeon,r200 make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install - # gallium3D driver for r300,r600 + # gallium3D driver for r300,r600,radeonsi make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gallium/targets/dri-radeonsi DESTDIR="${pkgdir}" install + # vdpau driver + make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r300 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-r600 DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-radeonsi DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/" } package_intel-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa DRI drivers for Intel" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/" } package_nouveau-dri() { depends=("libgl=${pkgver}") pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau" + # fix linking because of splitted package + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" install + # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install + # vdpau driver + make -C ${srcdir}/?esa-*/src/gallium/targets/vdpau-nouveau DESTDIR="${pkgdir}" install + + # fix linking because of splitted package - cleanup + make -C ${srcdir}/?esa-*/src/mesa/libdricore DESTDIR="${pkgdir}" uninstall + + install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/" } package_svga-dri() { - depends=("mesa=${pkgver}") + depends=('gcc-libs' 'libdrm' 'expat') pkgdesc="Gallium3D VMware guest GL driver" make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri" + install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/" } diff --git a/staging/mesa/mesa-radeon-parallel-make.diff b/staging/mesa/mesa-radeon-parallel-make.diff new file mode 100644 index 000000000..2fc5a4793 --- /dev/null +++ b/staging/mesa/mesa-radeon-parallel-make.diff @@ -0,0 +1,129 @@ +From cebbdd4ac23725963207bf6f8fc7101150e6065f Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Wed, 29 Aug 2012 13:01:15 +0000 +Subject: radeon/llvm: Cleanup makefile + +Hopefully, this will fix all the parallel make problems people have +been having. +--- +diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile +index 43f668a..7f1c613 100644 +--- a/src/gallium/drivers/radeon/Makefile ++++ b/src/gallium/drivers/radeon/Makefile +@@ -20,8 +20,6 @@ tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3 + + HAVE_LLVM_INTRINSICS = $(shell grep IntrinsicsR600.td $(LLVM_INCLUDEDIR)/llvm/Intrinsics.td) + +-gen: $(GENERATED_SOURCES) +- + SIRegisterInfo.td: SIGenRegisterInfo.pl + $(PERL) $^ > $@ + +@@ -38,37 +36,37 @@ endif + R600RegisterInfo.td: R600GenRegisterInfo.pl + $(PERL) $^ > $@ + +-AMDGPUGenRegisterInfo.inc: *.td ++AMDGPUGenRegisterInfo.inc: $(TD_FILES) + $(call tablegen, -gen-register-info, AMDGPU.td, $@) + +-AMDGPUGenInstrInfo.inc: *.td ++AMDGPUGenInstrInfo.inc: $(TD_FILES) + $(call tablegen, -gen-instr-info, AMDGPU.td, $@) + +-AMDGPUGenAsmWriter.inc: *.td ++AMDGPUGenAsmWriter.inc: $(TD_FILES) + $(call tablegen, -gen-asm-writer, AMDGPU.td, $@) + +-AMDGPUGenDAGISel.inc: *.td ++AMDGPUGenDAGISel.inc: $(TD_FILES) + $(call tablegen, -gen-dag-isel, AMDGPU.td, $@) + +-AMDGPUGenCallingConv.inc: *.td ++AMDGPUGenCallingConv.inc: $(TD_FILES) + $(call tablegen, -gen-callingconv, AMDGPU.td, $@) + +-AMDGPUGenSubtargetInfo.inc: *.td ++AMDGPUGenSubtargetInfo.inc: $(TD_FILES) + $(call tablegen, -gen-subtarget, AMDGPU.td, $@) + +-AMDGPUGenEDInfo.inc: *.td ++AMDGPUGenEDInfo.inc: $(TD_FILES) + $(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@) + +-AMDGPUGenIntrinsics.inc: *.td ++AMDGPUGenIntrinsics.inc: $(TD_FILES) + $(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@) + +-AMDGPUGenCodeEmitter.inc: *.td ++AMDGPUGenCodeEmitter.inc: $(TD_FILES) + $(call tablegen, -gen-emitter, AMDGPU.td, $@) + +-AMDGPUGenMCCodeEmitter.inc: *.td ++AMDGPUGenMCCodeEmitter.inc: $(TD_FILES) + $(call tablegen, -mc-emitter -gen-emitter, AMDGPU.td, $@) + +-AMDGPUGenDFAPacketizer.inc: *.td ++AMDGPUGenDFAPacketizer.inc: $(TD_FILES) + $(call tablegen, -gen-dfa-packetizer, AMDGPU.td, $@) + + LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser) +diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources +index 2eb1120..333dd03 100644 +--- a/src/gallium/drivers/radeon/Makefile.sources ++++ b/src/gallium/drivers/radeon/Makefile.sources +@@ -1,4 +1,30 @@ + ++TD_FILES := \ ++ AMDGPU.td \ ++ AMDGPUInstrInfo.td \ ++ AMDGPUInstructions.td \ ++ AMDGPUIntrinsics.td \ ++ AMDGPURegisterInfo.td \ ++ AMDILBase.td \ ++ AMDILInstrInfo.td \ ++ AMDILIntrinsics.td \ ++ AMDILRegisterInfo.td \ ++ Processors.td \ ++ R600InstrInfo.td \ ++ R600Instructions.td \ ++ R600Intrinsics.td \ ++ R600IntrinsicsNoOpenCL.td \ ++ R600IntrinsicsOpenCL.td \ ++ R600RegisterInfo.td \ ++ R600Schedule.td \ ++ SIInstrFormats.td \ ++ SIInstrInfo.td \ ++ SIInstructions.td \ ++ SIIntrinsics.td \ ++ SIRegisterInfo.td \ ++ SISchedule.td ++ ++ + GENERATED_SOURCES := \ + R600Intrinsics.td \ + R600RegisterInfo.td \ +-- +cgit v0.9.0.2-2-gbebe +From 2baaa5c7eb21517f0197bfd91154e9b4886fbb1b Mon Sep 17 00:00:00 2001 +From: Tom Stellard <thomas.stellard@amd.com> +Date: Thu, 06 Sep 2012 14:05:22 +0000 +Subject: radeon/llvm: Remove R600InstrInfo.td from TD_FILES + +Fixes build bug introduced by +cebbdd4ac23725963207bf6f8fc7101150e6065f +--- +diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources +index 333dd03..f387636 100644 +--- a/src/gallium/drivers/radeon/Makefile.sources ++++ b/src/gallium/drivers/radeon/Makefile.sources +@@ -10,7 +10,6 @@ TD_FILES := \ + AMDILIntrinsics.td \ + AMDILRegisterInfo.td \ + Processors.td \ +- R600InstrInfo.td \ + R600Instructions.td \ + R600Intrinsics.td \ + R600IntrinsicsNoOpenCL.td \ +-- +cgit v0.9.0.2-2-gbebe diff --git a/staging/python-cairo/PKGBUILD b/staging/python-cairo/PKGBUILD new file mode 100644 index 000000000..578fec081 --- /dev/null +++ b/staging/python-cairo/PKGBUILD @@ -0,0 +1,34 @@ +# $Id: PKGBUILD 167695 2012-10-03 01:10:24Z stephane $ +# Maintainer: Angel Velasquez <angvp@archlinux.org> +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgname=python-cairo +pkgver=1.10.0 +pkgrel=2 +pkgdesc="Python bindings for the cairo graphics library" +arch=('i686' 'x86_64') +license=('LGPL3') +depends=('python' 'cairo') +makedepends=('pkg-config') +options=('!libtool') +source=(http://cairographics.org/releases/pycairo-${pkgver}.tar.bz2) +url="http://www.cairographics.org/pycairo" +md5sums=('e6fd3f2f1e6a72e0db0868c4985669c5') + +build() { + cd "${srcdir}/pycairo-${pkgver}" + + # Ensure that ./waf has created the cached unpacked version + # of the wafadmin source tree. + # This will be created to a subdirectory like + # .waf3-1.5.18-a7b91e2a913ce55fa6ecdf310df95752 + python3 ./waf --version + + ./waf configure --prefix=/usr + ./waf build +} + +package() { + cd "${srcdir}/pycairo-${pkgver}" + ./waf install --destdir="${pkgdir}" +} diff --git a/staging/xorg-server/10-quirks.conf b/staging/xorg-server/10-quirks.conf new file mode 100644 index 000000000..7afad22dc --- /dev/null +++ b/staging/xorg-server/10-quirks.conf @@ -0,0 +1,10 @@ +# Collection of quirks and blacklist/whitelists for specific devices. + + +# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable +# http://bugs.freedesktop.org/show_bug.cgi?id=22442 +Section "InputClass" + Identifier "ThinkPad HDAPS accelerometer blacklist" + MatchProduct "ThinkPad HDAPS accelerometer data" + Option "Ignore" "on" +EndSection diff --git a/staging/xorg-server/PKGBUILD b/staging/xorg-server/PKGBUILD new file mode 100644 index 000000000..3563f0ba9 --- /dev/null +++ b/staging/xorg-server/PKGBUILD @@ -0,0 +1,191 @@ +# $Id: PKGBUILD 167552 2012-10-02 18:14:21Z andyrtr $ +# Maintainer: Jan de Groot <jgc@archlinux.org> + +pkgbase=xorg-server +pkgname=('xorg-server' 'xorg-server-xephyr' 'xorg-server-xdmx' 'xorg-server-xvfb' 'xorg-server-xnest' 'xorg-server-common' 'xorg-server-devel') +pkgver=1.13.0 +pkgrel=1 +arch=('i686' 'x86_64') +license=('custom') +url="http://xorg.freedesktop.org" +makedepends=('pixman' 'libx11' 'mesa' 'libgl' 'xf86driproto' 'xcmiscproto' 'xtrans' 'bigreqsproto' 'randrproto' 'inputproto' 'fontsproto' 'videoproto' + 'compositeproto' 'recordproto' 'scrnsaverproto' 'resourceproto' 'xineramaproto' 'libxkbfile' 'libxfont' 'renderproto' 'libpciaccess' + 'libxv' 'xf86dgaproto' 'libxmu' 'libxrender' 'libxi' 'dmxproto' 'libxaw' 'libdmx' 'libxtst' 'libxres' 'xorg-xkbcomp' 'xorg-util-macros' + 'xorg-font-util' 'glproto' 'dri2proto' 'libgcrypt') +options=('!libtool') +source=(${url}/releases/individual/xserver/${pkgbase}-${pkgver}.tar.bz2 + autoconfig-nvidia.patch + autoconfig-sis.patch + xvfb-run + xvfb-run.1 + 10-quirks.conf) +sha256sums=('548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a' + '66e25f76a7496c429e0aff4b0670f168719bb0ceaeb88c6f2272f2bf3ed21162' + 'd027776fac1f7675b0a9ee817502290b1c45f9c09b0f0a6bb058c35f92361e84' + 'ff0156309470fc1d378fd2e104338020a884295e285972cc88e250e031cc35b9' + '2460adccd3362fefd4cdc5f1c70f332d7b578091fb9167bf88b5f91265bbd776' + '94612f5c0d34a3b7152915c2e285c7b462e9d8e38d3539bd551a339498eac166') + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Use nouveau/nv/nvidia drivers for nvidia devices + patch -Np1 -i "${srcdir}/autoconfig-nvidia.patch" + + # Use unofficial imedia SiS driver for supported SiS devices + patch -Np0 -i "${srcdir}/autoconfig-sis.patch" + + autoreconf -fi + ./configure --prefix=/usr \ + --enable-ipv6 \ + --enable-dri \ + --enable-dmx \ + --enable-xvfb \ + --enable-xnest \ + --enable-composite \ + --enable-xcsecurity \ + --enable-xorg \ + --enable-xephyr \ + --enable-glx-tls \ + --enable-kdrive \ + --enable-kdrive-evdev \ + --enable-kdrive-kbd \ + --enable-kdrive-mouse \ + --enable-install-setuid \ + --enable-config-udev \ + --disable-config-dbus \ + --enable-record \ + --disable-xfbdev \ + --disable-xfake \ + --disable-static \ + --sysconfdir=/etc/X11 \ + --localstatedir=/var \ + --with-xkb-path=/usr/share/X11/xkb \ + --with-xkb-output=/var/lib/xkb \ + --with-fontrootdir=/usr/share/fonts + make + + # Disable subdirs for make install rule to make splitting easier + sed -e 's/^DMX_SUBDIRS =.*/DMX_SUBDIRS =/' \ + -e 's/^XVFB_SUBDIRS =.*/XVFB_SUBDIRS =/' \ + -e 's/^XNEST_SUBDIRS =.*/XNEST_SUBDIRS = /' \ + -e 's/^KDRIVE_SUBDIRS =.*/KDRIVE_SUBDIRS =/' \ + -i hw/Makefile +} + +package_xorg-server-common() { + pkgdesc="Xorg server common files" + depends=('xkeyboard-config' 'xorg-xkbcomp' 'xorg-setxkbmap' 'xorg-fonts-misc') + + cd "${srcdir}/${pkgbase}-${pkgver}" + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-common" + install -m644 COPYING "${pkgdir}/usr/share/licenses/xorg-server-common" + + make -C xkb DESTDIR="${pkgdir}" install-data + + install -m755 -d "${pkgdir}/usr/share/man/man1" + install -m644 man/Xserver.1 "${pkgdir}/usr/share/man/man1/" + + install -m755 -d "${pkgdir}/usr/lib/xorg" + install -m644 dix/protocol.txt "${pkgdir}/usr/lib/xorg/" +} + +package_xorg-server() { + pkgdesc="Xorg X server" + depends=(libxdmcp libxfont libpciaccess libdrm pixman libgcrypt libxau xorg-server-common xf86-input-evdev) + backup=('etc/X11/xorg.conf.d/10-evdev.conf' 'etc/X11/xorg.conf.d/10-quirks.conf') + # see xorg-server-1.13.0/hw/xfree86/common/xf86Module.h for ABI versions - we provide major numbers that drivers can depend on + provides=('X-ABI-VIDEODRV_VERSION=13' 'X-ABI-XINPUT_VERSION=18' 'X-ABI-EXTENSION_VERSION=7.0' 'x-server') + groups=('xorg') + conflicts=('nvidia-utils<=290.10') + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/etc/X11" + mv "${pkgdir}/usr/share/X11/xorg.conf.d" "${pkgdir}/etc/X11/" + install -m644 "${srcdir}/10-quirks.conf" "${pkgdir}/etc/X11/xorg.conf.d/" + + rmdir "${pkgdir}/usr/share/X11" + + # Needed for non-mesa drivers, libgl will restore it + mv "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so" \ + "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.xorg" + + rm -rf "${pkgdir}/var" + + rm -f "${pkgdir}/usr/share/man/man1/Xserver.1" + rm -f "${pkgdir}/usr/lib/xorg/protocol.txt" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server/COPYING" + + rm -rf "${pkgdir}/usr/lib/pkgconfig" + rm -rf "${pkgdir}/usr/include" + rm -rf "${pkgdir}/usr/share/aclocal" +} + +package_xorg-server-xephyr() { + pkgdesc="A nested X server that runs as an X application" + depends=(libxfont libgl libgcrypt libxv pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/kdrive" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xephyr" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xephyr/COPYING" +} + +package_xorg-server-xvfb() { + pkgdesc="Virtual framebuffer X server" + depends=(libxfont libxdmcp libxau libgcrypt pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/vfb" + make DESTDIR="${pkgdir}" install + + install -m755 "${srcdir}/xvfb-run" "${pkgdir}/usr/bin/" + install -m644 "${srcdir}/xvfb-run.1" "${pkgdir}/usr/share/man/man1/" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xvfb" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xvfb/COPYING" +} + +package_xorg-server-xnest() { + pkgdesc="A nested X server that runs as an X application" + depends=(libxfont libxext libgcrypt pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/xnest" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xnest" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xnest/COPYING" +} + +package_xorg-server-xdmx() { + pkgdesc="Distributed Multihead X Server and utilities" + depends=(libxfont libxi libgcrypt libxaw libxrender libdmx libxfixes pixman xorg-server-common) + + cd "${srcdir}/${pkgbase}-${pkgver}/hw/dmx" + make DESTDIR="${pkgdir}" install + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-xdmx" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-xdmx/COPYING" +} + +package_xorg-server-devel() { + pkgdesc="Development files for the X.Org X server" + depends=(xproto randrproto renderproto xextproto inputproto kbproto fontsproto videoproto dri2proto xineramaproto xorg-util-macros pixman libpciaccess) + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}" install + + rm -rf "${pkgdir}/usr/bin" + rm -rf "${pkgdir}/usr/share/man" + rm -rf "${pkgdir}/usr/share/doc" + rm -rf "${pkgdir}/usr/share/X11" + rm -rf "${pkgdir}/usr/lib/xorg" + rm -rf "${pkgdir}/var" + + install -m755 -d "${pkgdir}/usr/share/licenses/xorg-server-devel" + ln -sf ../xorg-server-common/COPYING "${pkgdir}/usr/share/licenses/xorg-server-devel/COPYING" +} diff --git a/staging/xorg-server/autoconfig-nvidia.patch b/staging/xorg-server/autoconfig-nvidia.patch new file mode 100644 index 000000000..6d5220ac7 --- /dev/null +++ b/staging/xorg-server/autoconfig-nvidia.patch @@ -0,0 +1,28 @@ +diff -Nur xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c +--- xorg-server-1.11.99.902.orig/hw/xfree86/common/xf86pciBus.c 2012-02-10 10:10:37.583014924 +0000 ++++ xorg-server-1.11.99.902/hw/xfree86/common/xf86pciBus.c 2012-02-10 11:16:07.148971317 +0000 +@@ -1144,7 +1144,23 @@ + int idx = 0; + + #ifdef __linux__ +- driverList[idx++] = "nouveau"; ++ switch (dev->device_id) ++ { ++ /* NV1 */ ++ case 0x0008: ++ case 0x0009: ++ driverList[idx++] = "vesa"; ++ break; ++ /* NV3 */ ++ case 0x0018: ++ case 0x0019: ++ driverList[idx++] = "nouveau"; ++ break; ++ default: ++ driverList[idx++] = "nouveau"; ++ driverList[idx++] = "nvidia"; ++ break; ++ } + #endif + driverList[idx++] = "nv"; + break; diff --git a/staging/xorg-server/autoconfig-sis.patch b/staging/xorg-server/autoconfig-sis.patch new file mode 100644 index 000000000..0b50049db --- /dev/null +++ b/staging/xorg-server/autoconfig-sis.patch @@ -0,0 +1,21 @@ +--- hw/xfree86/common/xf86pciBus.c.orig 2011-09-24 10:53:45.421697668 +0000 ++++ hw/xfree86/common/xf86pciBus.c 2011-09-24 10:55:56.416250708 +0000 +@@ -1200,9 +1200,15 @@ + break; + } + break; +- case 0x1039: +- driverList[0] = "sis"; +- break; ++ case 0x1039: ++ switch (dev->device_id) ++ { ++ case 0x6350: case 0x6351: ++ driverList[0] = "sisimedia"; driverList[1] = "sis"; break; ++ default: ++ driverList[0] = "sis"; break; ++ } ++ break; + case 0x126f: + driverList[0] = "siliconmotion"; + break; diff --git a/staging/xorg-server/xvfb-run b/staging/xorg-server/xvfb-run new file mode 100644 index 000000000..4c2f4e0d3 --- /dev/null +++ b/staging/xorg-server/xvfb-run @@ -0,0 +1,180 @@ +#!/bin/sh + +# $Id: xvfb-run 2027 2004-11-16 14:54:16Z branden $ + +# This script starts an instance of Xvfb, the "fake" X server, runs a command +# with that server available, and kills the X server when done. The return +# value of the command becomes the return value of this script. +# +# If anyone is using this to build a Debian package, make sure the package +# Build-Depends on xvfb, xbase-clients, and xfonts-base. + +set -e + +PROGNAME=xvfb-run +SERVERNUM=99 +AUTHFILE= +ERRORFILE=/dev/null +STARTWAIT=3 +XVFBARGS="-screen 0 640x480x8" +LISTENTCP="-nolisten tcp" +XAUTHPROTO=. + +# Query the terminal to establish a default number of columns to use for +# displaying messages to the user. This is used only as a fallback in the event +# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the +# script is running, and this cannot, only being calculated once.) +DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true +if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then + DEFCOLUMNS=80 +fi + +# Display a message, wrapping lines at the terminal width. +message () { + echo "$PROGNAME: $*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} +} + +# Display an error message. +error () { + message "error: $*" >&2 +} + +# Display a usage message. +usage () { + if [ -n "$*" ]; then + message "usage error: $*" + fi + cat <<EOF +Usage: $PROGNAME [OPTION ...] COMMAND +Run COMMAND (usually an X client) in a virtual X server environment. +Options: +-a --auto-servernum try to get a free server number, starting at + --server-num +-e FILE --error-file=FILE file used to store xauth errors and Xvfb + output (default: $ERRORFILE) +-f FILE --auth-file=FILE file used to store auth cookie + (default: ./.Xauthority) +-h --help display this usage message and exit +-n NUM --server-num=NUM server number to use (default: $SERVERNUM) +-l --listen-tcp enable TCP port listening in the X server +-p PROTO --xauth-protocol=PROTO X authority protocol name to use + (default: xauth command's default) +-s ARGS --server-args=ARGS arguments (other than server number and + "-nolisten tcp") to pass to the Xvfb server + (default: "$XVFBARGS") +-w DELAY --wait=DELAY delay in seconds to wait for Xvfb to start + before running COMMAND (default: $STARTWAIT) +EOF +} + +# Find a free server number by looking at .X*-lock files in /tmp. +find_free_servernum() { + # Sadly, the "local" keyword is not POSIX. Leave the next line commented in + # the hope Debian Policy eventually changes to allow it in /bin/sh scripts + # anyway. + #local i + + i=$SERVERNUM + while [ -f /tmp/.X$i-lock ]; do + i=$(($i + 1)) + done + echo $i +} + +# Clean up files +clean_up() { + if [ -e "$AUTHFILE" ]; then + XAUTHORITY=$AUTHFILE xauth remove ":$SERVERNUM" >>"$ERRORFILE" 2>&1 + fi + if [ -n "$XVFB_RUN_TMPDIR" ]; then + if ! rm -r "$XVFB_RUN_TMPDIR"; then + error "problem while cleaning up temporary directory" + exit 5 + fi + fi +} + +# Parse the command line. +ARGS=$(getopt --options +ae:f:hn:lp:s:w: \ + --long auto-servernum,error-file:,auth-file:,help,server-num:,listen-tcp,xauth-protocol:,server-args:,wait: \ + --name "$PROGNAME" -- "$@") +GETOPT_STATUS=$? + +if [ $GETOPT_STATUS -ne 0 ]; then + error "internal error; getopt exited with status $GETOPT_STATUS" + exit 6 +fi + +eval set -- "$ARGS" + +while :; do + case "$1" in + -a|--auto-servernum) SERVERNUM=$(find_free_servernum) ;; + -e|--error-file) ERRORFILE="$2"; shift ;; + -f|--auth-file) AUTHFILE="$2"; shift ;; + -h|--help) SHOWHELP="yes" ;; + -n|--server-num) SERVERNUM="$2"; shift ;; + -l|--listen-tcp) LISTENTCP="" ;; + -p|--xauth-protocol) XAUTHPROTO="$2"; shift ;; + -s|--server-args) XVFBARGS="$2"; shift ;; + -w|--wait) STARTWAIT="$2"; shift ;; + --) shift; break ;; + *) error "internal error; getopt permitted \"$1\" unexpectedly" + exit 6 + ;; + esac + shift +done + +if [ "$SHOWHELP" ]; then + usage + exit 0 +fi + +if [ -z "$*" ]; then + usage "need a command to run" >&2 + exit 2 +fi + +if ! which xauth >/dev/null; then + error "xauth command not found" + exit 3 +fi + +# tidy up after ourselves +trap clean_up EXIT + +# If the user did not specify an X authorization file to use, set up a temporary +# directory to house one. +if [ -z "$AUTHFILE" ]; then + XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)" + AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority" +fi + +# Start Xvfb. +MCOOKIE=$(mcookie) +XAUTHORITY=$AUTHFILE xauth source - << EOF >>"$ERRORFILE" 2>&1 +add :$SERVERNUM $XAUTHPROTO $MCOOKIE +EOF +XAUTHORITY=$AUTHFILE Xvfb ":$SERVERNUM" $XVFBARGS $LISTENTCP >>"$ERRORFILE" \ + 2>&1 & +XVFBPID=$! +sleep "$STARTWAIT" +if ! kill -0 $XVFBPID 2>/dev/null; then + echo "Xvfb failed to start" >&2 + exit 1 +fi + +# Start the command and save its exit status. +set +e +DISPLAY=:$SERVERNUM XAUTHORITY=$AUTHFILE "$@" 2>&1 +RETVAL=$? +set -e + +# Kill Xvfb now that the command has exited. +kill $XVFBPID + +# Return the executed command's exit status. +exit $RETVAL + +# vim:set ai et sts=4 sw=4 tw=80: diff --git a/staging/xorg-server/xvfb-run.1 b/staging/xorg-server/xvfb-run.1 new file mode 100644 index 000000000..137d3a196 --- /dev/null +++ b/staging/xorg-server/xvfb-run.1 @@ -0,0 +1,282 @@ +.\" $Id: xvfb-run.1 2138 2005-01-17 23:40:27Z branden $ +.\" +.\" Copyright 1998-2004 Branden Robinson <branden@debian.org>. +.\" +.\" This is free software; you may redistribute it and/or modify +.\" it under the terms of the GNU General Public License as +.\" published by the Free Software Foundation; either version 2, +.\" or (at your option) any later version. +.\" +.\" This is distributed in the hope that it will be useful, but +.\" WITHOUT ANY WARRANTY; without even the implied warranty of +.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.\" GNU General Public License for more details. +.\" +.\" You should have received a copy of the GNU General Public License with +.\" the Debian operating system, in /usr/share/common-licenses/GPL; if +.\" not, write to the Free Software Foundation, Inc., 59 Temple Place, +.\" Suite 330, Boston, MA 02111-1307 USA +.\" +.\" We need the URL macro from groff's www macro package, but also want +.\" things to work all right for people who don't have it. So we define +.\" our own URL macro and let the www macro package override it if it's +.\" available. +.de URL +\\$2 \(laURL: \\$1 \(ra\\$3 +.. +.if \n[.g] .mso www.tmac +.TH xvfb\-run 1 "2004\-11\-12" "Debian Project" +.SH NAME +xvfb\-run \- run specified X client or command in a virtual X server environment +.SH SYNOPSIS +.B xvfb\-run +[ +.I options +] +.I command +.SH DESCRIPTION +.B xvfb\-run +is a wrapper for the +.BR Xvfb (1x) +command which simplifies the task of running commands (typically an X +client, or a script containing a list of clients to be run) within a virtual +X server environment. +.PP +.B xvfb\-run +sets up an X authority file (or uses an existing user\-specified one), +writes a cookie to it (see +.BR xauth (1x)) +and then starts the +.B Xvfb +X server as a background process. +The process ID of +.B Xvfb +is stored for later use. +The specified +.I command +is then run using the X display corresponding to the +.B Xvfb +server +just started and the X authority file created earlier. +.PP +When the +.I command +exits, its status is saved, the +.B Xvfb +server is killed (using the process ID stored earlier), the X authority +cookie removed, and the authority file deleted (if the user did not specify +one to use). +.B xvfb\-run +then exits with the exit status of +.IR command . +.PP +.B xvfb\-run +requires the +.B xauth +command to function. +.SH OPTIONS +.TP +.B \-a\fR,\fB \-\-auto\-servernum +Try to get a free server number, starting at 99, or the argument to +.BR \-\-server\-num . +.TP +.BI \-e\ file \fR,\fB\ \-\-error\-file= file +Store output from +.B xauth +and +.B Xvfb +in +.IR file . +The default is +.IR /dev/null . +.TP +.BI \-f\ file \fR,\fB\ \-\-auth\-file= file +Store X authentication data in +.IR file . +By default, a temporary directory called +.IR xvfb\-run. PID +(where PID is the process ID of +.B xvfb\-run +itself) is created in the directory specified by the environment variable +.B TMPDIR +(or +.I /tmp +if that variable is null or unset), and the +.BR tempfile (1) +command is used to create a file in that temporary directory called +.IR Xauthority . +.TP +.B \-h\fR,\fB \-\-help +Display a usage message and exit. +.TP +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +Use +.I servernumber +as the server number (but see the +.B \-a\fR,\fB \-\-auto\-servernum +option above). +The default is 99. +.TP +.B \-l\fR,\fB \-\-listen\-tcp +Enable TCP port listening in the X server. +For security reasons (to avoid denial\-of\-service attacks or exploits), +TCP port listening is disabled by default. +.TP +.BI \-p\ protocolname \fR,\fB\ \-\-xauth\-protocol= protocolname +Use +.I protocolname +as the X authority protocol to use. +The default is \(oq.\(cq, which +.B xauth +interprets as its own default protocol, which is MIT\-MAGIC\-COOKIE\-1. +.TP +.BI \-s\ arguments \fR,\fB\ \-\-server\-args= arguments +Pass +.I arguments +to the +.B Xvfb +server. +Be careful to quote any whitespace characters that may occur within +.I arguments +to prevent them from regarded as separators for +.BR xvfb\-run 's +own arguments. +Also, note that specification of \(oq\-nolisten tcp\(cq in +.I arguments +may override the function of +.BR xvfb\-run 's +own +.B \-l\fR,\fB \-\-listen\-tcp +option, and that specification of the server number (e.g., \(oq:1\(cq) may +be ignored because of the way the X server parses its argument list. +Use the +.B xvfb\-run +option +.BI \-n\ servernumber \fR,\fB\ \-\-server\-num= servernumber +to achieve the latter function. +The default is \(oq\-screen 0 640x480x8\(cq. +.TP +.BI \-w\ delay \fR,\fB\ \-\-wait= delay +Wait +.I delay +seconds after launching +.B Xvfb +before attempting to start the specified command. +The default is 3. +.SH ENVIRONMENT +.TP +.B COLUMNS +indicates the width of the terminal device in character cells. +This value is used for formatting diagnostic messages. +If not set, the terminal is queried using +.BR stty (1) +to determine its width. +If that fails, a value of \(oq80\(cq is assumed. +.TP +.B TMPDIR +specifies the directory in which to place +.BR xvfb\-run 's +temporary directory for storage of the X authority file; only used if the +.B \-f +or +.B \-\-auth\-file +options are not specified. +.SH "OUTPUT FILES" +.PP +Unless the +.B \-f +or +.B \-\-auth\-file +options are specified, a temporary +directory and file within it are created (and deleted) to store the X +authority cookies used by the +.B Xvfb +server and client(s) run under it. +See +.BR tempfile (1). +If \-f or \-\-auth\-file are used, then the specified X authority file is +only written to, not created or deleted (though +.B xauth +creates an authority file itself if told to use use that does not already +exist). +.PP +An error file with a user\-specified name is also created if the +.B \-e +or +.B \-\-error\-file +options are specifed; see above. +.SH "EXIT STATUS" +.B xvfb\-run +uses its exit status as well as output to standard error to communicate +diagnostics. +The exit status of \(oq1\(cq is not used, and should be interpreted as failure +of the specified command. +.TP +0 +.B xvfb\-run +only uses this exit status if the +.B \-h\fR,\fB \-\-help +option is given. +In all other situations, this may be interpreted as success of the specified +command. +.TP +2 +No command to run was specified. +.TP +3 +The +.B xauth +command is not available. +.TP +4 +The temporary directory that was going to be used already exists; since +.B xvfb\-run +produces a uniquely named directory, this may indicate an attempt by another +process on the system to exploit a temporary file race condition. +.TP +5 +A problem was encountered while cleaning up the temporary directory. +.TP +6 +A problem was encountered while using +.BR getopt (1) +to parse the command\-line arguments. +.SH EXAMPLES +.TP +.B xvfb\-run \-\-auto\-servernum \-\-server\-num=1 xlogo +runs the +.BR xlogo (1x) +demonstration client inside the +.B Xvfb +X server on the first available server number greater than or equal to 1. +.TP +.B xvfb\-run \-\-server\-args="\-screen 0 1024x768x24" ico \-faces +runs the +.BR ico (1x) +demonstration client (and passes it the +.B \-faces +argument) inside the +.B Xvfb +X server, configured with a root window of 1024 by 768 pixels and a color +depth of 24 bits. +.PP +Note that the demo X clients used in the above examples will not exit on +their own, so they will have to be killed before +.B xvfb\-run +will exit. +.SH BUGS +See +.URL "http://bugs.debian.org/xvfb" "the Debian Bug Tracking System" . +If you wish to report a bug in +.BR xvfb\-run , +please use the +.BR reportbug (1) +command. +.SH AUTHOR +.B xfvb\-run +was written by Branden Robinson and Jeff Licquia with sponsorship from +Progeny Linux Systems. +.SH "SEE ALSO" +.BR Xvfb (1x), +.BR xauth (1x) +.\" vim:set et tw=80: diff --git a/testing/kactivities/PKGBUILD b/testing/kactivities/PKGBUILD index 3e9ab01bd..99274b055 100644 --- a/testing/kactivities/PKGBUILD +++ b/testing/kactivities/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166035 2012-09-04 15:38:00Z andrea $ +# $Id: PKGBUILD 167564 2012-10-02 18:57:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kactivities -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='API for using and interacting with the Activity Manager' @@ -11,7 +11,7 @@ license=('GPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('f216d37e961f46f5830fb15d65c71a9c322cebfa') +sha1sums=('7e5ec2aa1492450ea1de40f9e110561f6221b5ca') build() { cd "${srcdir}" diff --git a/testing/kdeaccessibility-jovie/PKGBUILD b/testing/kdeaccessibility-jovie/PKGBUILD index 15895d642..9b6d6cb42 100644 --- a/testing/kdeaccessibility-jovie/PKGBUILD +++ b/testing/kdeaccessibility-jovie/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166059 2012-09-04 15:52:45Z andrea $ +# $Id: PKGBUILD 167588 2012-10-02 19:15:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-jovie -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='A text to speech application' @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdeaccessibility-kttsd') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/jovie-${pkgver}.tar.xz") -sha1sums=('f9edb471a3245f3d2e429d5d2140954673f97a9c') +sha1sums=('fbf63de8b286e8238383f49991ffb7651f9099d2') build() { cd "${srcdir}" diff --git a/testing/kdeaccessibility-kaccessible/PKGBUILD b/testing/kdeaccessibility-kaccessible/PKGBUILD index 91ffcdc72..76d4ca24d 100644 --- a/testing/kdeaccessibility-kaccessible/PKGBUILD +++ b/testing/kdeaccessibility-kaccessible/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166060 2012-09-04 15:53:12Z andrea $ +# $Id: PKGBUILD 167589 2012-10-02 19:16:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kaccessible -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Provides accessibility services like focus tracking and a screenreader' @@ -12,7 +12,7 @@ groups=('kde' 'kdeaccessibility') depends=('kdelibs' 'speech-dispatcher') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kaccessible-${pkgver}.tar.xz") -sha1sums=('8715188d1e3c01f204409bad2bad6d0f30a3f39a') +sha1sums=('e55ccb92ce22250a8d8139d2367ef9f35c5b34d1') build() { cd "${srcdir}" diff --git a/testing/kdeaccessibility-kmag/PKGBUILD b/testing/kdeaccessibility-kmag/PKGBUILD index d7c381b47..8dbc5a138 100644 --- a/testing/kdeaccessibility-kmag/PKGBUILD +++ b/testing/kdeaccessibility-kmag/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166061 2012-09-04 15:53:36Z andrea $ +# $Id: PKGBUILD 167590 2012-10-02 19:16:35Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmag -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Screen Magnifier' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmag-${pkgver}.tar.xz") -sha1sums=('9205eba59c39f9d9e0a38c8424bdde73cb43a174') +sha1sums=('4429196f346271a825e721be56e92189a3c0da2a') build() { cd "${srcdir}" diff --git a/testing/kdeaccessibility-kmousetool/PKGBUILD b/testing/kdeaccessibility-kmousetool/PKGBUILD index 579d88a62..b5574a6f4 100644 --- a/testing/kdeaccessibility-kmousetool/PKGBUILD +++ b/testing/kdeaccessibility-kmousetool/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166062 2012-09-04 15:53:59Z andrea $ +# $Id: PKGBUILD 167591 2012-10-02 19:17:02Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmousetool -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Clicks the mouse for you, reducing the effects of RSI' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmousetool-${pkgver}.tar.xz") -sha1sums=('ca977db4f5cbaa6ca99adb21ce6b16306f94de6b') +sha1sums=('c9e27c71fd9bb01ee498cb0799d848611d031dcc') build() { cd "${srcdir}" diff --git a/testing/kdeaccessibility-kmouth/PKGBUILD b/testing/kdeaccessibility-kmouth/PKGBUILD index 86dad04b5..6e573b8ca 100644 --- a/testing/kdeaccessibility-kmouth/PKGBUILD +++ b/testing/kdeaccessibility-kmouth/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166063 2012-09-04 15:54:25Z andrea $ +# $Id: PKGBUILD 167592 2012-10-02 19:17:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeaccessibility-kmouth -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') pkgdesc='Speech Synthesizer Frontend' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmouth-${pkgver}.tar.xz") -sha1sums=('fae5e95a1d65a2e4b0a695969c159d6bb75283ef') +sha1sums=('7e982aa5a57a9f671ec69f3504ca4dc50076778d') build() { cd "${srcdir}" diff --git a/testing/kdeadmin/PKGBUILD b/testing/kdeadmin/PKGBUILD index 4fd276ba3..568029ab3 100644 --- a/testing/kdeadmin/PKGBUILD +++ b/testing/kdeadmin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166064 2012-09-04 15:55:00Z andrea $ +# $Id: PKGBUILD 167593 2012-10-02 19:18:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdeadmin-kcron' 'kdeadmin-ksystemlog' 'kdeadmin-kuser' 'kdeadmin-system-config-printer-kde') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') @@ -15,7 +15,7 @@ groups=('kde' 'kdeadmin') makedepends=('cmake' 'automoc4' 'kdebindings-python2' 'system-config-printer-common') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'syslog-path.patch') -sha1sums=('9c544f883c5116a928027944fce7a21715c421f3' +sha1sums=('0b97528870a23440ba450f87be878e3abdf9e0e1' '20095ce6e0f3e5b6800a7c6e52de6fddba62c031') build() { diff --git a/testing/kdeartwork/PKGBUILD b/testing/kdeartwork/PKGBUILD index 9cd638c64..9b342eb62 100644 --- a/testing/kdeartwork/PKGBUILD +++ b/testing/kdeartwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166065 2012-09-04 15:55:36Z andrea $ +# $Id: PKGBUILD 167595 2012-10-02 19:18:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -13,7 +13,7 @@ pkgname=('kdeartwork-aurorae' 'kdeartwork-styles' 'kdeartwork-wallpapers' 'kdeartwork-weatherwallpapers') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -22,7 +22,7 @@ groups=('kde' 'kdeartwork') makedepends=('cmake' 'automoc4' 'xscreensaver' 'eigen' 'kdebase-workspace' 'libkexiv2') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('95a6aac7e6e39a1618de1452ef5d0bb1cb8c9956') +sha1sums=('6a93ed5fd33b27b88b653c15c546b223ed880a4d') build() { cd $srcdir diff --git a/testing/kdebase-konsole/PKGBUILD b/testing/kdebase-konsole/PKGBUILD index 08c32cd4f..791d73889 100644 --- a/testing/kdebase-konsole/PKGBUILD +++ b/testing/kdebase-konsole/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166066 2012-09-04 16:00:36Z andrea $ +# $Id: PKGBUILD 167597 2012-10-02 19:23:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebase-konsole -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://kde.org/applications/system/konsole/' @@ -12,7 +12,7 @@ groups=('kde' 'kdebase') depends=('kdebase-runtime' 'kdebase-lib') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz") -sha1sums=('57af84c4fc441dfc3bcea9eef96b6283a3a8322e') +sha1sums=('bab9dcab839cc975fb3b94ac383d25b94066fe92') build() { cd "${srcdir}" diff --git a/testing/kdebase-workspace/PKGBUILD b/testing/kdebase-workspace/PKGBUILD index 7d09870e7..5f31e02e3 100644 --- a/testing/kdebase-workspace/PKGBUILD +++ b/testing/kdebase-workspace/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166048 2012-09-04 15:45:58Z andrea $ +# $Id: PKGBUILD 167577 2012-10-02 19:07:16Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdebase-workspace _pkgname=kde-workspace -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Provides the interface and basic tools for the KDE workspace" arch=('i686' 'x86_64') @@ -30,7 +30,7 @@ options=('emptydirs') source=("http://download.kde.org/stable/${pkgver}/src/${_pkgname}-${pkgver}.tar.xz" 'kdm' 'kde.pam' 'kde-np.pam' 'kscreensaver.pam' 'kdm.service' 'fixpath.patch' 'terminate-server.patch' 'kdm-xinitrd.patch') -sha1sums=('ac1753e2264246ec6347961f44b0aae07072dbb4' +sha1sums=('091bec159d85db2a9a6d6b1b43a53183c23de488' '5db3a245201bd4a50e65aa2ef583cf5490e4f646' '712a90999bd429883dcef5dcaf288aace332ced8' 'b321b5e613b60231330e606fdf1e124646148388' @@ -45,7 +45,7 @@ build() { patch -p1 -i "${srcdir}"/kdm-xinitrd.patch patch -p0 -i "${srcdir}"/fixpath.patch patch -p0 -i "${srcdir}"/terminate-server.patch - + cd "${srcdir}" mkdir build cd build diff --git a/testing/kdebase/PKGBUILD b/testing/kdebase/PKGBUILD index e995b29b4..0331990f3 100644 --- a/testing/kdebase/PKGBUILD +++ b/testing/kdebase/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166049 2012-09-04 15:47:34Z andrea $ +# $Id: PKGBUILD 167578 2012-10-02 19:09:21Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -12,7 +12,7 @@ pkgname=('kdebase-dolphin' 'kdebase-konqueror' 'kdebase-lib' 'kdebase-plasma') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -20,7 +20,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdebase') makedepends=('kdelibs' 'cmake' 'automoc4' 'tidyhtml') source=("http://download.kde.org/stable/${pkgver}/src/kde-baseapps-${pkgver}.tar.xz") -sha1sums=('9014332fd6fb18999c8290a3cbb498793d8caa2f') +sha1sums=('8b5a45cfd77e7e67a57c06cdbf387692e8547b66') build() { cd ${srcdir} diff --git a/testing/kdebindings-kimono/PKGBUILD b/testing/kdebindings-kimono/PKGBUILD index d326ccdb2..3f70219e7 100644 --- a/testing/kdebindings-kimono/PKGBUILD +++ b/testing/kdebindings-kimono/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166067 2012-09-04 16:01:09Z andrea $ +# $Id: PKGBUILD 167598 2012-10-02 19:24:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-kimono -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc=".NET/Mono bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/kimono" @@ -13,7 +13,7 @@ depends=('kdebindings-qyoto' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' 'kdepimlibs') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/kimono-${pkgver}.tar.xz") -sha1sums=('08b1a43eb800de1ad1ed7a0a147e6c73b3928bd8') +sha1sums=('d8c762a6a65323f80e47cadbfa732b529a07dbc1') build() { cd "${srcdir}" diff --git a/testing/kdebindings-korundum/PKGBUILD b/testing/kdebindings-korundum/PKGBUILD index 891c450df..378407606 100644 --- a/testing/kdebindings-korundum/PKGBUILD +++ b/testing/kdebindings-korundum/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166068 2012-09-04 16:01:35Z andrea $ +# $Id: PKGBUILD 167599 2012-10-02 19:24:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-korundum -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Ruby bindings for libraries created by the KDE community" url="https://projects.kde.org/projects/kde/kdebindings/ruby/korundum" @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'boost' conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/korundum-${pkgver}.tar.xz" 'ruby19.patch') -sha1sums=('ea22f9bddd7450e15f6dcf3d7f243874f664bc71' +sha1sums=('efa6b6b6bae89f8e16cbbcf8c5840c6cbdab57e3' 'c074f027bac3b9bffe70a2c2304a6a7be12be034') build() { diff --git a/testing/kdebindings-kross/PKGBUILD b/testing/kdebindings-kross/PKGBUILD index 747d72be4..4cfb2d320 100644 --- a/testing/kdebindings-kross/PKGBUILD +++ b/testing/kdebindings-kross/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 166069 2012-09-04 16:02:03Z andrea $ +# $Id: PKGBUILD 167600 2012-10-02 19:25:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-kross pkgname=('kdebindings-kross-python' # 'kdebindings-kross-ruby' 'kdebindings-kross-java') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 url="https://projects.kde.org/projects/kde/kdebindings/kross-interpreters" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kdebindings') makedepends=('kdelibs' 'cmake' 'automoc4' 'python2' 'java-environment') source=("http://download.kde.org/stable/${pkgver}/src/kross-interpreters-${pkgver}.tar.xz") -sha1sums=('d97c6ab445ab209d41a817eeebbfa42461c2511a') +sha1sums=('9208e4ad1b8ad97f1220cd6696f22d8b1eab29cb') build() { cd "${srcdir}" diff --git a/testing/kdebindings-perlkde/PKGBUILD b/testing/kdebindings-perlkde/PKGBUILD index 78ce9af23..94f730e8f 100644 --- a/testing/kdebindings-perlkde/PKGBUILD +++ b/testing/kdebindings-perlkde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166070 2012-09-04 16:02:30Z andrea $ +# $Id: PKGBUILD 167601 2012-10-02 19:25:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlkde -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Perl bindings for the KDE libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlkde" @@ -13,7 +13,7 @@ depends=('kdebindings-perlqt' 'kdebindings-smokekde') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen' 'kdepimlibs' 'kdegraphics-okular' 'kdesdk-kate') source=("http://download.kde.org/stable/${pkgver}/src/perlkde-${pkgver}.tar.xz") -sha1sums=('9a4e298770152a9ed903eff22048021e19e5f257') +sha1sums=('7ed1e54f5216e5bfd6b9709900d3df6b606910b5') build() { cd "${srcdir}" diff --git a/testing/kdebindings-perlqt/PKGBUILD b/testing/kdebindings-perlqt/PKGBUILD index ca28a175c..bcf08e854 100644 --- a/testing/kdebindings-perlqt/PKGBUILD +++ b/testing/kdebindings-perlqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166043 2012-09-04 15:42:24Z andrea $ +# $Id: PKGBUILD 167572 2012-10-02 19:02:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-perlqt -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Perl bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/perl/perlqt" @@ -12,7 +12,7 @@ groups=('kdebindings') depends=('kdebindings-smokeqt' 'perl-list-moreutils') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') source=("http://download.kde.org/stable/${pkgver}/src/perlqt-${pkgver}.tar.xz") -sha1sums=('9800056ce7e2ced8d8487776e7ecb58d3bf87370') +sha1sums=('1f7d70401c84fa54e937979a7c03d3fa8d7d59c2') build() { cd "${srcdir}" diff --git a/testing/kdebindings-python/PKGBUILD b/testing/kdebindings-python/PKGBUILD index 39f12409c..7767091d2 100644 --- a/testing/kdebindings-python/PKGBUILD +++ b/testing/kdebindings-python/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166044 2012-09-04 15:42:53Z andrea $ +# $Id: PKGBUILD 167573 2012-10-02 19:03:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdebindings-python pkgname=('kdebindings-python' 'kdebindings-python2') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 url='https://projects.kde.org/projects/kde/kdebindings/pykde4' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ groups=('kdebindings') makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'python2-pyqt' 'pyqt' 'qscintilla' 'python2-sip' 'python-sip') source=("http://download.kde.org/stable/${pkgver}/src/pykde4-${pkgver}.tar.xz") -sha1sums=('b1066dc30d59ddfb16db3f7e1ee11a2f9895dfca') +sha1sums=('44b3f02797c43a59f8c3a91131a2488a733cfa11') build() { export PYTHONDONTWRITEBYTECODE="TRUE" diff --git a/testing/kdebindings-qtruby/PKGBUILD b/testing/kdebindings-qtruby/PKGBUILD index 9a225f95e..10e0d715c 100644 --- a/testing/kdebindings-qtruby/PKGBUILD +++ b/testing/kdebindings-qtruby/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166046 2012-09-04 15:44:07Z andrea $ +# $Id: PKGBUILD 167575 2012-10-02 19:04:51Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qtruby -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Ruby bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/ruby/qtruby" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'ruby') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-ruby') source=("http://download.kde.org/stable/${pkgver}/src/qtruby-${pkgver}.tar.xz") -sha1sums=('6362e3e1e65085cda1c8b2793ba7105150ec989d') +sha1sums=('7d74ef9d0c66ef6c54fd25aeff89de7f06685dda') build() { cd "${srcdir}" diff --git a/testing/kdebindings-qyoto/PKGBUILD b/testing/kdebindings-qyoto/PKGBUILD index 31b667877..2c11b1667 100644 --- a/testing/kdebindings-qyoto/PKGBUILD +++ b/testing/kdebindings-qyoto/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166045 2012-09-04 15:43:37Z andrea $ +# $Id: PKGBUILD 167574 2012-10-02 19:04:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-qyoto -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc=".NET/Mono bindings for the Qt libraries" url="https://projects.kde.org/projects/kde/kdebindings/csharp/qyoto" @@ -13,7 +13,7 @@ depends=('kdebindings-smokeqt' 'mono') makedepends=('cmake' 'automoc4' 'kdebindings-smokegen') conflicts=('kdebindings-csharp') source=("http://download.kde.org/stable/${pkgver}/src/qyoto-${pkgver}.tar.xz") -sha1sums=('a5a6b42a7c37c554fa67dcd9a9439c4d32a6c59a') +sha1sums=('549f386325cf02662c685f83b1844c72149255d1') build() { cd "${srcdir}" diff --git a/testing/kdebindings-smokegen/PKGBUILD b/testing/kdebindings-smokegen/PKGBUILD index b52546df0..b7369c5fa 100644 --- a/testing/kdebindings-smokegen/PKGBUILD +++ b/testing/kdebindings-smokegen/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166038 2012-09-04 15:39:36Z andrea $ +# $Id: PKGBUILD 167567 2012-10-02 18:59:20Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokegen -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A general purpose C++ parser with a plugin infrastructure" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokegen" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokegen-${pkgver}.tar.xz") -sha1sums=('d73bd72550a644f073b94258591fe2c7c742360b') +sha1sums=('f7ac776e18ad0df7535280ca5e6ea951cde159fb') build() { cd "${srcdir}" diff --git a/testing/kdebindings-smokekde/PKGBUILD b/testing/kdebindings-smokekde/PKGBUILD index 1450dc7aa..6b76999f2 100644 --- a/testing/kdebindings-smokekde/PKGBUILD +++ b/testing/kdebindings-smokekde/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166042 2012-09-04 15:41:53Z andrea $ +# $Id: PKGBUILD 167571 2012-10-02 19:02:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokekde -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Language independent library for KDE bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokekde" @@ -16,7 +16,7 @@ optdepends=('kdesdk-kate: Kate bindings' 'kdegraphics-okular: Okular bindings') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokekde-${pkgver}.tar.xz") -sha1sums=('ae611a3571306fe77fba5799ac8da4017633c84e') +sha1sums=('ad541046cf64df5a9ffda29979f8868a9c29c354') build() { cd "${srcdir}" diff --git a/testing/kdebindings-smokeqt/PKGBUILD b/testing/kdebindings-smokeqt/PKGBUILD index 40b1b461c..f7c426b67 100644 --- a/testing/kdebindings-smokeqt/PKGBUILD +++ b/testing/kdebindings-smokeqt/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166039 2012-09-04 15:40:04Z andrea $ +# $Id: PKGBUILD 167568 2012-10-02 18:59:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdebindings-smokeqt -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Language independent library for Qt bindings" url="https://projects.kde.org/projects/kde/kdebindings/smoke/smokeqt" @@ -13,7 +13,7 @@ depends=('kdebindings-smokegen' 'qimageblitz' 'qscintilla') makedepends=('cmake' 'automoc4') conflicts=('kdebindings-smoke') source=("http://download.kde.org/stable/${pkgver}/src/smokeqt-${pkgver}.tar.xz") -sha1sums=('db56b4a6b4380a61735a4dd5366af75ad4901475') +sha1sums=('a2f70eb2cb67942456604a6538e9cabe8a48aad5') build() { cd "${srcdir}" diff --git a/testing/kdeedu-analitza/PKGBUILD b/testing/kdeedu-analitza/PKGBUILD index f9b425362..5ff1646dd 100644 --- a/testing/kdeedu-analitza/PKGBUILD +++ b/testing/kdeedu-analitza/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166056 2012-09-04 15:51:26Z andrea $ +# $Id: PKGBUILD 167585 2012-10-02 19:14:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-analitza -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A library to add mathematical features to your program" url="https://projects.kde.org/projects/kde/kdeedu/analitza" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/analitza-${pkgver}.tar.xz") -sha1sums=('b69134548d366f705b8854f8da222758f2d6a0ef') +sha1sums=('065e449af454e08f02ece846fe5b28db09bda1be') build() { cd "${srcdir}" diff --git a/testing/kdeedu-blinken/PKGBUILD b/testing/kdeedu-blinken/PKGBUILD index 3afaa0287..bc39e5c80 100644 --- a/testing/kdeedu-blinken/PKGBUILD +++ b/testing/kdeedu-blinken/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166071 2012-09-04 16:02:53Z andrea $ +# $Id: PKGBUILD 167602 2012-10-02 19:26:18Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-blinken -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Memory Enhancement Game" url="http://kde.org/applications/education/blinken/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/blinken-${pkgver}.tar.xz") -sha1sums=('874596bfccf8e675667c8a5ffe4d104850752c13') +sha1sums=('4f13e61086929da9ba75ee3b73612540054888b1') build() { cd "${srcdir}" diff --git a/testing/kdeedu-cantor/PKGBUILD b/testing/kdeedu-cantor/PKGBUILD index 0a3d73d01..f0e100ab4 100644 --- a/testing/kdeedu-cantor/PKGBUILD +++ b/testing/kdeedu-cantor/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166072 2012-09-04 16:03:18Z andrea $ +# $Id: PKGBUILD 167603 2012-10-02 19:26:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-cantor -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE Frontend to Mathematical Software" url="http://kde.org/applications/education/cantor/" @@ -16,7 +16,7 @@ optdepends=('maxima: Maxima backend' 'r: R backend') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/cantor-${pkgver}.tar.xz") -sha1sums=('03e8344bdc258412550d5617424a1fcd8a762e16') +sha1sums=('51b6cf08d43b6ea9fc285283a8ee1d8097b7349b') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kalgebra/PKGBUILD b/testing/kdeedu-kalgebra/PKGBUILD index d1c28a205..b0030115c 100644 --- a/testing/kdeedu-kalgebra/PKGBUILD +++ b/testing/kdeedu-kalgebra/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166073 2012-09-04 16:03:44Z andrea $ +# $Id: PKGBUILD 167604 2012-10-02 19:27:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalgebra -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Graph Calculator" url="http://kde.org/applications/education/kalgebra/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu' 'kdeedu-analitza') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalgebra-${pkgver}.tar.xz") -sha1sums=('15727b87d3951b95ef839dd6bb58dcf193f8fb5c') +sha1sums=('93aceea871e10eff771645f627563517684a11a5') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kalzium/PKGBUILD b/testing/kdeedu-kalzium/PKGBUILD index 6fabd1ca0..cca0347d6 100644 --- a/testing/kdeedu-kalzium/PKGBUILD +++ b/testing/kdeedu-kalzium/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166074 2012-09-04 16:04:09Z andrea $ +# $Id: PKGBUILD 167605 2012-10-02 19:28:07Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kalzium -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Periodic Table of Elements" url="http://kde.org/applications/education/kalzium/" @@ -13,7 +13,7 @@ depends=('kdelibs' 'avogadro' 'ocaml' 'facile') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kalzium-${pkgver}.tar.xz") -sha1sums=('7a043108edb23a2d857622e44ffb51cf3e870530') +sha1sums=('d328ad31f50a33aefeb009411a1adb51c29850a2') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kanagram/PKGBUILD b/testing/kdeedu-kanagram/PKGBUILD index 7676d54f6..afe645228 100644 --- a/testing/kdeedu-kanagram/PKGBUILD +++ b/testing/kdeedu-kanagram/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166075 2012-09-04 16:04:43Z andrea $ +# $Id: PKGBUILD 167606 2012-10-02 19:28:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kanagram -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Letter Order Game" url="http://kde.org/applications/education/kanagram/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kanagram-${pkgver}.tar.xz") -sha1sums=('78961fcd7ee14991be5d3e79068bf0651b86ba3d') +sha1sums=('b6fd76d854473ab6dbfdfdcb09347e7c4363a580') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kbruch/PKGBUILD b/testing/kdeedu-kbruch/PKGBUILD index 6f49632ab..f8b104855 100644 --- a/testing/kdeedu-kbruch/PKGBUILD +++ b/testing/kdeedu-kbruch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166076 2012-09-04 16:05:09Z andrea $ +# $Id: PKGBUILD 167607 2012-10-02 19:29:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kbruch -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Exercise Fractions" url="http://kde.org/applications/education/kbruch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kbruch-${pkgver}.tar.xz") -sha1sums=('a4e4ede1732838e596d1a4f2db054b21ce3bc799') +sha1sums=('82c7c573d6c0c248ae2d8db24504d1943824d0da') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kgeography/PKGBUILD b/testing/kdeedu-kgeography/PKGBUILD index d142f3ed6..57c0169ea 100644 --- a/testing/kdeedu-kgeography/PKGBUILD +++ b/testing/kdeedu-kgeography/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166077 2012-09-04 16:05:36Z andrea $ +# $Id: PKGBUILD 167608 2012-10-02 19:29:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kgeography -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Geography Trainer" url="http://kde.org/applications/education/kgeography/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgeography-${pkgver}.tar.xz") -sha1sums=('a5c817949b35f8001a2489d0fabadddcbc7646df') +sha1sums=('a68b02fd9ba765bce5d95b754dfd7eef70fa5743') build() { cd "${srcdir}" diff --git a/testing/kdeedu-khangman/PKGBUILD b/testing/kdeedu-khangman/PKGBUILD index e6d8b5824..a82203a37 100644 --- a/testing/kdeedu-khangman/PKGBUILD +++ b/testing/kdeedu-khangman/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166078 2012-09-04 16:06:15Z andrea $ +# $Id: PKGBUILD 167609 2012-10-02 19:30:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-khangman -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Hangman Game" url="http://kde.org/applications/education/khangman/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/khangman-${pkgver}.tar.xz") -sha1sums=('3b07235ff8aa419cc6971c14791e56a15c10d39a') +sha1sums=('6c11cf05fca993b7ddb7f92f68299a34470b5cd5') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kig/PKGBUILD b/testing/kdeedu-kig/PKGBUILD index e1916a264..b815e56dd 100644 --- a/testing/kdeedu-kig/PKGBUILD +++ b/testing/kdeedu-kig/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166079 2012-09-04 16:06:41Z andrea $ +# $Id: PKGBUILD 167610 2012-10-02 19:31:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kig-${pkgver}.tar.xz") -sha1sums=('ab4382d1b463569eba87efc7fbf9b12d08b236a7') +sha1sums=('13b3d40b0d33b1a60b36278760e35f337089cc73') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kiten/PKGBUILD b/testing/kdeedu-kiten/PKGBUILD index cae1dd4d5..10124965b 100644 --- a/testing/kdeedu-kiten/PKGBUILD +++ b/testing/kdeedu-kiten/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166080 2012-09-04 16:07:09Z andrea $ +# $Id: PKGBUILD 167611 2012-10-02 19:31:39Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kiten -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Japanese Reference/Study Tool" url="http://kde.org/applications/education/kiten/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kiten-${pkgver}.tar.xz") -sha1sums=('0a1b4228cc05d8bf185af5a929e864c541f6e0bf') +sha1sums=('86b4bd5f4b7ccc4f6e0769a8360e55ffebdc2eaf') build() { cd "${srcdir}" diff --git a/testing/kdeedu-klettres/PKGBUILD b/testing/kdeedu-klettres/PKGBUILD index ff76733e0..eee3defe1 100644 --- a/testing/kdeedu-klettres/PKGBUILD +++ b/testing/kdeedu-klettres/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166081 2012-09-04 16:08:01Z andrea $ +# $Id: PKGBUILD 167612 2012-10-02 19:32:48Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-klettres -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Learn The Alphabet" url="http://kde.org/applications/education/klettres/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/klettres-${pkgver}.tar.xz") -sha1sums=('f52621b525ba2d2598fc119cb121e96780c87f60') +sha1sums=('177413e9f9e490a4c72d8f85d3bdd36ffd1ba934') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kmplot/PKGBUILD b/testing/kdeedu-kmplot/PKGBUILD index 03aa77a4a..db7db52c9 100644 --- a/testing/kdeedu-kmplot/PKGBUILD +++ b/testing/kdeedu-kmplot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166082 2012-09-04 16:08:32Z andrea $ +# $Id: PKGBUILD 167613 2012-10-02 19:33:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kmplot -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Mathematical Function Plotter" url="http://kde.org/applications/education/kmplot/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kmplot-${pkgver}.tar.xz") -sha1sums=('7118af5ce1a66c79fd0439b9aa249169ef63b2cd') +sha1sums=('66fba97fc152925f87551be2dd283d4cbf06683f') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kstars/PKGBUILD b/testing/kdeedu-kstars/PKGBUILD index 4fc8cc3ca..39c41b806 100644 --- a/testing/kdeedu-kstars/PKGBUILD +++ b/testing/kdeedu-kstars/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166083 2012-09-04 16:08:58Z andrea $ +# $Id: PKGBUILD 167614 2012-10-02 19:33:54Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kstars -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Desktop Planetarium" url="http://kde.org/applications/education/kstars/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libindi') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz") -sha1sums=('ee07f3cd1141990a1c6bd9ad655413a8d74d8df9') +sha1sums=('144409ebfb2a2c3d040ab4a1ad130b5677dd23b6') build() { cd "${srcdir}" diff --git a/testing/kdeedu-ktouch/PKGBUILD b/testing/kdeedu-ktouch/PKGBUILD index 45a0da9f3..10c8d3d79 100644 --- a/testing/kdeedu-ktouch/PKGBUILD +++ b/testing/kdeedu-ktouch/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166084 2012-09-04 16:09:47Z andrea $ +# $Id: PKGBUILD 167615 2012-10-02 19:34:53Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-ktouch -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Touch Typing Tutor" url="http://kde.org/applications/education/ktouch/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktouch-${pkgver}.tar.xz") -sha1sums=('a4203a226d3b02b5619efd01291816f1b4de2b50') +sha1sums=('99133b52b29a7ee4d3dd6da664ad8c47fd637b71') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kturtle/PKGBUILD b/testing/kdeedu-kturtle/PKGBUILD index df11873af..867463af9 100644 --- a/testing/kdeedu-kturtle/PKGBUILD +++ b/testing/kdeedu-kturtle/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166085 2012-09-04 16:10:15Z andrea $ +# $Id: PKGBUILD 167616 2012-10-02 19:35:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kturtle -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Educational Programming Environment" url="http://kde.org/applications/education/kturtle/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kturtle-${pkgver}.tar.xz") -sha1sums=('c3ee656a8ca0fb4b75e810453e88f5fe30466de3') +sha1sums=('c30e80f71dc622b818d6539054f91584b0dce444') build() { cd "${srcdir}" diff --git a/testing/kdeedu-kwordquiz/PKGBUILD b/testing/kdeedu-kwordquiz/PKGBUILD index 86b12bfb2..6ce3f425d 100644 --- a/testing/kdeedu-kwordquiz/PKGBUILD +++ b/testing/kdeedu-kwordquiz/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166086 2012-09-04 16:10:39Z andrea $ +# $Id: PKGBUILD 167617 2012-10-02 19:35:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kwordquiz -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Flash Card Trainer" url="http://kde.org/applications/education/kwordquiz/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwordquiz-${pkgver}.tar.xz") -sha1sums=('66d66016c7cb708aeb436861a647716fcde39028') +sha1sums=('53c702a88bd9cb0c8fba54d6353d06005760bd71') build() { cd "${srcdir}" diff --git a/testing/kdeedu-marble/PKGBUILD b/testing/kdeedu-marble/PKGBUILD index 5552c7b7e..2dedbdc26 100644 --- a/testing/kdeedu-marble/PKGBUILD +++ b/testing/kdeedu-marble/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166051 2012-09-04 15:48:41Z andrea $ +# $Id: PKGBUILD 167580 2012-10-02 19:10:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-marble -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Desktop Globe" url="http://kde.org/applications/education/marble/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4' 'gpsd') optdepends=('gpsd: gps support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/marble-${pkgver}.tar.xz") -sha1sums=('5975a99ef55b418b709279c95ff9afe01cf64264') +sha1sums=('71f0ab4845a7bf5505eba0bf5b654720a59d4028') build() { cd "${srcdir}" diff --git a/testing/kdeedu-pairs/PKGBUILD b/testing/kdeedu-pairs/PKGBUILD index fff93f79f..29830e669 100644 --- a/testing/kdeedu-pairs/PKGBUILD +++ b/testing/kdeedu-pairs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166087 2012-09-04 16:11:06Z andrea $ +# $Id: PKGBUILD 167618 2012-10-02 19:36:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-pairs -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A memory and pairs game for KDE" url="https://projects.kde.org/projects/kde/kdeedu/pairs" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/pairs-${pkgver}.tar.xz") -sha1sums=('f109037b7960d0e14e23726e7edbbf0bf430b764') +sha1sums=('8ed40356ee7df8059935e945e070667dfffcc77b') build() { cd "${srcdir}" diff --git a/testing/kdeedu-parley/PKGBUILD b/testing/kdeedu-parley/PKGBUILD index dc6536c99..1172c66f1 100644 --- a/testing/kdeedu-parley/PKGBUILD +++ b/testing/kdeedu-parley/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166088 2012-09-04 16:11:36Z andrea $ +# $Id: PKGBUILD 167621 2012-10-02 19:37:04Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-parley -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Vocabulary Trainer" url="http://kde.org/applications/education/parley/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkdeedu') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/parley-${pkgver}.tar.xz") -sha1sums=('8ca16eed35b87ce2416bb715dc392207198f802c') +sha1sums=('397e58d783f75f48e8cf5a3a35f1fa441010b50b') build() { cd "${srcdir}" diff --git a/testing/kdeedu-rocs/PKGBUILD b/testing/kdeedu-rocs/PKGBUILD index 3aa480d97..a7c3d2cdb 100644 --- a/testing/kdeedu-rocs/PKGBUILD +++ b/testing/kdeedu-rocs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166089 2012-09-04 16:12:15Z andrea $ +# $Id: PKGBUILD 167622 2012-10-02 19:37:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" @@ -12,7 +12,7 @@ groups=('kde' 'kdeedu') depends=('kdebase-runtime') makedepends=('cmake' 'automoc4' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/rocs-${pkgver}.tar.xz") -sha1sums=('92547f7b3402763395bef93ce43411a381694ffb') +sha1sums=('8c3ba1c2b15a795147110f246853217d301f903b') options=('!makeflags') build() { diff --git a/testing/kdeedu-step/PKGBUILD b/testing/kdeedu-step/PKGBUILD index 0ba121e3d..92a7ba92a 100644 --- a/testing/kdeedu-step/PKGBUILD +++ b/testing/kdeedu-step/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166090 2012-09-04 16:12:42Z andrea $ +# $Id: PKGBUILD 167623 2012-10-02 19:38:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-step -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Interactive Physical Simulator" url="http://kde.org/applications/education/step/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libqalculate' 'gsl') makedepends=('cmake' 'automoc4' 'eigen') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz") -sha1sums=('87667ac074e6ac924e8b7123969796f5e61ec2d3') +sha1sums=('7545eee07323935773466cfd3a241fbd8786ef13') build() { cd "${srcdir}" diff --git a/testing/kdegames/PKGBUILD b/testing/kdegames/PKGBUILD index c3189dbd6..cd2a79932 100644 --- a/testing/kdegames/PKGBUILD +++ b/testing/kdegames/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166091 2012-09-04 16:14:10Z andrea $ +# $Id: PKGBUILD 167624 2012-10-02 19:40:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -9,7 +9,6 @@ pkgname=('kdegames-bomber' 'kdegames-kajongg' 'kdegames-kapman' 'kdegames-katomic' - 'kdegames-kbattleship' 'kdegames-kblackbox' 'kdegames-kblocks' 'kdegames-kbounce' @@ -25,6 +24,7 @@ pkgname=('kdegames-bomber' 'kdegames-klickety' 'kdegames-kmahjongg' 'kdegames-kmines' + 'kdegames-knavalbattle' 'kdegames-knetwalk' 'kdegames-kolf' 'kdegames-kollision' @@ -33,17 +33,17 @@ pkgname=('kdegames-bomber' 'kdegames-kreversi' 'kdegames-kshisen' 'kdegames-ksirk' + 'kdegames-ksnakeduel' 'kdegames-kspaceduel' 'kdegames-ksquares' 'kdegames-ksudoku' - 'kdegames-ktron' 'kdegames-ktuberling' 'kdegames-kubrick' 'kdegames-libkdegames' 'kdegames-libkmahjongg' 'kdegames-lskat' 'kdegames-palapeli') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -52,7 +52,7 @@ groups=('kde' 'kdegames') makedepends=('cmake' 'automoc4' 'twisted' 'kdebindings-python2' 'openal') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('5fc77f230cff0a9b243403affc176e4e4757a1e7') +sha1sums=('a751f6b9ed6c24f8a420d6737be87f2bbb0c2cb3') build() { cd $srcdir @@ -123,12 +123,14 @@ package_kdegames-katomic() { make DESTDIR=$pkgdir install } -package_kdegames-kbattleship() { - pkgdesc='Battleship Game' +package_kdegames-knavalbattle() { + pkgdesc='Naval Battle' depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/kbattleship/" - install='kdegames-kbattleship.install' - cd $srcdir/build/kbattleship + url="http://kde.org/applications/games/knavalbattle/" + install='kdegames-knavalbattle.install' + replaces=('kdegames-kbattleship') + conflicts=('kdegames-kbattleship') + cd $srcdir/build/knavalbattle make DESTDIR=$pkgdir install } @@ -369,12 +371,14 @@ package_kdegames-ksudoku() { make DESTDIR=$pkgdir install } -package_kdegames-ktron() { - pkgdesc='Tron-like Game' +package_kdegames-ksnakeduel() { + pkgdesc='Snake-like Game' depends=('kdebase-runtime' 'kdegames-libkdegames') - url="http://kde.org/applications/games/ktron/" + url="http://kde.org/applications/games/ksnakeduel/" install='kdegames.install' - cd $srcdir/build/ktron + replaces=('kdegames-ktron') + conflicts=('kdegames-ktron') + cd $srcdir/build/ksnakeduel make DESTDIR=$pkgdir install } diff --git a/testing/kdegames/kdegames-knavalbattle.install b/testing/kdegames/kdegames-knavalbattle.install new file mode 100644 index 000000000..81ce5c4b0 --- /dev/null +++ b/testing/kdegames/kdegames-knavalbattle.install @@ -0,0 +1,12 @@ +post_install() { + xdg-icon-resource forceupdate --theme hicolor &> /dev/null + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/testing/kdegraphics-gwenview/PKGBUILD b/testing/kdegraphics-gwenview/PKGBUILD index 548fe7b30..252ce0542 100644 --- a/testing/kdegraphics-gwenview/PKGBUILD +++ b/testing/kdegraphics-gwenview/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166092 2012-09-04 16:16:29Z andrea $ +# $Id: PKGBUILD 167625 2012-10-02 19:42:22Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-gwenview -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A fast and easy to use image viewer for KDE" url="http://kde.org/applications/graphics/gwenview/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins: extra plugins to share photos') install=$pkgname.install source=("http://download.kde.org/stable/${pkgver}/src/gwenview-${pkgver}.tar.xz") -sha1sums=('5bc7a7da59e17e19f7f5e52648635b5b3bf77a22') +sha1sums=('5a48c195d4c305f166b2d9fc1a483457c4698156') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-kamera/PKGBUILD b/testing/kdegraphics-kamera/PKGBUILD index 64b594201..e1698bba0 100644 --- a/testing/kdegraphics-kamera/PKGBUILD +++ b/testing/kdegraphics-kamera/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166093 2012-09-04 16:17:04Z andrea $ +# $Id: PKGBUILD 167626 2012-10-02 19:43:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kamera -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Configure Kamera" url="http://kde.org/applications/graphics/kamera/" @@ -12,7 +12,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'gphoto2') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kamera-${pkgver}.tar.xz") -sha1sums=('6f032fd551d68b406749e1890d8ee15993a240ac') +sha1sums=('5b5b68b8996fdb1cb6541704c03d36cf506e8827') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-kcolorchooser/PKGBUILD b/testing/kdegraphics-kcolorchooser/PKGBUILD index cf2d61e05..b2098a07a 100644 --- a/testing/kdegraphics-kcolorchooser/PKGBUILD +++ b/testing/kdegraphics-kcolorchooser/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166094 2012-09-04 16:17:27Z andrea $ +# $Id: PKGBUILD 167627 2012-10-02 19:43:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kcolorchooser -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Color Chooser" url="http://kde.org/applications/graphics/kcolorchooser/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcolorchooser-${pkgver}.tar.xz") -sha1sums=('ec7dd7928b72dee38455315fd15e569d11f3cf1c') +sha1sums=('7e34705505140cc3e6085fc057365ce4cab2c0a0') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-kgamma/PKGBUILD b/testing/kdegraphics-kgamma/PKGBUILD index 16439d626..3340fb97f 100644 --- a/testing/kdegraphics-kgamma/PKGBUILD +++ b/testing/kdegraphics-kgamma/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166095 2012-09-04 16:17:55Z andrea $ +# $Id: PKGBUILD 167628 2012-10-02 19:44:00Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kgamma -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A monitor calibration tool" url="http://kde.org/applications/graphics/kgamma/" @@ -15,7 +15,7 @@ groups=('kde' 'kdegraphics') depends=('kdebase-runtime' 'libxxf86vm') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kgamma-${pkgver}.tar.xz") -sha1sums=('b38bfb571e13dc5a6db389b2980e130b85a874c6') +sha1sums=('553d40c87000c57a10f64f01313ca519148530da') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-kolourpaint/PKGBUILD b/testing/kdegraphics-kolourpaint/PKGBUILD index aeb64f778..0089a8b03 100644 --- a/testing/kdegraphics-kolourpaint/PKGBUILD +++ b/testing/kdegraphics-kolourpaint/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166096 2012-09-04 16:18:19Z andrea $ +# $Id: PKGBUILD 167629 2012-10-02 19:44:28Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kolourpaint -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Paint Program" url="http://kde.org/applications/graphics/kolourpaint/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'qimageblitz') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kolourpaint-${pkgver}.tar.xz") -sha1sums=('80d14586a889bd57e522321a863ac11b990b8982') +sha1sums=('a7a8fb6c63dc87e239bb54c2f178d2d5412296f3') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-kruler/PKGBUILD b/testing/kdegraphics-kruler/PKGBUILD index edb46ca36..7a20b3178 100644 --- a/testing/kdegraphics-kruler/PKGBUILD +++ b/testing/kdegraphics-kruler/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166097 2012-09-04 16:18:46Z andrea $ +# $Id: PKGBUILD 167630 2012-10-02 19:44:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-kruler -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Screen Ruler" url="http://kde.org/applications/graphics/kruler/" @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kruler-${pkgver}.tar.xz") -sha1sums=('37855f2bae3ac92c15c4563c85e4e70a129aeb76') +sha1sums=('59fe8c2246d3d7e8c8307a4d72fae78caec20681') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-ksaneplugin/PKGBUILD b/testing/kdegraphics-ksaneplugin/PKGBUILD index 6c8251e03..d5e587d6e 100644 --- a/testing/kdegraphics-ksaneplugin/PKGBUILD +++ b/testing/kdegraphics-ksaneplugin/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166098 2012-09-04 16:19:13Z andrea $ +# $Id: PKGBUILD 167631 2012-10-02 19:45:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksaneplugin -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A scan plugin that implements the scanning" url="https://projects.kde.org/projects/kde/kdegraphics/ksaneplugin" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/ksaneplugin-${pkgver}.tar.xz") -sha1sums=('832ed50f5f858cea1984050a297fd3a9da3691aa') +sha1sums=('91b1ef55620bc621a81d0e75643e47d0a115e524') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-ksnapshot/PKGBUILD b/testing/kdegraphics-ksnapshot/PKGBUILD index 17d6025a9..8cd949f39 100644 --- a/testing/kdegraphics-ksnapshot/PKGBUILD +++ b/testing/kdegraphics-ksnapshot/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166099 2012-09-04 16:19:37Z andrea $ +# $Id: PKGBUILD 167632 2012-10-02 19:45:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-ksnapshot -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Screen Capture Program" url="http://kde.org/applications/graphics/ksnapshot/" @@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kipi-plugins') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ksnapshot-${pkgver}.tar.xz") -sha1sums=('e3941822f70df00aeede53481db4123aeb27e7a9') +sha1sums=('3496d070420f8aff10e69c98728c5c1ca34f6d47') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-mobipocket/PKGBUILD b/testing/kdegraphics-mobipocket/PKGBUILD index eabd01ba9..851dc49c1 100644 --- a/testing/kdegraphics-mobipocket/PKGBUILD +++ b/testing/kdegraphics-mobipocket/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166100 2012-09-04 16:20:02Z andrea $ +# $Id: PKGBUILD 167633 2012-10-02 19:46:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-mobipocket -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A collection of plugins to handle mobipocket files" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-mobipocket" @@ -15,7 +15,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('7361731d3d69acba9aeab3b9d16bb2a2e4c3a547') +sha1sums=('81590d0958cebc3a052a4d973334f3fe4a9eabe4') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-okular/PKGBUILD b/testing/kdegraphics-okular/PKGBUILD index b8fae0a5d..784e8b3f2 100644 --- a/testing/kdegraphics-okular/PKGBUILD +++ b/testing/kdegraphics-okular/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166040 2012-09-04 15:40:35Z andrea $ +# $Id: PKGBUILD 167569 2012-10-02 19:00:41Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-okular -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Document Viewer' arch=('i686' 'x86_64') @@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4') optdepends=('kdegraphics-mobipocket: mobipocket support') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/okular-${pkgver}.tar.xz") -sha1sums=('d192961e5990f3bab323df77c9fed92262936279') +sha1sums=('2260afa2f0b7bf6afb2da5129fefd95b144dcd74') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-strigi-analyzer/PKGBUILD b/testing/kdegraphics-strigi-analyzer/PKGBUILD index 478f7fe61..50f2b6a52 100644 --- a/testing/kdegraphics-strigi-analyzer/PKGBUILD +++ b/testing/kdegraphics-strigi-analyzer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166101 2012-09-04 16:20:28Z andrea $ +# $Id: PKGBUILD 167634 2012-10-02 19:46:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-strigi-analyzer -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Strigi analyzers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-strigi-analyzer" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('254c64c37cc672934024475918d86184e0357895') +sha1sums=('d9923f5e52fc58c50bf83d7854ce1ec615407753') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-svgpart/PKGBUILD b/testing/kdegraphics-svgpart/PKGBUILD index a1636ba66..d7c1954ef 100644 --- a/testing/kdegraphics-svgpart/PKGBUILD +++ b/testing/kdegraphics-svgpart/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 166102 2012-09-04 16:20:54Z andrea $ +# $Id: PKGBUILD 167635 2012-10-02 19:47:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-svgpart -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 -pkgdesc="A KPart for viewving SVGs" +pkgdesc="A KPart for viewing SVGs" url="https://projects.kde.org/projects/kde/kdegraphics/svgpart" arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/svgpart-${pkgver}.tar.xz") -sha1sums=('92eecdc27174f4e9032f62ef166e09f54a81fb4c') +sha1sums=('06584ae6652d0ea2265c47599dbb6789c973f1fc') build() { cd "${srcdir}" diff --git a/testing/kdegraphics-thumbnailers/PKGBUILD b/testing/kdegraphics-thumbnailers/PKGBUILD index 7a1b76259..24f3f0b2f 100644 --- a/testing/kdegraphics-thumbnailers/PKGBUILD +++ b/testing/kdegraphics-thumbnailers/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166103 2012-09-04 16:21:20Z andrea $ +# $Id: PKGBUILD 167636 2012-10-02 19:47:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdegraphics-thumbnailers -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Thumbnailers for various graphics file formats" url="https://projects.kde.org/projects/kde/kdegraphics/kdegraphics-thumbnailers" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('b58497a68c5524c04a25fcde2e6d3617bc50a2aa') +sha1sums=('c87d00fa6af8fd1d57b0da74cdb382dd7d6f5311') build() { cd "${srcdir}" diff --git a/testing/kdemultimedia-audiocd-kio/PKGBUILD b/testing/kdemultimedia-audiocd-kio/PKGBUILD index e6e580000..16ad5d97b 100644 --- a/testing/kdemultimedia-audiocd-kio/PKGBUILD +++ b/testing/kdemultimedia-audiocd-kio/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166104 2012-09-04 16:21:47Z andrea $ +# $Id: PKGBUILD 167637 2012-10-02 19:48:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-audiocd-kio -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Kioslave for accessing audio CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/audiocd-kio' @@ -14,7 +14,7 @@ groups=('kde' 'kdemultimedia') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/audiocd-kio-${pkgver}.tar.xz") -sha1sums=('62049d902cc3b454ba4096e889482f341841240f') +sha1sums=('822b2a151cb03cdf2708d3731a07b0fa23ee8e34') build() { cd "${srcdir}" diff --git a/testing/kdemultimedia-dragonplayer/PKGBUILD b/testing/kdemultimedia-dragonplayer/PKGBUILD index 81c33b791..20f6a6609 100644 --- a/testing/kdemultimedia-dragonplayer/PKGBUILD +++ b/testing/kdemultimedia-dragonplayer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166105 2012-09-04 16:22:11Z andrea $ +# $Id: PKGBUILD 167638 2012-10-02 19:48:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-dragonplayer -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A multimedia player where the focus is on simplicity, instead of features" @@ -14,7 +14,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/dragon-${pkgver}.tar.xz") -sha1sums=('4e228d66185fbbcc8846f0d69074e9509909287e') +sha1sums=('ebe0021892c76f2b7ffd637ebf035801851ed3b5') build() { cd "${srcdir}" diff --git a/testing/kdemultimedia-ffmpegthumbs/PKGBUILD b/testing/kdemultimedia-ffmpegthumbs/PKGBUILD index dad036094..3e2b2b6a1 100644 --- a/testing/kdemultimedia-ffmpegthumbs/PKGBUILD +++ b/testing/kdemultimedia-ffmpegthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166106 2012-09-04 16:22:39Z andrea $ +# $Id: PKGBUILD 167639 2012-10-02 19:49:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-ffmpegthumbs -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='FFmpeg-based thumbnail creator for video files' url='https://projects.kde.org/projects/kde/kdemultimedia/ffmpegthumbs' @@ -12,7 +12,7 @@ groups=('kde' 'kdemultimedia') depends=('kdelibs' 'ffmpeg') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/ffmpegthumbs-${pkgver}.tar.xz") -sha1sums=('dea7f81eba98e98d040062945a25c5f6c3651c65') +sha1sums=('a0083c2cda9c194663676b70beb6d23dba0d4f1d') build() { cd "${srcdir}" diff --git a/testing/kdemultimedia-juk/PKGBUILD b/testing/kdemultimedia-juk/PKGBUILD index 238c2a360..11250e22c 100644 --- a/testing/kdemultimedia-juk/PKGBUILD +++ b/testing/kdemultimedia-juk/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166107 2012-09-04 16:23:02Z andrea $ +# $Id: PKGBUILD 167640 2012-10-02 19:49:56Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-juk -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='A jukebox, tagger and music collection manager' url='http://kde.org/applications/multimedia/juk/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'taglib') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/juk-${pkgver}.tar.xz") -sha1sums=('9fa4ac409da7d2386c51e3d92a63ef1996562259') +sha1sums=('64e0c7ea030434cba9bdc9db05901aa81e1aaa97') build() { cd "${srcdir}" diff --git a/testing/kdemultimedia-kmix/PKGBUILD b/testing/kdemultimedia-kmix/PKGBUILD index 6ab52cc1a..d67c720ae 100644 --- a/testing/kdemultimedia-kmix/PKGBUILD +++ b/testing/kdemultimedia-kmix/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166108 2012-09-04 16:23:27Z andrea $ +# $Id: PKGBUILD 167641 2012-10-02 19:50:24Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kmix -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE volume control program" url='http://kde.org/applications/multimedia/kmix/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz") -sha1sums=('43f6e8b635c9662bc930f31680d84ad0e5c0dd6a') +sha1sums=('581955c6a097c69f3cf511a6c55c58d2d2d9ceb7') build() { cd "${srcdir}" diff --git a/testing/kdemultimedia-kscd/PKGBUILD b/testing/kdemultimedia-kscd/PKGBUILD index 2d50b7067..5c666d4ce 100644 --- a/testing/kdemultimedia-kscd/PKGBUILD +++ b/testing/kdemultimedia-kscd/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166109 2012-09-04 16:23:52Z andrea $ +# $Id: PKGBUILD 167642 2012-10-02 19:50:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-kscd -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE CD player" url='http://kde.org/applications/multimedia/kscd/' @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'libkcddb' 'libkcompactdisc' 'libmusicbrainz3') makedepends=('cmake' 'automoc4') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/kscd-${pkgver}.tar.xz") -sha1sums=('9cd9feef981bcbbb6f55d606a80abd2ef5635294') +sha1sums=('9130d1f35713f5ebb2f81a4f1b91f3fe16f18861') build() { cd "${srcdir}" diff --git a/testing/kdemultimedia-mplayerthumbs/PKGBUILD b/testing/kdemultimedia-mplayerthumbs/PKGBUILD index f5d5c61fe..b8860085f 100644 --- a/testing/kdemultimedia-mplayerthumbs/PKGBUILD +++ b/testing/kdemultimedia-mplayerthumbs/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166110 2012-09-04 16:24:20Z andrea $ +# $Id: PKGBUILD 167643 2012-10-02 19:51:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdemultimedia-mplayerthumbs -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="MPlayer based thumbnail generator for video files" url='https://projects.kde.org/projects/kde/kdemultimedia/mplayerthumbs' @@ -12,7 +12,7 @@ license=('GPL' 'LGPL' 'FDL') depends=('kdebase-runtime' 'mplayer') makedepends=('cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/mplayerthumbs-${pkgver}.tar.xz") -sha1sums=('f3f8b48b5c98e47bba0ed5df26f2543dacb07b4c') +sha1sums=('a70d8f522d31529444ba957cdadd97c22dab7090') build() { cd "${srcdir}" diff --git a/testing/kdenetwork/PKGBUILD b/testing/kdenetwork/PKGBUILD index 3eee73c23..74b761e2d 100644 --- a/testing/kdenetwork/PKGBUILD +++ b/testing/kdenetwork/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166111 2012-09-04 16:25:03Z andrea $ +# $Id: PKGBUILD 167644 2012-10-02 19:52:17Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,7 +10,7 @@ pkgname=('kdenetwork-filesharing' 'kdenetwork-kppp' 'kdenetwork-krdc' 'kdenetwork-krfb') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -21,7 +21,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'speex' 'ortp' 'libotr' 'ppp' 'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn' 'libktorrent' 'libmms' 'mediastreamer' 'telepathy-qt') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('22f8cde8b5617ba7e401d82b0669a06899b17320') +sha1sums=('6779039e5354fae02cf7faa3442385b95befb430') build() { cd "${srcdir}" diff --git a/testing/kdepim-runtime/PKGBUILD b/testing/kdepim-runtime/PKGBUILD index dd1a636d9..0a1568b9c 100644 --- a/testing/kdepim-runtime/PKGBUILD +++ b/testing/kdepim-runtime/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166037 2012-09-04 15:39:03Z andrea $ +# $Id: PKGBUILD 167566 2012-10-02 18:58:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepim-runtime -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Extends the functionality of kdepim' arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdebase-runtime' 'kdepimlibs' 'libkgapi') makedepends=('cmake' 'automoc4' 'boost') install="${pkgname}.install" source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('bb39a81f9cf909c84807a003c77b1db9d3a1730b') +sha1sums=('4eeef5c706ea786d35ebaddf6c46084cf666680a') build() { cd "${srcdir}" diff --git a/testing/kdepim/PKGBUILD b/testing/kdepim/PKGBUILD index 049a063c4..ec4dd231f 100644 --- a/testing/kdepim/PKGBUILD +++ b/testing/kdepim/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166112 2012-09-04 16:26:37Z andrea $ +# $Id: PKGBUILD 167645 2012-10-02 19:53:55Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdepim-akonadiconsole' 'kdepim-ktimetracker' 'kdepim-ktnef' 'kdepim-libkdepim') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://pim.kde.org' @@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss' 'pilot-link' 'kde-agent') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-build.patch') -sha1sums=('0fe7ade5d525ed60310f228570de75cbbceac46b' +sha1sums=('49e33e54e61bc499e54cdcd3470719cb4c22d2be' '974056ad2c3a00b33a8ac9403b369ab636000832') build() { diff --git a/testing/kdepimlibs/PKGBUILD b/testing/kdepimlibs/PKGBUILD index 3f69c8e1b..7f9ec4275 100644 --- a/testing/kdepimlibs/PKGBUILD +++ b/testing/kdepimlibs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 166031 2012-09-04 15:32:14Z andrea $ +# $Id: PKGBUILD 167561 2012-10-02 18:50:08Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> pkgname=kdepimlibs -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE PIM Libraries" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ depends=('kdelibs' 'gpgme' 'akonadi' 'libical' 'prison') makedepends=('cmake' 'automoc4' 'boost' 'cyrus-sasl') install='kdepimlibs.install' source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('28d1fdbba5136a09445cad2b83d3a31c4e05e284') +sha1sums=('247820f8f8de5bcd66e19c45afc2033e50f0fd01') build() { cd "${srcdir}" diff --git a/testing/kdeplasma-addons/PKGBUILD b/testing/kdeplasma-addons/PKGBUILD index b3b33fa6e..537ad7c72 100644 --- a/testing/kdeplasma-addons/PKGBUILD +++ b/testing/kdeplasma-addons/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166113 2012-09-04 16:27:49Z andrea $ +# $Id: PKGBUILD 167646 2012-10-02 19:55:13Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -75,7 +75,7 @@ pkgname=('kdeplasma-addons-applets-bball' 'kdeplasma-addons-wallpapers-potd' 'kdeplasma-addons-wallpapers-virus' 'kdeplasma-addons-wallpapers-weather') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -84,7 +84,7 @@ groups=('kde' 'kdeplasma-addons') makedepends=('cmake' 'automoc4' 'kdebase-workspace' 'kdeedu-marble' 'eigen' 'scim' 'qwt' 'boost' 'libkexiv2' 'ibus' 'qoauth' 'qjson') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('2be00830e0e7e030240ca897ec1d9f9978fd8682') +sha1sums=('9f6493d52beb2ed723038e60f5f9ab53beec4e44') build() { mkdir build diff --git a/testing/kdesdk-kate/PKGBUILD b/testing/kdesdk-kate/PKGBUILD index 24b72f6aa..5b573829c 100644 --- a/testing/kdesdk-kate/PKGBUILD +++ b/testing/kdesdk-kate/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 166041 2012-09-04 15:41:20Z andrea $ +# $Id: PKGBUILD 167570 2012-10-02 19:01:37Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgbase=kdesdk-kate pkgname=('kdebase-katepart' 'kdebase-kwrite' 'kdesdk-kate') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') makedepends=('kdelibs ''cmake' 'automoc4') source=("http://download.kde.org/stable/${pkgver}/src/kate-${pkgver}.tar.xz" 'pkgbuild-syntax-highlight.patch') -sha1sums=('a3a1e0f56e22ca87d5b65768ef4874a43ce3ae71' +sha1sums=('d3a1f58a5207b305e62a2a3dc7a34802289be42e' '0a928253bd2077f0264d96a6c8823c69c47b6a8d') build() { diff --git a/testing/kdesdk/PKGBUILD b/testing/kdesdk/PKGBUILD index b6f3cf018..2bf20fe0e 100644 --- a/testing/kdesdk/PKGBUILD +++ b/testing/kdesdk/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166114 2012-09-04 16:29:15Z andrea $ +# $Id: PKGBUILD 167647 2012-10-02 19:56:49Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -20,7 +20,7 @@ pkgname=('kdesdk-cervisia' 'kdesdk-scripts' 'kdesdk-strigi-analyzer' 'kdesdk-umbrello') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -30,7 +30,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs' 'kdebase-lib') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz" 'fix-python2-path.patch') -sha1sums=('319ebe0f912626b8d3539bc22d706cc2548723af' +sha1sums=('8acefc3701f12834b1e5606b635aef4b500e0aee' '923cabd7a877cf9a68efeb24fbf3d5827e1d949e') build() { diff --git a/testing/kdetoys/PKGBUILD b/testing/kdetoys/PKGBUILD index ec07c1f5f..ae3da75ec 100644 --- a/testing/kdetoys/PKGBUILD +++ b/testing/kdetoys/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166115 2012-09-04 16:29:58Z andrea $ +# $Id: PKGBUILD 167648 2012-10-02 19:57:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -6,7 +6,7 @@ pkgbase=kdetoys pkgname=('kdetoys-amor' 'kdetoys-kteatime' 'kdetoys-ktux') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -14,7 +14,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdetoys') makedepends=('cmake' 'automoc4' 'kdebase-workspace') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('caa6a3222dccfb1b12513135e2f859904e385d7f') +sha1sums=('fe26e217edb2bc88ee3510bbe2fd32c3acd941b6') build() { cd $srcdir diff --git a/testing/kdeutils-filelight/PKGBUILD b/testing/kdeutils-filelight/PKGBUILD index 5c6538077..ab6e396df 100644 --- a/testing/kdeutils-filelight/PKGBUILD +++ b/testing/kdeutils-filelight/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166117 2012-09-04 16:30:48Z andrea $ +# $Id: PKGBUILD 167650 2012-10-02 19:58:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-filelight -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='View disk usage information' url='http://kde.org/applications/utilities/filelight' @@ -15,7 +15,7 @@ replaces=('filelight') conflicts=('filelight') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/filelight-${pkgver}.tar.xz") -sha1sums=('498a43e08a02e41dc36f0032c8a18f7e054c6cc6') +sha1sums=('f1d4c7604fb94a4bbe36e136955dd5f6f0f1fdf1') build() { cd "${srcdir}" diff --git a/testing/kdeutils-kcalc/PKGBUILD b/testing/kdeutils-kcalc/PKGBUILD index 78865f5bc..0e3053cc5 100644 --- a/testing/kdeutils-kcalc/PKGBUILD +++ b/testing/kdeutils-kcalc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166118 2012-09-04 16:31:15Z andrea $ +# $Id: PKGBUILD 167651 2012-10-02 19:58:58Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcalc -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Scientific Calculator' url='http://kde.org/applications/utilities/kcalc/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kcalc-${pkgver}.tar.xz") -sha1sums=('40eacf20d6c0ba278670a6383e42ab94e78530d1') +sha1sums=('f28ed638e433c26e43c7e57e0193cdec67de9f22') build() { cd "${srcdir}" diff --git a/testing/kdeutils-kcharselect/PKGBUILD b/testing/kdeutils-kcharselect/PKGBUILD index 2d4297fcd..795c80eb0 100644 --- a/testing/kdeutils-kcharselect/PKGBUILD +++ b/testing/kdeutils-kcharselect/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166119 2012-09-04 16:31:42Z andrea $ +# $Id: PKGBUILD 167652 2012-10-02 19:59:29Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kcharselect -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Character Selector' url="http://kde.org/applications/utilities/kcharselect/" @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/kcharselect-${pkgver}.tar.xz") -sha1sums=('1f8e70c69e63cdc9bd55b63eab5a90dcd81826ba') +sha1sums=('77f9077f2ec75de8f764140306c63c1a79888d33') build() { cd "${srcdir}" diff --git a/testing/kdeutils-kdf/PKGBUILD b/testing/kdeutils-kdf/PKGBUILD index 89bb2d7b4..6fc8c65d2 100644 --- a/testing/kdeutils-kdf/PKGBUILD +++ b/testing/kdeutils-kdf/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166120 2012-09-04 16:32:07Z andrea $ +# $Id: PKGBUILD 167653 2012-10-02 19:59:57Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kdf -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 url="http://kde.org/applications/system/kdiskfree/" arch=('i686' 'x86_64') @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kdf-${pkgver}.tar.xz") -sha1sums=('1466bbfe715ff6e7a2129fbb5c6a42affbc48b16') +sha1sums=('022151b4f2170411037be31d2bbf9ce26f003313') build() { cd "${srcdir}" diff --git a/testing/kdeutils-kfloppy/PKGBUILD b/testing/kdeutils-kfloppy/PKGBUILD index d4a03f4fb..3318061af 100644 --- a/testing/kdeutils-kfloppy/PKGBUILD +++ b/testing/kdeutils-kfloppy/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166121 2012-09-04 16:32:32Z andrea $ +# $Id: PKGBUILD 167654 2012-10-02 20:00:23Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kfloppy -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Floppy Formatter' url='http://kde.org/applications/utilities/kfloppy/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kfloppy-${pkgver}.tar.xz") -sha1sums=('9559d03483aaab1774dbf26fa7171f6b697774b0') +sha1sums=('dbf5ceed22cd0ef0d898dacc466ea6db3da7c980') build() { cd "${srcdir}" diff --git a/testing/kdeutils-kgpg/PKGBUILD b/testing/kdeutils-kgpg/PKGBUILD index 96bab10e8..ea91e24f5 100644 --- a/testing/kdeutils-kgpg/PKGBUILD +++ b/testing/kdeutils-kgpg/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166122 2012-09-04 16:32:56Z andrea $ +# $Id: PKGBUILD 167655 2012-10-02 20:00:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kgpg -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='A GnuPG frontend' url='http://kde.org/applications/utilities/kgpg/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kgpg-${pkgver}.tar.xz") -sha1sums=('9f1e181839c88485912beb013e0908b0e59877a3') +sha1sums=('2ec3ceb0d623ce1c2345025292a8a3c2e6b9923a') build() { cd "${srcdir}" diff --git a/testing/kdeutils-kremotecontrol/PKGBUILD b/testing/kdeutils-kremotecontrol/PKGBUILD index 5b702f0b8..41814687c 100644 --- a/testing/kdeutils-kremotecontrol/PKGBUILD +++ b/testing/kdeutils-kremotecontrol/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kremotecontrol -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Configure your remote controls for use with applications' url='http://kde.org/applications/utilities/kremotecontrol/' @@ -15,7 +15,7 @@ replaces=('kdeutils-kdelirc') conflicts=('kdeutils-kdelirc') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kremotecontrol-${pkgver}.tar.xz") -sha1sums=('046345fe3fb01c264ac3161a376f79f851cd51f5') +sha1sums=('142a28d72f07690a5b342c554493fcfb2e7ae6b5') build() { cd "${srcdir}" diff --git a/testing/kdeutils-ktimer/PKGBUILD b/testing/kdeutils-ktimer/PKGBUILD index a5299af3b..4af12e689 100644 --- a/testing/kdeutils-ktimer/PKGBUILD +++ b/testing/kdeutils-ktimer/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166124 2012-09-04 16:33:54Z andrea $ +# $Id: PKGBUILD 167657 2012-10-02 20:01:50Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-ktimer -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Countdown Launcher' url='http://kde.org/applications/utilities/ktimer/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/ktimer-${pkgver}.tar.xz") -sha1sums=('6fdcea3ce24b41d04baf9ca4a244035488b01197') +sha1sums=('e621ca273d1cb2490f9212f3c2ecf8d57a6efdd3') build() { cd "${srcdir}" diff --git a/testing/kdeutils-kwallet/PKGBUILD b/testing/kdeutils-kwallet/PKGBUILD index 08b139088..afcab8751 100644 --- a/testing/kdeutils-kwallet/PKGBUILD +++ b/testing/kdeutils-kwallet/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166125 2012-09-04 16:34:18Z andrea $ +# $Id: PKGBUILD 167658 2012-10-02 20:02:19Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-kwallet -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='Wallet Management Tool' url='http://kde.org/applications/system/kwalletmanager/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/kwallet-${pkgver}.tar.xz") -sha1sums=('da1eef2fcb729fbcd28adeac486fedfc16175be2') +sha1sums=('e77e2cbf91f14e95ccd45fb1931df274f6c68cc7') build() { cd "${srcdir}" diff --git a/testing/kdeutils-superkaramba/PKGBUILD b/testing/kdeutils-superkaramba/PKGBUILD index 3058509ba..989fa6fc1 100644 --- a/testing/kdeutils-superkaramba/PKGBUILD +++ b/testing/kdeutils-superkaramba/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166127 2012-09-04 16:35:00Z andrea $ +# $Id: PKGBUILD 167660 2012-10-02 20:03:05Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-superkaramba -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='An engine for cool desktop eyecandy' url='http://kde.org/applications/utilities/superkaramba/' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/superkaramba-${pkgver}.tar.xz") -sha1sums=('0a1f43ab28cc351ab99f2aaf6cb5061c4136daa7') +sha1sums=('3e2e42316fe7ac357c58fbfa1e1387c347c31b30') build() { cd "${srcdir}" diff --git a/testing/kdeutils-sweeper/PKGBUILD b/testing/kdeutils-sweeper/PKGBUILD index e2cbeee8a..24004390c 100644 --- a/testing/kdeutils-sweeper/PKGBUILD +++ b/testing/kdeutils-sweeper/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166128 2012-09-04 16:35:28Z andrea $ +# $Id: PKGBUILD 167661 2012-10-02 20:03:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeutils-sweeper -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc='System Cleaner' url='http://kde.org/applications/utilities/sweeper' @@ -12,7 +12,7 @@ depends=('kdebase-runtime') makedepends=('cmake' 'automoc4') groups=('kde' 'kdeutils') source=("http://download.kde.org/stable/${pkgver}/src/sweeper-${pkgver}.tar.xz") -sha1sums=('e64550d8fc5d5b5615eb464d9542167f0b5e17f3') +sha1sums=('31732ac3dd0be4864f6db9a7810b67a1634fc57d') build() { cd "${srcdir}" diff --git a/testing/kdewebdev/PKGBUILD b/testing/kdewebdev/PKGBUILD index 9bdee3ae3..7106b2276 100644 --- a/testing/kdewebdev/PKGBUILD +++ b/testing/kdewebdev/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 166129 2012-09-04 16:35:59Z andrea $ +# $Id: PKGBUILD 167662 2012-10-02 20:04:11Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -7,7 +7,7 @@ pkgname=('kdewebdev-kfilereplace' 'kdewebdev-kimagemapeditor' 'kdewebdev-klinkstatus' 'kdewebdev-kommander') -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 arch=('i686' 'x86_64') url='http://www.kde.org' @@ -15,7 +15,7 @@ license=('GPL' 'LGPL' 'FDL') groups=('kde' 'kdewebdev') makedepends=('cmake' 'automoc4' 'ruby' 'tidyhtml' 'kdepimlibs' 'boost') source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz") -sha1sums=('0a64286114c10c3b09c64d1829058b9ab667986b') +sha1sums=('b811adaa5e996d9f588215be411a6a8d07f493ef') build() { cd $srcdir diff --git a/testing/libkcddb/PKGBUILD b/testing/libkcddb/PKGBUILD index c31949ba8..36f6fb0cd 100644 --- a/testing/libkcddb/PKGBUILD +++ b/testing/libkcddb/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166057 2012-09-04 15:51:53Z andrea $ +# $Id: PKGBUILD 167586 2012-10-02 19:14:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcddb -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="KDE CDDB library" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcddb' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('7c2009bfb19a36cc5084ac450f5a2155a193da55') +sha1sums=('11a83fcf8e699d787b0c037e50f2031874470d70') build() { cd "${srcdir}" diff --git a/testing/libkcompactdisc/PKGBUILD b/testing/libkcompactdisc/PKGBUILD index 9b1223b77..b37c1deb1 100644 --- a/testing/libkcompactdisc/PKGBUILD +++ b/testing/libkcompactdisc/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166058 2012-09-04 15:52:21Z andrea $ +# $Id: PKGBUILD 167587 2012-10-02 19:15:09Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkcompactdisc -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A library for interfacing with CDs" url='https://projects.kde.org/projects/kde/kdemultimedia/libkcompactdisc' @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdemultimedia-kioslave') conflicts=('kdemultimedia-kioslave') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('5e35ecf40225c79e023c0a4eb28f94043e9a2a61') +sha1sums=('daea966e1d6bc06b3dc7001455e31f5004a05423') build() { cd "${srcdir}" diff --git a/testing/libkdcraw/PKGBUILD b/testing/libkdcraw/PKGBUILD index e0169e412..78018d3ae 100644 --- a/testing/libkdcraw/PKGBUILD +++ b/testing/libkdcraw/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166052 2012-09-04 15:49:43Z andrea $ +# $Id: PKGBUILD 167581 2012-10-02 19:12:01Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdcraw -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A C++ interface used to decode RAW picture" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkdcraw" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('82911b0bf93a7762130e4a1aff4dc72ec48940c1') +sha1sums=('022e5e59fb4b0a9ac7942b967f488795a42786e0') build() { cd "${srcdir}" diff --git a/testing/libkdeedu/PKGBUILD b/testing/libkdeedu/PKGBUILD index ad1df6fd9..6d1ddd252 100644 --- a/testing/libkdeedu/PKGBUILD +++ b/testing/libkdeedu/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166050 2012-09-04 15:48:16Z andrea $ +# $Id: PKGBUILD 167579 2012-10-02 19:10:03Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkdeedu -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Libraries used by KDE Education applications" url="https://projects.kde.org/projects/kde/kdeedu/libkdeedu" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') install=${pkgname}.install replaces=('kdeedu-libkdeedu' 'kdeedu-data') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('d472434ac86c2ca92318c9d5e24625d2a72fe654') +sha1sums=('e03310dbb1bcc02095f238fbdd4684a59e98d710') build() { cd "${srcdir}" diff --git a/testing/libkexiv2/PKGBUILD b/testing/libkexiv2/PKGBUILD index 46e8966c1..3b98a4bd6 100644 --- a/testing/libkexiv2/PKGBUILD +++ b/testing/libkexiv2/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166053 2012-09-04 15:50:11Z andrea $ +# $Id: PKGBUILD 167582 2012-10-02 19:12:32Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkexiv2 -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="A library to manipulate pictures metadata" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkexiv2" @@ -13,7 +13,7 @@ makedepends=('cmake' 'automoc4') replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('fec413daf7ad814299fb53db695c273b1c26bc3b') +sha1sums=('60956d88677346bdd4e343b1454a61a2210a39c6') build() { cd "${srcdir}" diff --git a/testing/libkipi/PKGBUILD b/testing/libkipi/PKGBUILD index 93b90ea44..d768ff29b 100644 --- a/testing/libkipi/PKGBUILD +++ b/testing/libkipi/PKGBUILD @@ -2,7 +2,7 @@ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libkipi -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="An interface to use kipi-plugins from a KDE application" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libkipi" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('8fb561ef477b6a35c264ada783f65efa2ae1d3b9') +sha1sums=('36d9bd240409e4ec3063fe02279671502fb65c26') build() { cd "${srcdir}" diff --git a/testing/libksane/PKGBUILD b/testing/libksane/PKGBUILD index 3fbac1549..0d20e7022 100644 --- a/testing/libksane/PKGBUILD +++ b/testing/libksane/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166055 2012-09-04 15:50:59Z andrea $ +# $Id: PKGBUILD 167584 2012-10-02 19:13:27Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=libksane -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="An image scanning library" url="https://projects.kde.org/projects/kde/kdegraphics/libs/libksane" @@ -14,7 +14,7 @@ replaces=('kdegraphics-libs') conflicts=('kdegraphics-libs') install=${pkgname}.install source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('c44eed9ec5f998d0449369f3c1b1abfc4ad2fcfd') +sha1sums=('e8578ec3a65ba91a8772c88612f61116ee9f38a8') build() { cd "${srcdir}" diff --git a/testing/nepomuk-core/PKGBUILD b/testing/nepomuk-core/PKGBUILD index 657e60be6..bff55942b 100644 --- a/testing/nepomuk-core/PKGBUILD +++ b/testing/nepomuk-core/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 166034 2012-09-04 15:37:30Z andrea $ +# $Id: PKGBUILD 167563 2012-10-02 18:56:33Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=nepomuk-core -pkgver=4.9.1 +pkgver=4.9.2 pkgrel=1 pkgdesc="Contains the central Nepomuk services like file indexing, file system monitoring, query, storage, client libraries" url="https://projects.kde.org/projects/kde/kdelibs/nepomuk-core" @@ -10,11 +10,17 @@ arch=('i686' 'x86_64') license=('GPL' 'LGPL' 'FDL') depends=('kdelibs') makedepends=('cmake' 'automoc4' 'doxygen') -source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") -sha1sums=('1dbb4467b7d4ec50133e5ce86c3837b57b95794d') +source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" + 'regression-crash.patch') +sha1sums=('a04e632bfa39ac5158c2addf7278bfb27d29cb5b' + 'e6237844c0f9d5838b827068fe768394e0df0cff') build() { - cd "${srcdir}" + # KDEBUG 307388 + cd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/regression-crash.patch + cd ../ + mkdir build cd build cmake ../${pkgname}-${pkgver} \ diff --git a/testing/nepomuk-core/regression-crash.patch b/testing/nepomuk-core/regression-crash.patch new file mode 100644 index 000000000..a683c133b --- /dev/null +++ b/testing/nepomuk-core/regression-crash.patch @@ -0,0 +1,25 @@ +commit 804e54f83ade8a377d392d350981ead07f60a9d3 +Author: David Faure <faure@kde.org> +Date: Tue Oct 2 20:27:03 2012 +0200 + + Fix crash when watchUserLimitReached() leads to deleting the KInotify instance + + ... which emitted the signal. So don't use a direct delete. + + BUG: 307388 + FIXED-IN: 4.9.3 + +diff --git a/services/filewatch/nepomukfilewatch.cpp b/services/filewatch/nepomukfilewatch.cpp +index 9fd5d9c..94db504 100644 +--- a/services/filewatch/nepomukfilewatch.cpp ++++ b/services/filewatch/nepomukfilewatch.cpp +@@ -323,7 +323,8 @@ void Nepomuk2::FileWatch::connectToKDirWatch() + void Nepomuk2::FileWatch::slotInotifyWatchUserLimitReached() + { + // we do it the brutal way for now hoping with new kernels and defaults this will never happen +- delete m_dirWatch; ++ // Delete the KInotify and switch to KDirNotify dbus signals ++ m_dirWatch->deleteLater(); + m_dirWatch = 0; + connectToKDirWatch(); + } |